avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl DefaultCriteria.java
Date Mon, 01 Mar 2004 16:57:27 GMT
mcconnell    2004/03/01 08:57:27

  Modified:    merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultCriteria.java
  Log:
  Fix bug in context handling of default runtime.
  
  Revision  Changes    Path
  1.29      +4 -1      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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- DefaultCriteria.java	1 Mar 2004 16:46:03 -0000	1.28
  +++ DefaultCriteria.java	1 Mar 2004 16:57:27 -0000	1.29
  @@ -171,6 +171,9 @@
                 MERLIN_RUNTIME, 
                 String.class, null ),
               new Parameter( 
  +              MERLIN_RUNTIME_IMPLEMENTATION, 
  +              String.class, null ),
  +            new Parameter( 
                 MERLIN_OVERRIDE, String.class, null ),
               new Parameter( 
                 MERLIN_DIR, File.class, context.getInitialWorkingDirectory() ),
  
  
  

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


Mime
View raw message