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/kernel/test/src/test/org/apache/avalon/merlin MerlinEmbeddedTest.java
Date Sun, 30 Nov 2003 07:06:36 GMT
mcconnell    2003/11/29 23:06:36

  Modified:    kernel/test/src/test/org/apache/avalon/merlin
                        MerlinEmbeddedTest.java
  Log:
  Sync. with argument order changes in repo.
  
  Revision  Changes    Path
  1.8       +6 -15     avalon-sandbox/kernel/test/src/test/org/apache/avalon/merlin/MerlinEmbeddedTest.java
  
  Index: MerlinEmbeddedTest.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/test/src/test/org/apache/avalon/merlin/MerlinEmbeddedTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MerlinEmbeddedTest.java	30 Nov 2003 05:55:30 -0000	1.7
  +++ MerlinEmbeddedTest.java	30 Nov 2003 07:06:36 -0000	1.8
  @@ -51,39 +51,30 @@
   package org.apache.avalon.merlin;
   
   import java.io.File;
  -import java.net.URL;
   import java.util.Map;
  -import java.lang.reflect.Constructor;
  -import javax.naming.directory.Attributes;
  -import javax.naming.directory.Attribute;
   
   import junit.framework.TestCase;
   
   import org.apache.avalon.repository.Artifact;
   import org.apache.avalon.repository.Builder;
   import org.apache.avalon.repository.InitialContext;
  -import org.apache.avalon.repository.Repository;
   import org.apache.avalon.repository.RepositoryException;
  -import org.apache.avalon.repository.criteria.Criteria;
   import org.apache.avalon.repository.criteria.Factory;
  -import org.apache.avalon.repository.meta.RelationalDescriptor;
   import org.apache.avalon.repository.main.DefaultInitialContext;
   import org.apache.avalon.repository.main.DefaultBuilder;
  -
   import org.apache.avalon.util.env.Env;
   import org.apache.avalon.util.exception.ExceptionHelper;
   
   /**
  - * 
  + * Test case that usages the repository builder to deploy the 
  + * Merlin default application factory.
    * 
    * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
  - * @author $Author$
  + * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
    * @version $Revision$
    */
   public class MerlinEmbeddedTest extends TestCase
   {
  -    private InitialContext m_context;
  -    private Repository m_repository;
   
       /**
        * Constructor for MerlinEmbeddedTest.
  @@ -108,8 +99,8 @@
   
               InitialContext context = 
                  new DefaultInitialContext( 
  -                 getDefaultHosts(),
  -                 getMavenRepositoryDirectory() );
  +                 getMavenRepositoryDirectory(),
  +                 getDefaultHosts() );
   
               Builder builder = new DefaultBuilder( context, artifact );
               Factory factory = builder.getFactory();
  
  
  

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


Mime
View raw message