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/assembly/src/java/org/apache/avalon/assembly/appliance ContextBuilder.java DefaultAppliance.java DefaultApplianceRepository.java
Date Tue, 15 Apr 2003 02:52:13 GMT
mcconnell    2003/04/14 19:52:13

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/appliance
                        ContextBuilder.java DefaultAppliance.java
                        DefaultApplianceRepository.java
  Log:
  Added a little support for backward compatibility.
  
  Revision  Changes    Path
  1.8       +7 -1      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/ContextBuilder.java
  
  Index: ContextBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/ContextBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ContextBuilder.java	13 Apr 2003 01:29:00 -0000	1.7
  +++ ContextBuilder.java	15 Apr 2003 02:52:12 -0000	1.8
  @@ -120,6 +120,12 @@
           map.put( "urn:avalon:partition", context.get( "urn:avalon:partition" ) );
   
           //
  +        // for backward compatibility
  +        // 
  +
  +        map.put( "urn:avalon:partition.name", context.get( "urn:avalon:partition" ) );
  +
  +        //
           // get the entries declared by the context descriptor plus and
           // entries declared within a service definition if one exists
           //
  
  
  
  1.10      +8 -5      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultAppliance.java	11 Apr 2003 19:26:01 -0000	1.9
  +++ DefaultAppliance.java	15 Apr 2003 02:52:12 -0000	1.10
  @@ -294,8 +294,7 @@
   
           if( getLogger().isDebugEnabled() )
           {
  -            final String message =
  -                    "created appliance: " + getURL();
  +            final String message = "created appliance: " + this + ", for: " + classname;
               getLogger().debug( message );
           }
       }
  @@ -417,7 +416,7 @@
        */
       public DependencyDescriptor[] getDependencies()
       {
  -        return m_applianceContext.getType().getDependencies();
  +        return getType().getDependencies();
       }
   
       /**
  @@ -851,9 +850,13 @@
           return (Appliance) m_managers.get( stage );
       }
   
  +   /**
  +    * Return a string representation of the appliance.
  +    * @return the stringified appliance
  +    */
       public String toString()
       {
  -        return "[" + getName() + "/" + System.identityHashCode( this ) + "]";
  +        return "[appliance:/" + getURL().getPath() + "]";
       }
   
       /**
  
  
  
  1.8       +1 -8      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceRepository.java
  
  Index: DefaultApplianceRepository.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceRepository.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultApplianceRepository.java	13 Apr 2003 05:45:09 -0000	1.7
  +++ DefaultApplianceRepository.java	15 Apr 2003 02:52:12 -0000	1.8
  @@ -122,8 +122,6 @@
                       "Unexpected error while creating the root repository URL.";
               throw new ApplianceRuntimeException( error, e );
           }
  -
  -        System.out.println( "# ROOT: " + m_url + ", " + this );
       }
   
       /**
  @@ -153,8 +151,6 @@
                       + parent.getURL() + " with the name: " + name;
               throw new ApplianceRuntimeException( error, e );
           }
  -
  -        System.out.println( "# CHILD: " + m_url + ", " + this );
       }
   
       //==================================================================
  @@ -363,9 +359,6 @@
           {
               final String key = appliance.getURL().getPath().substring( local.length() );
               m_appliances.put( key, appliance );
  -
  -            System.out.println( "# REGISTER - key: '" + key + "' appliance: " + appliance
+ " in " + this );
  -
           } else
           {
               final String error =
  
  
  

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


Mime
View raw message