mcconnell    2003/12/05 00:27:45

  Modified:    kernel   maven.xml
               kernel/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultFactory.java
               kernel/unit/src/java/org/apache/avalon/merlin/unit
                        AbstractMerlinTestCase.java
  Log:
  Synchronize with repo property names.
  
  Revision  Changes    Path
  1.7       +6 -1      avalon-sandbox/kernel/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/maven.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- maven.xml 30 Nov 2003 05:55:29 -0000      1.6
  +++ maven.xml 5 Dec 2003 08:27:45 -0000       1.7
  @@ -8,7 +8,12 @@
     <goal name="avalon:build" description="Build all projects.">
       <maven:reactor basedir="${basedir}"
         includes="**/project.xml"
  -      excludes="**/target/**,platform/**,project.xml"
  +      excludes="**/target/**,unit/**,project.xml"
  +      goals=""
  +      banner="Building:"
  +      ignoreFailures="false" />
  +    <maven:reactor basedir="${basedir}"
  +      includes="unit/project.xml"
         goals=""
         banner="Building:"
         ignoreFailures="false" />
  
  
  
  1.8       +1 -1      
avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
  
  Index: DefaultFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultFactory.java       5 Dec 2003 03:17:01 -0000       1.7
  +++ DefaultFactory.java       5 Dec 2003 08:27:45 -0000       1.8
  @@ -496,7 +496,7 @@
           {
               Factory factory = context.getInitialFactory();
               Map criteria = factory.createDefaultCriteria();
  -            criteria.put( "avalon.repository.remote.url", hosts );
  +            criteria.put( "avalon.repository.host", hosts );
   
               Configuration proxyConfig = config.getChild( "proxy", false );
               if( null != proxyConfig )
  
  
  
  1.4       +1 -2      
avalon-sandbox/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
  
  Index: AbstractMerlinTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractMerlinTestCase.java       5 Dec 2003 06:51:14 -0000       1.3
  +++ AbstractMerlinTestCase.java       5 Dec 2003 08:27:45 -0000       1.4
  @@ -288,7 +288,7 @@
   
       private File getBaseDirectory()
       {
  -        String base = System.getProperty( "basedir" );
  +        final String base = System.getProperty( "basedir" );
           if( null != base )
           {
               return new File( base );
  @@ -298,7 +298,6 @@
   
       private static String[] getDefaultHosts()
       {
  -        System.out.println( System.getProperty( "maven.repo.remote" ) );
           return new String[]{ 
             "http://dpml.net/";,
             "http://www.ibiblio.org/maven/";
  
  
  

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

Reply via email to