You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/03/28 00:10:18 UTC

cvs commit: jakarta-avalon-excalibur/extension/src/test/org/apache/avalon/excalibur/extension/test ExtensionTestCase.java

donaldp     02/03/27 15:10:18

  Modified:    extension/src/java/org/apache/avalon/excalibur/extension
                        DefaultPackageRepository.java DeweyDecimal.java
                        Extension.java OptionalPackage.java
                        PackageManager.java PackageRepository.java
               extension/src/test/org/apache/avalon/excalibur/extension/test
                        ExtensionTestCase.java
  Log:
  Add oodles more javadoc and fix up a bunch of checkstyle violations.
  
  Revision  Changes    Path
  1.12      +19 -8     jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/DefaultPackageRepository.java
  
  Index: DefaultPackageRepository.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/DefaultPackageRepository.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultPackageRepository.java	16 Mar 2002 00:04:16 -0000	1.11
  +++ DefaultPackageRepository.java	27 Mar 2002 23:10:18 -0000	1.12
  @@ -21,7 +21,7 @@
    * a path to find the Optional Packages.</p>
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.11 $ $Date: 2002/03/16 00:04:16 $
  + * @version $Revision: 1.12 $ $Date: 2002/03/27 23:10:18 $
    * @see OptionalPackage
    * @see PackageRepository
    */
  @@ -63,8 +63,9 @@
        * specified <code>Extension</code> is not local then <code>null</code>
        * is returned.
        *
  -     * @param extension Description of the optional package
  -     * @see #isLocal()
  +     * @param extension the extension to search for
  +     * @return an array of optional packages that satisfy the extension
  +     *         (and the extensions dependencies)
        */
       public synchronized OptionalPackage[] getOptionalPackages( final Extension extension )
       {
  @@ -182,9 +183,8 @@
   
       /**
        * Clear internal cache of optional packages.
  -     *
        */
  -    protected synchronized final void clearCache()
  +    protected final synchronized void clearCache()
       {
           m_packages.clear();
           m_needToScan = true;
  @@ -197,7 +197,7 @@
        *
        * @param optionalPackage the OptionalPackage to be added to repository
        */
  -    protected synchronized final void cacheOptionalPackage( final OptionalPackage optionalPackage )
  +    protected final synchronized void cacheOptionalPackage( final OptionalPackage optionalPackage )
       {
           m_needToScan = false;
           final Extension extension = optionalPackage.getAvailableExtensions()[ 0 ];
  @@ -230,7 +230,10 @@
   
           try
           {
  -            if( null == manifest ) return null;
  +            if( null == manifest )
  +            {
  +                return null;
  +            }
               final Extension[] available = Extension.getAvailable( manifest );
               final Extension[] required = Extension.getRequired( manifest );
   
  @@ -242,9 +245,17 @@
           }
       }
   
  +    /**
  +     * Output a debug message for repository.
  +     *
  +     * @param message the debug message
  +     */
       protected void debug( final String message )
       {
  -        if( DEBUG ) System.out.println( message );
  +        if( DEBUG )
  +        {
  +            System.out.println( message );
  +        }
           //getLogger().debug( message );
       }
   }
  
  
  
  1.3       +25 -7     jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/DeweyDecimal.java
  
  Index: DeweyDecimal.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/DeweyDecimal.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DeweyDecimal.java	16 Mar 2002 00:04:16 -0000	1.2
  +++ DeweyDecimal.java	27 Mar 2002 23:10:18 -0000	1.3
  @@ -18,7 +18,7 @@
    * must begin with a number.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.2 $ $Date: 2002/03/16 00:04:16 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/27 23:10:18 $
    */
   public final class DeweyDecimal
   {
  @@ -115,7 +115,10 @@
               final int component1 = ( i < m_components.length ) ? m_components[ i ] : 0;
               final int component2 = ( i < other.m_components.length ) ? other.m_components[ i ] : 0;
   
  -            if( component2 != component1 ) return false;
  +            if( component2 != component1 )
  +            {
  +                return false;
  +            }
           }
   
           return true; // Exact match
  @@ -161,8 +164,14 @@
               final int component1 = ( i < m_components.length ) ? m_components[ i ] : 0;
               final int component2 = ( i < other.m_components.length ) ? other.m_components[ i ] : 0;
   
  -            if( component2 > component1 ) return false;
  -            if( component2 < component1 ) return true;
  +            if( component2 > component1 )
  +            {
  +                return false;
  +            }
  +            if( component2 < component1 )
  +            {
  +                return true;
  +            }
           }
   
           return false; // Exact match
  @@ -184,8 +193,14 @@
               final int component1 = ( i < m_components.length ) ? m_components[ i ] : 0;
               final int component2 = ( i < other.m_components.length ) ? other.m_components[ i ] : 0;
   
  -            if( component2 > component1 ) return false;
  -            if( component2 < component1 ) return true;
  +            if( component2 > component1 )
  +            {
  +                return false;
  +            }
  +            if( component2 < component1 )
  +            {
  +                return true;
  +            }
           }
   
           return true; // Exact match
  @@ -202,7 +217,10 @@
   
           for( int i = 0; i < m_components.length; i++ )
           {
  -            if( i != 0 ) sb.append( '.' );
  +            if( i != 0 )
  +            {
  +                sb.append( '.' );
  +            }
               sb.append( m_components[ i ] );
           }
   
  
  
  
  1.13      +114 -39   jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/Extension.java
  
  Index: Extension.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/Extension.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Extension.java	26 Mar 2002 10:45:23 -0000	1.12
  +++ Extension.java	27 Mar 2002 23:10:18 -0000	1.13
  @@ -26,18 +26,43 @@
    *
    * @author <a href="mailto:craigmcc@apache.org">Craig R. McClanahan</a>
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.12 $ $Date: 2002/03/26 10:45:23 $
  + * @version $Revision: 1.13 $ $Date: 2002/03/27 23:10:18 $
    */
   public final class Extension
   {
  +    /**
  +     * Enum indicating that extension is compatible with other extension.
  +     */
       public static final Compatability COMPATIBLE =
           new Compatability( "COMPATIBLE" );
  +
  +    /**
  +     * Enum indicating that extension requires an upgrade
  +     * of specification to be compatible with other extension.
  +     */
       public static final Compatability REQUIRE_SPECIFICATION_UPGRADE =
           new Compatability( "REQUIRE_SPECIFICATION_UPGRADE" );
  +
  +    /**
  +     * Enum indicating that extension requires a vendor
  +     * switch to be compatible with other extension.
  +     */
       public static final Compatability REQUIRE_VENDOR_SWITCH =
           new Compatability( "REQUIRE_VENDOR_SWITCH" );
  +
  +    /**
  +     * Enum indicating that extension requires an upgrade
  +     * of implementation to be compatible with other extension.
  +     */
       public static final Compatability REQUIRE_IMPLEMENTATION_UPGRADE =
           new Compatability( "REQUIRE_IMPLEMENTATION_UPGRADE" );
  +
  +    /**
  +     * Enum indicating that extension is incompatible with
  +     * other extension in ways other than other enums
  +     * indicate). ie For example the other extension may have
  +     * a different ID.
  +     */
       public static final Compatability INCOMPATIBLE =
           new Compatability( "INCOMPATIBLE" );
   
  @@ -89,10 +114,14 @@
        * packages, a zero-length array is returned.
        *
        * @param manifest Manifest to be parsed
  +     * @return the "available" extensions in specified manifest
        */
       public static Extension[] getAvailable( final Manifest manifest )
       {
  -        if( null == manifest ) return new Extension[ 0 ];
  +        if( null == manifest )
  +        {
  +            return new Extension[ 0 ];
  +        }
   
           final ArrayList results = new ArrayList();
   
  @@ -100,7 +129,10 @@
           if( null != mainAttributes )
           {
               final Extension extension = getExtension( "", mainAttributes );
  -            if( null != extension ) results.add( extension );
  +            if( null != extension )
  +            {
  +                results.add( extension );
  +            }
           }
   
           final Map entries = manifest.getEntries();
  @@ -110,7 +142,10 @@
               final String key = (String)keys.next();
               final Attributes attributes = (Attributes)entries.get( key );
               final Extension extension = getExtension( "", attributes );
  -            if( null != extension ) results.add( extension );
  +            if( null != extension )
  +            {
  +                results.add( extension );
  +            }
           }
   
           return (Extension[])results.toArray( new Extension[ 0 ] );
  @@ -123,6 +158,7 @@
        * are no such optional packages, a zero-length list is returned.
        *
        * @param manifest Manifest to be parsed
  +     * @return the dependencies that are specified in manifes
        */
       public static Extension[] getRequired( final Manifest manifest )
       {
  @@ -140,7 +176,7 @@
           {
               final String key = (String)keys.next();
               final Attributes attributes = (Attributes)entries.get( key );
  -            getRequired( mainAttributes, results );
  +            getRequired( attributes, results );
           }
   
           return (Extension[])results.toArray( new Extension[ 0 ] );
  @@ -156,7 +192,10 @@
                                        final ArrayList required )
       {
           final String names = attributes.getValue( Attributes.Name.EXTENSION_LIST );
  -        if( null == names ) return;
  +        if( null == names )
  +        {
  +            return;
  +        }
   
           final String[] extentions = split( names, " " );
           for( int i = 0; i < extentions.length; i++ )
  @@ -207,31 +246,43 @@
           //WARNING: We trim the values of all the attributes because
           //Some extension declarations are badly defined (ie have spaces
           //after version or vendorID)
  -        final String name = getTrimmedString( attributes.getValue( prefix + Attributes.Name.EXTENSION_NAME ) );
  -        if( null == name ) return null;
  +        final String nameKey = prefix + Attributes.Name.EXTENSION_NAME;
  +        final String name = getTrimmedString( attributes.getValue( nameKey ) );
  +        if( null == name )
  +        {
  +            return null;
  +        }
   
  -        final String specVendor =
  -            getTrimmedString( attributes.getValue( prefix + Attributes.Name.SPECIFICATION_VENDOR ) );
  -        final String specVersion =
  -            getTrimmedString( attributes.getValue( prefix + Attributes.Name.SPECIFICATION_VERSION ) );
  -
  -        final String impVersion =
  -            getTrimmedString( attributes.getValue( prefix + Attributes.Name.IMPLEMENTATION_VERSION ) );
  -        final String impVendor =
  -            getTrimmedString( attributes.getValue( prefix + Attributes.Name.IMPLEMENTATION_VENDOR ) );
  -        final String impVendorId =
  -            getTrimmedString( attributes.getValue( prefix + Attributes.Name.IMPLEMENTATION_VENDOR_ID ) );
  -        final String impURL =
  -            getTrimmedString( attributes.getValue( prefix + Attributes.Name.IMPLEMENTATION_URL ) );
  +        final String specVendorKey = prefix + Attributes.Name.SPECIFICATION_VENDOR;
  +        final String specVendor = getTrimmedString( attributes.getValue( specVendorKey ) );
  +        final String specVersionKey = prefix + Attributes.Name.SPECIFICATION_VERSION;
  +        final String specVersion = getTrimmedString( attributes.getValue( specVersionKey ) );
  +
  +        final String impVersionKey = prefix + Attributes.Name.IMPLEMENTATION_VERSION;
  +        final String impVersion = getTrimmedString( attributes.getValue( impVersionKey ) );
  +        final String impVendorKey = prefix + Attributes.Name.IMPLEMENTATION_VENDOR;
  +        final String impVendor = getTrimmedString( attributes.getValue( impVendorKey ) );
  +        final String impVendorIDKey = prefix + Attributes.Name.IMPLEMENTATION_VENDOR_ID;
  +        final String impVendorId = getTrimmedString( attributes.getValue( impVendorIDKey ) );
  +        final String impURLKey = prefix + Attributes.Name.IMPLEMENTATION_URL;
  +        final String impURL = getTrimmedString( attributes.getValue( impURLKey ) );
   
           return new Extension( name, specVersion, specVendor, impVersion,
                                 impVendor, impVendorId, impURL );
       }
   
  +    /**
  +     * Trim the supplied string if the string is non-null
  +     *
  +     * @param value the string to trim or null
  +     * @return the trimmed string or null
  +     */
       private static String getTrimmedString( final String value )
       {
           if( null == value )
  +        {
               return null;
  +        }
           else
           {
               return value.trim();
  @@ -300,36 +351,71 @@
           }
       }
   
  +    /**
  +     * Get the name of the extension.
  +     *
  +     * @return the name of the extension
  +     */
       public String getExtensionName()
       {
           return m_extensionName;
       }
   
  +    /**
  +     * Get the vendor of the extensions specification.
  +     *
  +     * @return the vendor of the extensions specification.
  +     */
       public String getSpecificationVendor()
       {
           return m_specificationVendor;
       }
   
  +    /**
  +     * Get the version of the extensions specification.
  +     *
  +     * @return the version of the extensions specification.
  +     */
       public DeweyDecimal getSpecificationVersion()
       {
           return m_specificationVersion;
       }
   
  +    /**
  +     * Get the url of the extensions implementation.
  +     *
  +     * @return the url of the extensions implementation.
  +     */
       public String getImplementationURL()
       {
           return m_implementationURL;
       }
   
  +    /**
  +     * Get the vendor of the extensions implementation.
  +     *
  +     * @return the vendor of the extensions implementation.
  +     */
       public String getImplementationVendor()
       {
           return m_implementationVendor;
       }
   
  -    public String getImplementationVendorId()
  +    /**
  +     * Get the vendorID of the extensions implementation.
  +     *
  +     * @return the vendorID of the extensions implementation.
  +     */
  +    public String getImplementationVendorID()
       {
           return m_implementationVendorId;
       }
   
  +    /**
  +     * Get the version of the extensions implementation.
  +     *
  +     * @return the version of the extensions implementation.
  +     */
       public DeweyDecimal getImplementationVersion()
       {
           return m_implementationVersion;
  @@ -340,6 +426,8 @@
        * <code>Extension</code> with the specified <code>Extension</code>.
        *
        * @param required Description of the required optional package
  +     * @return the enum indicating the compatability (or lack thereof)
  +     *         of specifed extension
        */
       public Compatability getCompatibilityWith( final Extension required )
       {
  @@ -361,7 +449,7 @@
           }
   
           // Implementation Vendor ID must match
  -        final String implementationVendorId = required.getImplementationVendorId();
  +        final String implementationVendorId = required.getImplementationVendorID();
           if( null != implementationVendorId )
           {
               if( null == m_implementationVendorId ||
  @@ -394,6 +482,7 @@
        * <code>false</code>.
        *
        * @param required Description of the required optional package
  +     * @return true if the specified extension is compatible with this extension
        */
       public boolean isCompatibleWith( final Extension required )
       {
  @@ -402,6 +491,8 @@
   
       /**
        * Return a String representation of this object.
  +     *
  +     * @return string representation of object.
        */
       public String toString()
       {
  @@ -455,26 +546,10 @@
        *
        * @param first First version number (dotted decimal)
        * @param second Second version number (dotted decimal)
  -     *
  -     * @exception NumberFormatException on a malformed version number
        */
       private boolean isCompatible( final DeweyDecimal first, final DeweyDecimal second )
       {
           return first.isGreaterThanOrEqual( second );
       }
   
  -    public static final class Compatability
  -    {
  -        private final String m_name;
  -
  -        protected Compatability( final String name )
  -        {
  -            m_name = name;
  -        }
  -
  -        public String toString()
  -        {
  -            return m_name;
  -        }
  -    }
   }
  
  
  
  1.8       +2 -0      jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/OptionalPackage.java
  
  Index: OptionalPackage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/OptionalPackage.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OptionalPackage.java	16 Mar 2002 00:04:16 -0000	1.7
  +++ OptionalPackage.java	27 Mar 2002 23:10:18 -0000	1.8
  @@ -127,6 +127,8 @@
   
       /**
        * Return a String representation of this object.
  +     *
  +     * @return the string representation of object
        */
       public String toString()
       {
  
  
  
  1.9       +10 -6     jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/PackageManager.java
  
  Index: PackageManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/PackageManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- PackageManager.java	16 Mar 2002 00:04:16 -0000	1.8
  +++ PackageManager.java	27 Mar 2002 23:10:18 -0000	1.9
  @@ -17,7 +17,7 @@
    * directories.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.8 $ $Date: 2002/03/16 00:04:16 $
  + * @version $Revision: 1.9 $ $Date: 2002/03/27 23:10:18 $
    * @see PackageRepository
    */
   public class PackageManager
  @@ -34,7 +34,7 @@
       {
           if( null == repository )
           {
  -            throw new NullPointerException( "repository property is null" );
  +            throw new NullPointerException( "repository" );
           }
   
           m_repository = repository;
  @@ -53,6 +53,8 @@
        *
        * @param extension Description of the extension that needs to be provided by
        *                  optional package
  +     * @return an array of optional packages that satisfy extension and
  +     *         the extensions dependencies
        * @see OptionalPackage
        * @see Extension
        */
  @@ -60,7 +62,10 @@
       {
           final OptionalPackage[] packages = m_repository.getOptionalPackages( extension );
   
  -        if( null == packages || 0 == packages.length ) return null;
  +        if( null == packages || 0 == packages.length )
  +        {
  +            return null;
  +        }
   
           //TODO: Use heurisitic to find which is best package
   
  @@ -81,14 +86,13 @@
        * @param required the array of required Extensions.
        * @param available the array of Extensions already available to caller.
        * @return the list of OptionalPackages that satisfy required Extensions
  -     * @exception UnsatisfiedPackageException if unable to satisfy all extensions
  +     * @throws UnsatisfiedExtensionException if extensions could not be satisified
        * @see #scanDependencies
        */
       public OptionalPackage[] scanDependencies( final Extension required,
                                                  final Extension[] available )
           throws UnsatisfiedExtensionException
       {
  -        final Extension[] extensions = new Extension[]{required};
           return scanDependencies( required, available );
       }
   
  @@ -106,7 +110,7 @@
        * @param required the array of required Extensions.
        * @param available the array of Extensions already available to caller.
        * @return the list of OptionalPackages that satisfy required Extensions
  -     * @exception UnsatisfiedPackageException if unable to satisfy all extensions
  +     * @throws UnsatisfiedExtensionException if extensions could not be satisified
        * @see #scanDependencies
        */
       public OptionalPackage[] scanDependencies( final Extension[] required,
  
  
  
  1.7       +3 -2      jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/PackageRepository.java
  
  Index: PackageRepository.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/PackageRepository.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PackageRepository.java	16 Mar 2002 00:04:16 -0000	1.6
  +++ PackageRepository.java	27 Mar 2002 23:10:18 -0000	1.7
  @@ -22,7 +22,7 @@
    * <code>guide/extensions/versioning.html</code></p>.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.6 $ $Date: 2002/03/16 00:04:16 $
  + * @version $Revision: 1.7 $ $Date: 2002/03/27 23:10:18 $
    */
   public interface PackageRepository
   {
  @@ -32,7 +32,8 @@
        *
        * @param extension Description of the extension that needs to be provided by
        *                  optional packages
  -     * @see #getOptionalPackage()
  +     * @return an array of optional packages that satisfy extension and
  +     *         the extensions dependencies
        * @see OptionalPackage
        * @see Extension
        */
  
  
  
  1.11      +7 -7      jakarta-avalon-excalibur/extension/src/test/org/apache/avalon/excalibur/extension/test/ExtensionTestCase.java
  
  Index: ExtensionTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/src/test/org/apache/avalon/excalibur/extension/test/ExtensionTestCase.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ExtensionTestCase.java	26 Mar 2002 10:45:23 -0000	1.10
  +++ ExtensionTestCase.java	27 Mar 2002 23:10:18 -0000	1.11
  @@ -16,7 +16,7 @@
    * TestCases for Extension.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.10 $ $Date: 2002/03/26 10:45:23 $
  + * @version $Revision: 1.11 $ $Date: 2002/03/27 23:10:18 $
    */
   public class ExtensionTestCase
       extends TestCase
  @@ -86,7 +86,7 @@
                         available[ 0 ].getSpecificationVersion().toString() );
           assertEquals( "Available URL", MF1_IURL, available[ 0 ].getImplementationURL() );
           assertEquals( "Available ImpVendor", MF1_IVENDOR, available[ 0 ].getImplementationVendor() );
  -        assertEquals( "Available ImpVendorId", MF1_IVENDORID, available[ 0 ].getImplementationVendorId() );
  +        assertEquals( "Available ImpVendorId", MF1_IVENDORID, available[ 0 ].getImplementationVendorID() );
           assertEquals( "Available ImpVersion", MF1_IVERSION,
                         available[ 0 ].getImplementationVersion().toString() );
       }
  @@ -104,7 +104,7 @@
                         available[ 0 ].getSpecificationVersion().toString() );
           assertEquals( "Available URL", MF2_IURL, available[ 0 ].getImplementationURL() );
           assertEquals( "Available ImpVendor", MF2_IVENDOR, available[ 0 ].getImplementationVendor() );
  -        assertEquals( "Available ImpVendorId", MF2_IVENDORID, available[ 0 ].getImplementationVendorId() );
  +        assertEquals( "Available ImpVendorId", MF2_IVENDORID, available[ 0 ].getImplementationVendorID() );
           assertEquals( "Available ImpVersion", MF2_IVERSION,
                         available[ 0 ].getImplementationVersion().toString() );
   
  @@ -116,7 +116,7 @@
                         required[ 0 ].getSpecificationVersion().toString() );
           assertEquals( "required URL", MFR1_IURL, required[ 0 ].getImplementationURL() );
           assertEquals( "required ImpVendor", MFR1_IVENDOR, required[ 0 ].getImplementationVendor() );
  -        assertEquals( "required ImpVendorId", MFR1_IVENDORID, required[ 0 ].getImplementationVendorId() );
  +        assertEquals( "required ImpVendorId", MFR1_IVENDORID, required[ 0 ].getImplementationVendorID() );
           assertEquals( "required ImpVersion", MFR1_IVERSION,
                         required[ 0 ].getImplementationVersion().toString() );
       }
  @@ -134,7 +134,7 @@
                         available[ 0 ].getSpecificationVersion().toString() );
           assertEquals( "Available URL", MF3_IURL, available[ 0 ].getImplementationURL() );
           assertEquals( "Available ImpVendor", MF3_IVENDOR, available[ 0 ].getImplementationVendor() );
  -        assertEquals( "Available ImpVendorId", MF3_IVENDORID, available[ 0 ].getImplementationVendorId() );
  +        assertEquals( "Available ImpVendorId", MF3_IVENDORID, available[ 0 ].getImplementationVendorID() );
           assertEquals( "Available ImpVersion", MF3_IVERSION,
                         available[ 0 ].getImplementationVersion().toString() );
   
  @@ -155,7 +155,7 @@
                         available[ 0 ].getSpecificationVersion().toString() );
           assertEquals( "Available URL", MF4_IURL, available[ 0 ].getImplementationURL() );
           assertEquals( "Available ImpVendor", MF4_IVENDOR, available[ 0 ].getImplementationVendor() );
  -        assertEquals( "Available ImpVendorId", MF4_IVENDORID, available[ 0 ].getImplementationVendorId() );
  +        assertEquals( "Available ImpVendorId", MF4_IVENDORID, available[ 0 ].getImplementationVendorID() );
           assertEquals( "Available ImpVersion", MF4_IVERSION,
                         available[ 0 ].getImplementationVersion().toString() );
   
  @@ -206,7 +206,7 @@
                         available[ 0 ].getSpecificationVersion().toString() );
           assertEquals( "Available URL", MF1_IURL, available[ 0 ].getImplementationURL() );
           assertEquals( "Available ImpVendor", MF1_IVENDOR, available[ 0 ].getImplementationVendor() );
  -        assertEquals( "Available ImpVendorId", MF1_IVENDORID, available[ 0 ].getImplementationVendorId() );
  +        assertEquals( "Available ImpVendorId", MF1_IVENDORID, available[ 0 ].getImplementationVendorID() );
           assertEquals( "Available ImpVersion", MF1_IVERSION,
                         available[ 0 ].getImplementationVersion().toString() );
       }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>