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/platform/xdocs/starting/installation/3.2 binary.xml
Date Thu, 11 Dec 2003 04:51:50 GMT
mcconnell    2003/12/10 20:51:50

  Modified:    merlin   INSTALLATION.TXT maven.xml
               merlin/kernel/cli/src/test/org/apache/avalon/merlin/cli/test
                        MerlinCLITestCase.java
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultCriteria.java
               merlin/kernel/plugin project.xml
               merlin/kernel/plugin/src/java/org/apache/avalon/merlin/tools
                        MerlinBean.java
               merlin/kernel/unit project.xml
               merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
                        AbstractMerlinTestCase.java
               merlin/platform/tutorials/hello project.xml
               merlin/platform/tutorials/parameterization project.xml
               merlin/platform/tutorials/parameterization/src/test/tutorial
                        StandardTestCase.java
               merlin/platform/xdocs/starting/advanced/unit index.xml
               merlin/platform/xdocs/starting/installation/3.2 binary.xml
  Log:
  Correct the maven repo resolution.
  
  Revision  Changes    Path
  1.5       +6 -6      avalon/merlin/INSTALLATION.TXT
  
  Index: INSTALLATION.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/INSTALLATION.TXT,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- INSTALLATION.TXT	10 Dec 2003 09:10:01 -0000	1.4
  +++ INSTALLATION.TXT	11 Dec 2003 04:51:49 -0000	1.5
  @@ -18,7 +18,7 @@
       INSTALLATION.TXT
     /plugins
       avalon-meta-plugin-1.2.jar
  -    merlin-plugin-3.2-dev.jar
  +    merlin-plugin-3.2.1-dev.jar
   
   
   Installing Merlin.
  @@ -67,16 +67,16 @@
   The installation of Merlin is now complete, however, two plugins are
   provided with the installation supporting merlin development under the 
   Maven platform.  These plugins should be placed in the Maven plugin 
  -directory (%MAVEN_HOME%\plugins).
  +directory (${maven.home.local}\plugins).
   
  -  %MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
  -  %MAVEN_HOME%\plugins\merlin-plugin-3.2-dev.jar
  +  [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-1.2.jar
  +  [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.1-dev.jar
   
   Please note that if you are upgrading an existing installation you must
   delete the following two directories:
   
  -  %MAVEN_HOME%\plugins\merlin-plugin-* 
  -  %MAVEN_HOME%\plugins\avalon-meta-plugin-*
  +  [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
  +  [YOUR-MAVEN-HOME]\plugins\merlin-plugin-* 
   
   Replace the existing avalon-meta and merlin plugin jar files with the supplied
   versions.  Finally, delete all *.cache files in the Maven plugin directory.
  
  
  
  1.18      +1 -1      avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- maven.xml	10 Dec 2003 13:21:30 -0000	1.17
  +++ maven.xml	11 Dec 2003 04:51:49 -0000	1.18
  @@ -5,7 +5,7 @@
     <ant:property name="merlin.cli.jar" value="merlin-cli-3.2-dev.jar"/>
     <ant:property name="avalon.plugin.jar" value="avalon-plugin-1.0-dev.jar"/>
     <ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.2.jar"/>
  -  <ant:property name="merlin.plugin.jar" value="merlin-plugin-3.2-dev.jar"/>
  +  <ant:property name="merlin.plugin.jar" value="merlin-plugin-3.2.1-dev.jar"/>
   
     <ant:property file="project.properties"/>
     <ant:property name="maven.docs.src" value="${basedir}/platform/xdocs"/>
  
  
  
  1.2       +0 -6      avalon/merlin/kernel/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITestCase.java
  
  Index: MerlinCLITestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MerlinCLITestCase.java	9 Dec 2003 05:21:41 -0000	1.1
  +++ MerlinCLITestCase.java	11 Dec 2003 04:51:49 -0000	1.2
  @@ -137,12 +137,6 @@
                   Env.getEnvVariable( "MAVEN_HOME_LOCAL" ) );
               if( null != local ) return local;
   
  -            String maven = 
  -              System.getProperty( 
  -                "maven.home", 
  -                Env.getEnvVariable( "MAVEN_HOME" ) );
  -            if( null != maven ) return maven;
  -
               return System.getProperty( "user.home" ) + File.separator + ".maven";
   
           }
  
  
  
  1.5       +1 -4      avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
  
  Index: DefaultCriteria.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultCriteria.java	9 Dec 2003 13:46:33 -0000	1.4
  +++ DefaultCriteria.java	11 Dec 2003 04:51:49 -0000	1.5
  @@ -556,9 +556,6 @@
                 properties, "merlin.home", 
                 Env.getEnvVariable( "MERLIN_HOME" ) );
               setProperty( 
  -              properties, "maven.home", 
  -              Env.getEnvVariable( "MAVEN_HOME" ) );
  -            setProperty( 
                 properties, "maven.home.local", 
                 Env.getEnvVariable( "MAVEN_HOME_LOCAL" ) );
               return properties;
  
  
  
  1.13      +1 -1      avalon/merlin/kernel/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- project.xml	8 Dec 2003 15:37:13 -0000	1.12
  +++ project.xml	11 Dec 2003 04:51:49 -0000	1.13
  @@ -10,7 +10,7 @@
     <description>Merlin Plugin for Maven</description>
     <shortDescription>Merlin Plugin for Maven</shortDescription>
     <package>org.apache.avalon.merlin</package>
  -  <currentVersion>3.2-dev</currentVersion>
  +  <currentVersion>3.2.1-dev</currentVersion>
   
     <dependencies>
       <dependency>
  
  
  
  1.5       +8 -7      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MerlinBean.java	8 Dec 2003 15:37:13 -0000	1.4
  +++ MerlinBean.java	11 Dec 2003 04:51:49 -0000	1.5
  @@ -230,13 +230,14 @@
                   Env.getEnvVariable( "MAVEN_HOME_LOCAL" ) );
               if( null != local ) return local;
   
  -            String maven = 
  -              System.getProperty( 
  -                "maven.home", 
  -                Env.getEnvVariable( "MAVEN_HOME" ) );
  -            if( null != maven ) return maven;
  +            //String maven = 
  +            //  System.getProperty( 
  +            //    "maven.home", 
  +            //    Env.getEnvVariable( "MAVEN_HOME" ) );
  +            //if( null != maven ) return maven;
   
  -            return System.getProperty( "user.home" ) + File.separator + ".maven";
  +            return System.getProperty( "user.home" ) 
  +              + File.separator + ".maven";
   
           }
           catch( Throwable e )
  
  
  
  1.16      +2 -2      avalon/merlin/kernel/unit/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project.xml	8 Dec 2003 15:37:13 -0000	1.15
  +++ project.xml	11 Dec 2003 04:51:49 -0000	1.16
  @@ -6,8 +6,8 @@
   
     <groupId>merlin</groupId>
     <id>merlin-unit</id>
  -  <name>Merlin Test</name>
  -  <currentVersion>3.2.5-dev</currentVersion>
  +  <name>Merlin Unit Test</name>
  +  <currentVersion>3.2.6-dev</currentVersion>
   
     <package>org.apache.avalon.merlin</package>
   
  
  
  
  1.19      +1 -40     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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AbstractMerlinTestCase.java	10 Dec 2003 14:12:06 -0000	1.18
  +++ AbstractMerlinTestCase.java	11 Dec 2003 04:51:49 -0000	1.19
  @@ -324,23 +324,6 @@
   
       private static String getMavenHome()
       {
  -System.out.println( 
  -  "### ${maven.home} == [" 
  -  + System.getProperty( "maven.home" ) 
  -  + "]" );
  -System.out.println( 
  -  "### ${maven.home.local} == [" 
  -  + System.getProperty( "maven.home.local" ) 
  -  + "]" );
  -System.out.println( 
  -  "### MAVEN_HOME == [" 
  -  + getEnvValue( "MAVEN_HOME" ) 
  -  + "]" );
  -System.out.println( 
  -  "### MAVEN_HOME_LOCAL == [" 
  -  + getEnvValue( "MAVEN_HOME_LOCAL" ) 
  -  + "]" );
  -
           try
           {
               String local = 
  @@ -348,29 +331,7 @@
                   "maven.home.local", 
                   Env.getEnvVariable( "MAVEN_HOME_LOCAL" ) );
   
  -System.out.println( 
  -  "### local == [" 
  -  + local 
  -  + "]" );
  -
               if( null != local ) return local;
  -
  -            String maven = 
  -              System.getProperty( 
  -                "maven.home", 
  -                Env.getEnvVariable( "MAVEN_HOME" ) );
  -
  -System.out.println( 
  -  "### maven == [" 
  -  + maven 
  -  + "]" );
  -
  -            if( null != maven ) return maven;
  -
  -System.out.println( 
  -  "### fallback == [" 
  -  + System.getProperty( "user.home" ) + File.separator + ".maven" 
  -  + "]" );
   
               return System.getProperty( "user.home" ) + File.separator + ".maven";
   
  
  
  
  1.9       +1 -1      avalon/merlin/platform/tutorials/hello/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	10 Dec 2003 08:25:32 -0000	1.8
  +++ project.xml	11 Dec 2003 04:51:50 -0000	1.9
  @@ -27,7 +27,7 @@
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-unit</artifactId>
  -      <version>3.2.5-dev</version>
  +      <version>3.2.6-dev</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.3       +1 -1      avalon/merlin/platform/tutorials/parameterization/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/parameterization/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Dec 2003 13:31:48 -0000	1.2
  +++ project.xml	11 Dec 2003 04:51:50 -0000	1.3
  @@ -27,7 +27,7 @@
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-unit</artifactId>
  -      <version>3.2.5-dev</version>
  +      <version>3.2.6-dev</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.3       +1 -2      avalon/merlin/platform/tutorials/parameterization/src/test/tutorial/StandardTestCase.java
  
  Index: StandardTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/tutorials/parameterization/src/test/tutorial/StandardTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StandardTestCase.java	10 Dec 2003 13:19:46 -0000	1.2
  +++ StandardTestCase.java	11 Dec 2003 04:51:50 -0000	1.3
  @@ -79,8 +79,7 @@
       public void testServiceResolution() throws Exception
       {
           Object hello = resolve( "hello" );
  -        assertTrue( hello != null );
  -        getLogger().info( "Hello established." );
  +        assertNotNull( "hello", hello );
       }
   }
   
  
  
  
  1.5       +1 -1      avalon/merlin/platform/xdocs/starting/advanced/unit/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/unit/index.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index.xml	10 Dec 2003 08:34:20 -0000	1.4
  +++ index.xml	11 Dec 2003 04:51:50 -0000	1.5
  @@ -71,7 +71,7 @@
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-unit</artifactId>
  -      <version>3.2.5-dev</version>
  +      <version>3.2.6-dev</version>
       </dependency>
   ]]></source>
           <p>
  
  
  
  1.2       +3 -3      avalon/merlin/platform/xdocs/starting/installation/3.2/binary.xml
  
  Index: binary.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/installation/3.2/binary.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- binary.xml	10 Dec 2003 08:21:54 -0000	1.1
  +++ binary.xml	11 Dec 2003 04:51:50 -0000	1.2
  @@ -75,7 +75,7 @@
       LICENSE.TXT
     /plugins
       avalon-meta-plugin-1.2.jar
  -    merlin-plugin-3.2-dev.jar
  +    merlin-plugin-3.2.1-dev.jar
   ]]></source>
   
           <p>
  @@ -137,7 +137,7 @@
           </p>
   <source><![CDATA[
     %MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
  -  %MAVEN_HOME%\plugins\merlin-plugin-3.2-dev.jar
  +  %MAVEN_HOME%\plugins\merlin-plugin-3.2.1-dev.jar
   ]]></source>
   
           <p>
  @@ -148,7 +148,7 @@
           </p>
   <source><![CDATA[
     %MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
  -  %MAVEN_HOME%\plugins\merlin-plugin-3.2-dev.jar
  +  %MAVEN_HOME%\plugins\merlin-plugin-3.2.1-dev.jar
   ]]></source>
   
           <p>
  
  
  

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


Mime
View raw message