mcconnell    2004/03/04 00:17:21

  Modified:    merlin/platform/tutorials/main merlin.properties
               merlin/platform/tutorials/main/src/java/tutorial Main.java
  Log:
  Move block reference to properties file.
  
  Revision  Changes    Path
  1.2       +1 -0      avalon/merlin/platform/tutorials/main/merlin.properties
  
  Index: merlin.properties
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/main/merlin.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- merlin.properties 4 Mar 2004 07:28:19 -0000       1.1
  +++ merlin.properties 4 Mar 2004 08:17:20 -0000       1.2
  @@ -1,3 +1,4 @@
   
   merlin.info = true
   merlin.debug = false
  +merlin.deployment = conf/demo.block
  
  
  
  1.2       +0 -1      
avalon/merlin/platform/tutorials/main/src/java/tutorial/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/merlin/platform/tutorials/main/src/java/tutorial/Main.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Main.java 4 Mar 2004 07:28:19 -0000       1.1
  +++ Main.java 4 Mar 2004 08:17:21 -0000       1.2
  @@ -74,7 +74,6 @@
   
           Factory factory = builder.getFactory();
           Map criteria = factory.createDefaultCriteria();
  -        criteria.put( "merlin.deployment", "conf/demo.block" );
           factory.create( criteria );
       }
   }
  
  
  

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

Reply via email to