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/repository/impl/src/java/org/apache/avalon/repository/impl DefaultFactory.java
Date Fri, 28 Nov 2003 11:58:47 GMT
mcconnell    2003/11/28 03:58:47

  Modified:    merlin   platform.xml project.xml
               merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
                        AbstractBlock.java DefaultAppliance.java
               merlin/kernel/impl project.xml
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
                        Resources.properties
               merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
                        AbstractMerlinTestCase.java
               merlin/platform/src/etc site.jsl
               merlin/platform/tutorials/hello/conf hello.block
               merlin/repository/impl project.xml
               merlin/repository/impl/src/java/org/apache/avalon/repository/impl
                        DefaultFactory.java
  Removed:     merlin/platform/tutorials/hello/conf bar.xml
  Log:
  Housekeeping (including operation service patch from ronald@innovation.ch)
  
  Revision  Changes    Path
  1.12      +1 -1      avalon/merlin/platform.xml
  
  Index: platform.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- platform.xml	22 Nov 2003 13:00:31 -0000	1.11
  +++ platform.xml	28 Nov 2003 11:58:46 -0000	1.12
  @@ -46,7 +46,7 @@
       <dependency>
         <groupId>avalon-util</groupId>
         <artifactId>avalon-util-defaults</artifactId>
  -      <version>1.0-dev</version>
  +      <version>1.1-dev</version>
       </dependency>
   
       <dependency>
  
  
  
  1.10      +9 -4      avalon/merlin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	22 Nov 2003 12:52:55 -0000	1.9
  +++ project.xml	28 Nov 2003 11:58:46 -0000	1.10
  @@ -33,15 +33,20 @@
     <mailingLists>
       <mailingList>
         <name>Avalon Developer List</name>
  -      <subscribe>avalon-dev-subscribe@avalon.apache.org</subscribe>
  -      <unsubscribe>avalon-dev-unsubscribe@avalon.apache.org</unsubscribe>
  +      <subscribe>dev-subscribe@avalon.apache.org</subscribe>
  +      <unsubscribe>dev-unsubscribe@avalon.apache.org</unsubscribe>
         <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=dev@avalon.apache.org</archive>
       </mailingList>
       <mailingList>
         <name>Avalon User List</name>
  -      <subscribe>avalon-users-subscribe@avalon.apache.org</subscribe>
  -      <unsubscribe>avalon-users-unsubscribe@avalon.apache.org</unsubscribe>
  +      <subscribe>users-subscribe@avalon.apache.org</subscribe>
  +      <unsubscribe>users-unsubscribe@avalon.apache.org</unsubscribe>
         <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=users@avalon.apache.org</archive>
  +    </mailingList>
  +    <mailingList>
  +      <name>CVS List</name>
  +      <subscribe>cvs-subscribe@avalon.apache.org</subscribe>
  +      <unsubscribe>cvs-unsubscribe@avalon.apache.org</unsubscribe>
       </mailingList>
     </mailingLists>
   
  
  
  
  1.5       +6 -2      avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java
  
  Index: AbstractBlock.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractBlock.java	22 Nov 2003 12:52:55 -0000	1.4
  +++ AbstractBlock.java	28 Nov 2003 11:58:46 -0000	1.5
  @@ -232,9 +232,13 @@
           // if possible - otherwise throw an exception
           //
   
  -        if( m_context.getEngine() != null )
  +        if( null != m_context.getEngine() )
           {
               return m_context.getEngine().locate( dependency );
  +        }
  +        else if( dependency.isOptional() )
  +        {
  +            return null;
           }
           else
           {
  
  
  
  1.12      +10 -7     avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultAppliance.java	2 Nov 2003 23:12:50 -0000	1.11
  +++ DefaultAppliance.java	28 Nov 2003 11:58:46 -0000	1.12
  @@ -354,13 +354,16 @@
                   {
                       final Appliance appliance = 
                         m_engine.locate( dependency );
  -                    registerListener( appliance );
  -                    m_providers.put( key, appliance );
  -                    if( getLogger().isDebugEnabled() )
  +                    if( null != appliance )
                       {
  -                        getLogger().debug( 
  -                          "assigning service provider for key (" 
  -                          + key + "): " + appliance );
  +                        registerListener( appliance );
  +                        m_providers.put( key, appliance );
  +                        if( getLogger().isDebugEnabled() )
  +                        {
  +                            getLogger().debug( 
  +                              "assigning service provider for key (" 
  +                              + key + "): " + appliance );
  +                        }
                       }
                   }
                   catch( Throwable e )
  
  
  
  1.10      +0 -1      avalon/merlin/kernel/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	22 Nov 2003 12:52:55 -0000	1.9
  +++ project.xml	28 Nov 2003 11:58:47 -0000	1.10
  @@ -153,7 +153,6 @@
         <version>4.1.5</version>
       </dependency>
   
  -
       <!-- logkit dependecies -->
   
       <dependency>
  
  
  
  1.2       +19 -4     avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/Resources.properties
  
  Index: Resources.properties
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/Resources.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Resources.properties	24 Sep 2003 09:33:19 -0000	1.1
  +++ Resources.properties	28 Nov 2003 11:58:47 -0000	1.2
  @@ -1,3 +1,22 @@
  +
  +template-description=Merlin Service Manangement Platform.
  +
  +template-repository-dir=The root directory for the local application repository. This directory
will used for the caching of artifacts such as jar files referenced by block include directives
and classloader resource references.  If not supplied the default value resolves to ${merlin.home}/repository.
  +
  +template-library-dir=The directory used as the base anchor for resolution of relative path
references for jar extension library directory statements in classloader directives. If not
supplied the value defaults to the current working directory.
  +
  +template-base-dir=The directory used as the working base directory. Working and temporary
directories are created relative to this directory in combination with the component partition
name. The default value is the current working directory ${user.dir}.
  +
  +template-kernel-url=A optional url to a kernel configuration.
  +
  +template-info-policy=The info generation policy option. If TRUE a summary listing of the
Merlin environment will be generated on system establishment.  This information is generally
useful when validating current version information and configuration paths.
  +
  +template-debug-policy=The debug generation policy. If TRUE debug level logging is automatically
enabled on all channels (typically only used when debugging an application).
  +
  +template-server-policy=The server mode execution policy. If TRUE the kernel will execute
in server mode otherwise components will be decommissioned following deployment.
  +
  +
  +
   url=url
   
   directory=directory
  @@ -33,7 +52,3 @@
   cli-library-description=A directory that serves as the anchor for relative library references.
   
   cli-description=\nDescription: The merlin command executes the deployment of one or more
component blocks.  The [block] argument may be either an block descriptor file or a jar file
containing a block descriptor.  If no value if declared, Merlin will attempt to execute a
file named 'block.xml' in the current directory.
  -
  -
  -
  -
  
  
  
  1.16      +18 -3     avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
  
  Index: AbstractMerlinTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- AbstractMerlinTestCase.java	5 Nov 2003 12:27:07 -0000	1.15
  +++ AbstractMerlinTestCase.java	28 Nov 2003 11:58:47 -0000	1.16
  @@ -391,10 +391,11 @@
       private File getMavenRepositoryDirectory()
       {
           //
  -        // get ${maven.home.local} system property - this may 
  +        // get ${maven.home.local} or ${maven.home} system property - this may 
           // be null in which case to fallback to ${user.home}/.maven
           //
   
  +        final String maven = System.getProperty( "maven.home" );
           final String local = System.getProperty( "maven.home.local" );
           if( local != null )
           {
  @@ -410,6 +411,20 @@
                   throw new UnitRuntimeException( error, e );
               }
           }
  +        else if( maven != null )
  +        {
  +            try
  +            {
  +                File sys = getDirectory( new File( maven ) );
  +                return getDirectory( new File( sys, "repository" ) );
  +            }
  +            catch( Throwable e )
  +            {
  +                final String error = 
  +                  "Unable to resolve repository from ${maven.home}.";
  +                throw new UnitRuntimeException( error, e );
  +            }
  +        }
           else
           {
               //
  @@ -423,8 +438,8 @@
                   try
                   {
                       File home = getDirectory( new File( userHome ) );
  -                    File maven = getDirectory( new File( home, ".maven" ) );
  -                    return getDirectory( new File( maven, "repository" ) );
  +                    File xmaven = getDirectory( new File( home, ".maven" ) );
  +                    return getDirectory( new File( xmaven, "repository" ) );
                   }
                   catch( Throwable e )
                   {
  
  
  
  1.6       +2 -11     avalon/merlin/platform/src/etc/site.jsl
  
  Index: site.jsl
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/src/etc/site.jsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- site.jsl	13 Nov 2003 01:56:42 -0000	1.5
  +++ site.jsl	28 Nov 2003 11:58:47 -0000	1.6
  @@ -104,17 +104,7 @@
                   </j:if>
                 </td>
   
  -              <!-- project logo and link -->
  -
  -              <td>
  -                <div align="right" id="login">
  -                  <a href='http://apachecon.com/2003/US/index.html'>
  -                    <img border='0' 
  -                      src='http://www.apache.org/~ceki/ac2003/ac2003-150.gif'/>
  -                  </a>
  -                </div>
  -              </td>
  -
  +              <td></td>
                 <!--
                 <td>
                   <div align="right" id="login">
  @@ -131,6 +121,7 @@
                   </div>
                 </td>
                 -->
  +
               </tr>
             </table>
           </div>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/tutorials/hello/conf/hello.block
  
  Index: hello.block
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/conf/hello.block,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hello.block	6 Nov 2003 22:07:13 -0000	1.1
  +++ hello.block	28 Nov 2003 11:58:47 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="merlin/tutorial:hello" version="1.0"/>
  +         <resource id="merlin/tutorial:hello" version="1.1"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.4       +1 -1      avalon/merlin/repository/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/repository/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	3 Nov 2003 23:57:29 -0000	1.3
  +++ project.xml	28 Nov 2003 11:58:47 -0000	1.4
  @@ -22,7 +22,7 @@
       <dependency>
         <groupId>avalon-util</groupId>
         <artifactId>avalon-util-defaults</artifactId>
  -      <version>1.0-dev</version>
  +      <version>1.1-dev</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.5       +6 -6      avalon/merlin/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java
  
  Index: DefaultFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultFactory.java	13 Nov 2003 01:56:42 -0000	1.4
  +++ DefaultFactory.java	28 Nov 2003 11:58:47 -0000	1.5
  @@ -61,10 +61,10 @@
   import java.net.MalformedURLException ;
   import java.net.PasswordAuthentication ;
   
  -import org.apache.avalon.defaults.Defaults ;
  -import org.apache.avalon.defaults.DefaultsFinder ;
  -import org.apache.avalon.defaults.SimpleDefaultsFinder ;
  -import org.apache.avalon.defaults.SystemDefaultsFinder ;
  +import org.apache.avalon.util.defaults.Defaults ;
  +import org.apache.avalon.util.defaults.DefaultsFinder ;
  +import org.apache.avalon.util.defaults.SimpleDefaultsFinder ;
  +import org.apache.avalon.util.defaults.SystemDefaultsFinder ;
   
   import org.apache.avalon.repository.Repository ;
   import org.apache.avalon.repository.ProxyContext ;
  
  
  

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


Mime
View raw message