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/logging/logkit/test/src/test/org/apache/avalon/logging/logkit/test DefaultLoggingManagerTestCase.java
Date Sun, 25 Jan 2004 13:18:49 GMT
mcconnell    2004/01/25 05:18:49

  Modified:    merlin   maven.xml
               merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
                        DefaultSystemContext.java
               merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli
                        Main.java
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultFactory.java
               merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools
                        MerlinBean.java
               merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet
                        MerlinServlet.java
               merlin/logging/logkit/test/src/test/org/apache/avalon/logging/logkit/test
                        DefaultLoggingManagerTestCase.java
  Log:
  Synchronization with the repo SPI and impl.
  
  Revision  Changes    Path
  1.43      +4 -2      avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- maven.xml	24 Jan 2004 23:25:20 -0000	1.42
  +++ maven.xml	25 Jan 2004 13:18:48 -0000	1.43
  @@ -424,7 +424,7 @@
   
       <maven:reactor basedir="${basedir}"
         includes="activation/**/project.xml,composition/**/project.xml,extension/**/project.xml,kernel/**/project.xml,facilities/**/project.xml,logging/**/project.xml"
  -      excludes="**/target/**,facilities/*/project.xml"
  +      excludes="**/target/**,facilities/*/project.xml,**/test/project.xml"
         banner="Site Prep:"
         ignoreFailures="false"
         postProcessing="true" />
  @@ -478,7 +478,9 @@
   	  <!--<link href="${avalon.lifecycle.link}" />-->
   	  <link href="${excalibur.configuration.link}" />
   
  -        <util:tokenize var="listOfTags" delim=" ">${maven.javadoc.customtags}</util:tokenize>
  +        <util:tokenize 
  +          var="listOfTags" 
  +          delim=" ">${maven.javadoc.customtags}</util:tokenize>
           <j:forEach var="someTag" items="${listOfTags}">
             <j:set var="nameVar" value="${someTag}.name"/>
             <j:set var="name" value="${context.findVariable(nameVar)}"/>
  
  
  
  1.12      +4 -2      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
  
  Index: DefaultSystemContext.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultSystemContext.java	24 Jan 2004 23:25:27 -0000	1.11
  +++ DefaultSystemContext.java	25 Jan 2004 13:18:48 -0000	1.12
  @@ -32,6 +32,7 @@
   import org.apache.avalon.repository.Repository;
   import org.apache.avalon.repository.provider.CacheManager;
   import org.apache.avalon.repository.provider.InitialContext;
  +import org.apache.avalon.repository.provider.Builder;
   import org.apache.avalon.repository.provider.Factory;
   
   import org.apache.avalon.framework.logger.Logger;
  @@ -114,7 +115,8 @@
         throws Exception
       {
           final String level = getStringPriority( priority );
  -        Factory factory = context.createFactory( artifact );
  +        Builder builder = context.newBuilder( artifact );
  +        Factory factory = builder.getFactory();
           Map criteria = factory.createDefaultCriteria();
           File file = new File( base, "conf/logging.xml" );
           criteria.put( "avalon.logging.configuration", file );
  
  
  
  1.15      +3 -2      avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/cli/src/java/org/apache/avalon/merlin/cli/Main.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Main.java	24 Jan 2004 23:25:31 -0000	1.14
  +++ Main.java	25 Jan 2004 13:18:48 -0000	1.15
  @@ -282,7 +282,8 @@
       public Main( 
         InitialContext context, Artifact artifact, CommandLine line ) throws Exception
       {
  -        Factory factory = context.createFactory( artifact );
  +        Builder builder = context.newBuilder( artifact );
  +        Factory factory = builder.getFactory();
           Map criteria = factory.createDefaultCriteria();
   
           //
  
  
  
  1.20      +9 -4      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- DefaultFactory.java	24 Jan 2004 23:25:31 -0000	1.19
  +++ DefaultFactory.java	25 Jan 2004 13:18:49 -0000	1.20
  @@ -74,6 +74,7 @@
   
   import org.apache.avalon.repository.Artifact;
   import org.apache.avalon.repository.Repository;
  +import org.apache.avalon.repository.provider.Builder;
   import org.apache.avalon.repository.provider.CacheManager;
   import org.apache.avalon.repository.provider.InitialContext;
   import org.apache.avalon.repository.provider.Factory;
  @@ -534,7 +535,8 @@
       * @return the repository
       */
       private CacheManager createCacheManager( 
  -      InitialContext context, KernelCriteria criteria, String[] hosts, Configuration config
)
  +      InitialContext context, KernelCriteria criteria, 
  +      String[] hosts, Configuration config )
         throws KernelException
       {
           File root = criteria.getRepositoryDirectory();
  @@ -546,7 +548,8 @@
       }
   
       private CacheManager createCacheManager( 
  -      InitialContext context, File cache, String[] hosts, Configuration proxyConfig ) 
  +      InitialContext context, File cache, String[] hosts, 
  +      Configuration proxyConfig ) 
         throws KernelException
       {
           //
  @@ -654,13 +657,15 @@
       * @param config the kernel configuration 
       * @return the logging manager
       */
  -    private LoggingManager createLoggingManager( KernelCriteria criteria, Configuration
config )
  +    private LoggingManager createLoggingManager( 
  +      KernelCriteria criteria, Configuration config )
         throws Exception
       {
           File dir = criteria.getWorkingDirectory();
           Configuration conf = getLoggingConfiguration( criteria, config );
           Artifact artifact = criteria.getLoggingImplementation();
  -        Factory factory = m_context.createFactory( m_classloader, artifact );
  +        Builder builder = m_context.newBuilder( m_classloader, artifact );
  +        Factory factory = builder.getFactory();
           LoggingCriteria params = getLoggingCriteria( factory );
           params.setBaseDirectory( dir );
           params.setConfiguration( conf );
  
  
  
  1.14      +3 -2      avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
  
  Index: MerlinBean.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- MerlinBean.java	24 Jan 2004 23:25:32 -0000	1.13
  +++ MerlinBean.java	25 Jan 2004 13:18:49 -0000	1.14
  @@ -130,7 +130,8 @@
                   MERLIN_PROPERTIES, 
                   IMPLEMENTATION_KEY );
   
  -            Factory factory = context.createFactory( artifact );
  +            Builder builder = context.newBuilder( artifact );
  +            Factory factory = builder.getFactory();
               Map criteria = factory.createDefaultCriteria();
   
               applyLocalProperties( criteria );
  
  
  
  1.5       +8 -1      avalon/merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet/MerlinServlet.java
  
  Index: MerlinServlet.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/servlet/src/java/org/apache/avalon/merlin/servlet/MerlinServlet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MerlinServlet.java	24 Jan 2004 23:25:32 -0000	1.4
  +++ MerlinServlet.java	25 Jan 2004 13:18:49 -0000	1.5
  @@ -31,10 +31,14 @@
   
   import org.apache.avalon.activation.appliance.Appliance;
   import org.apache.avalon.activation.appliance.Block;
  +
   import org.apache.avalon.composition.model.ContainmentModel;
  +
   import org.apache.avalon.framework.logger.Logger;
  +
   import org.apache.avalon.merlin.Kernel;
   import org.apache.avalon.merlin.KernelCriteria;
  +
   import org.apache.avalon.repository.Artifact;
   import org.apache.avalon.repository.provider.Builder;
   import org.apache.avalon.repository.provider.InitialContext;
  @@ -42,6 +46,7 @@
   import org.apache.avalon.repository.RepositoryException;
   import org.apache.avalon.repository.main.DefaultInitialContext;
   import org.apache.avalon.repository.main.DefaultBuilder;
  +
   import org.apache.avalon.util.exception.ExceptionHelper;
   import org.apache.avalon.util.env.Env;
   
  @@ -106,7 +111,9 @@
                   MERLIN_PROPERTIES, 
                   IMPLEMENTATION_KEY );
   
  -            Factory factory = context.createFactory( artifact );
  +            Builder builder = context.newBuilder( artifact );
  +            Factory factory = builder.getFactory();
  +
               m_criteria = (KernelCriteria) factory.createDefaultCriteria();
   
               m_criteria.put( "merlin.server", "true" );
  
  
  
  1.2       +3 -2      avalon/merlin/logging/logkit/test/src/test/org/apache/avalon/logging/logkit/test/DefaultLoggingManagerTestCase.java
  
  Index: DefaultLoggingManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/logging/logkit/test/src/test/org/apache/avalon/logging/logkit/test/DefaultLoggingManagerTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultLoggingManagerTestCase.java	24 Jan 2004 23:25:33 -0000	1.1
  +++ DefaultLoggingManagerTestCase.java	25 Jan 2004 13:18:49 -0000	1.2
  @@ -69,7 +69,8 @@
           Artifact artifact = Artifact.createArtifact( 
             "avalon-logging", "avalon-logkit-impl", "1.0-SNAPSHOT" );
   
  -        Factory factory = m_context.createFactory( artifact );
  +        Builder builder = m_context.newBuilder( artifact );
  +        Factory factory = builder.getFactory();
           Map criteria = factory.createDefaultCriteria();
   
           //
  
  
  

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


Mime
View raw message