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/composition-spi/src/java/org/apache/avalon/composition/data ContainmentProfile.java
Date Sun, 27 Jul 2003 14:59:56 GMT
mcconnell    2003/07/27 07:59:56

  Modified:    merlin/composition-spi/src/java/org/apache/avalon/composition/data
                        ContainmentProfile.java
  Log:
  Remove the notion of container dependencies (instead we pull in dependecies based on implementation
strategy dynamically during the assembly phase).
  
  Revision  Changes    Path
  1.2       +3 -32     avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/data/ContainmentProfile.java
  
  Index: ContainmentProfile.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/data/ContainmentProfile.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainmentProfile.java	17 Jul 2003 21:21:58 -0000	1.1
  +++ ContainmentProfile.java	27 Jul 2003 14:59:56 -0000	1.2
  @@ -85,9 +85,6 @@
       private static final ServiceDirective[] EMPTY_SERVICE_DIRECTIVES =
         new ServiceDirective[0];
   
  -    private static final DependencyDescriptor[] EMPTY_DEPENDENCIES =
  -      new DependencyDescriptor[0];
  -
       private static final ContainmentProfile EMPTY_IMPLEMENTATION =
         new ContainmentProfile();
   
  @@ -108,11 +105,6 @@
       */
       private final ServiceDirective[] m_export;
   
  -   /**
  -    * The block dependencies.
  -    */
  -    private final DependencyDescriptor[] m_imports;
  -
       /**
        * The profiles described within the scope of the containment profile.
        */
  @@ -127,7 +119,7 @@
       */
       public ContainmentProfile()
       {
  -        this( "container", null, null, null, new Profile[0] );
  +        this( "container", null, null, new Profile[0] );
       }
   
      /**
  @@ -136,8 +128,6 @@
       * @param name the profile name
       * @param classloader the description of the classloader to be 
       *    created for this containment profile
  -    * @param imports the set of dependencies that this containment 
  -    *    profile has on external services
       * @param exports the set of servides that this component is 
       *    dependent on for normal execution
       * @param profile the set of profiles contained within this 
  @@ -145,7 +135,7 @@
       */
       public ContainmentProfile( 
         final String name, final ClassLoaderDirective classloader, 
  -      final DependencyDescriptor[] imports,  final ServiceDirective[] exports,
  +      final ServiceDirective[] exports,
         Profile[] profiles )
       {
           super( name, true, Mode.EXPLICIT );
  @@ -161,14 +151,6 @@
           {
               m_export = exports;
           }
  -        if( imports == null )
  -        {
  -            m_imports = EMPTY_DEPENDENCIES;
  -        }
  -        else
  -        {
  -            m_imports = imports;
  -        }
       }
   
       //--------------------------------------------------------------------------
  @@ -214,17 +196,6 @@
       {
           return m_export;
       }
  -
  -    /**
  -     * Get the imported dependencies that the container requires
  -     * for normal execution.
  -     *
  -     * @return the dependencies
  -     */
  -     public DependencyDescriptor[] getDependencies()
  -     {
  -         return m_imports;
  -     }
   
       /**
        * Retrieve a service directive matching a supplied class.
  
  
  

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


Mime
View raw message