mcconnell    2004/02/10 11:52:05

  Modified:    merlin   maven.xml
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultCriteria.java DefaultFactory.java
               repository/api/src/java/org/apache/avalon/repository
                        Artifact.java
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.50      +1 -1      avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- maven.xml 10 Feb 2004 18:11:47 -0000      1.49
  +++ maven.xml 10 Feb 2004 19:52:05 -0000      1.50
  @@ -84,7 +84,7 @@
     -->
   
     <goal name="avalon:build" description="Build Merlin."
  -    
prereqs="avalon:build-main,avalon:build-kernel,avalon:build-plugin,avalon:build-facilities"/>
  +    
prereqs="avalon:build-main,avalon:build-kernel,avalon:build-plugin,avalon:build-facilities,avalon:build-externals"/>
   
     <goal name="avalon:build-main" description="Build Merlin.">
       <maven:reactor basedir="${basedir}"
  
  
  
  1.20      +2 -2      
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
  
  Index: DefaultCriteria.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- DefaultCriteria.java      10 Feb 2004 16:31:16 -0000      1.19
  +++ DefaultCriteria.java      10 Feb 2004 19:52:05 -0000      1.20
  @@ -544,7 +544,7 @@
       */
       public Artifact getSecureRuntimeImplementation()
       {
  -        String value = (String) get( MERLIN_RUNTIME_IMPLEMENTATION );
  +        String value = (String) get( MERLIN_CS_RUNTIME_IMPLEMENTATION );
           return Artifact.createArtifact( value );
       }
   
  
  
  
  1.29      +4 -0      
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
  
  Index: DefaultFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- DefaultFactory.java       10 Feb 2004 17:10:59 -0000      1.28
  +++ DefaultFactory.java       10 Feb 2004 19:52:05 -0000      1.29
  @@ -862,6 +862,10 @@
             + criteria.getLoggingImplementation() );
   
           buffer.append( 
  +          "\n  ${merlin.runtime} == " 
  +          + getRuntimeArtifact( criteria ).toString() );
  +
  +        buffer.append( 
             "\n  ${merlin.override} == " 
             + criteria.getOverridePath() );
   
  
  
  
  1.5       +23 -4     
avalon/repository/api/src/java/org/apache/avalon/repository/Artifact.java
  
  Index: Artifact.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/repository/api/src/java/org/apache/avalon/repository/Artifact.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Artifact.java     2 Feb 2004 00:41:23 -0000       1.4
  +++ Artifact.java     10 Feb 2004 19:52:05 -0000      1.5
  @@ -309,13 +309,32 @@
       */
       public String toString()
       {
  -        if( null != getType() )
  +        if( "block".equals( getType() ) )
           {
  -            return "[" + getType() + ": " + getSpecification() + "]";
  +            String path = "block:" + getGroup() + "/" + getName();
  +            if( getVersion() != null ) path = path + "?version=" + getVersion();
  +            return path;
  +        }
  +        else if( "jar".equals( getType() ) )
  +        {
  +            String path = "artifact:" + getGroup() + "/" + getName();
  +            if( getVersion() != null ) path = path + "?version=" + getVersion();
  +            return path;
           }
           else
           {
  -            return "[artifact: " + getSpecification() + "]";
  +            String path = "artifact:" + getGroup() + "/" + getName();
  +            if( getVersion() != null )
  +            { 
  +                path = path + "?version=" + getVersion();
  +                if( getType() != null ) path = path + "&type=" + getType();
  +                return path;
  +            }
  +            else
  +            {
  +                if( getType() != null ) path = path + "?type=" + getType();
  +                return path;
  +            }
           }
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to