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/site/xdocs/starting/installation cvs.xml install.3.3.xml
Date Mon, 19 Apr 2004 10:50:42 GMT
mcconnell    2004/04/19 03:50:42

  Modified:    merlin   INSTALL.TXT
               merlin/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultFactory.java
               merlin/site/xdocs/starting/installation cvs.xml
                        install.3.3.xml
  Log:
  Doc updates.
  
  Revision  Changes    Path
  1.20      +9 -12     avalon/merlin/INSTALL.TXT
  
  Index: INSTALL.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- INSTALL.TXT	4 Apr 2004 15:49:05 -0000	1.19
  +++ INSTALL.TXT	19 Apr 2004 10:50:42 -0000	1.20
  @@ -15,7 +15,9 @@
       README.TXT
       LICENSE.TXT
       INSTALL.TXT
  -  /plugins
  +
  +Available development tools related to the maven build system include:
  +
       @META_PLUGIN_JAR@
       @MERLIN_PLUGIN_JAR@
   
  @@ -45,23 +47,18 @@
   Versions of Merlin prior to the 3.2-dev 20031210 build maintained 
   a local repository of jar files under the %MERLIN_HOME%/repository
   directory.  As of the 20031210 build the repository is maintained 
  -under AVALON_HOME which defaults to ${user.home}/.avalon.  To 
  -override this behaviour you can either define a AVALON_HOME 
  -environment variable or you can add a merlin.properties file to 
  -${user.home} containing the "merlin.repository" property key and 
  -a value point to you preferred repository location.
  +under AVALON_HOME/repository where AVALON_HOME defaults to 
  +${user.home}/.avalon.  To override the AVALON_HOME location you can 
  +either define a AVALON_HOME environment variable or you can add a 
  +merlin.properties file to ${user.home} containing the 
  +"merlin.repository" property key and a value point to you preferred 
  +repository location.
   
   To confirm that your environment variables are correct, you
   should open a new command window and invoke the Merlin
   CLI application.
   
  -Under DOS:
  -
     $ merlin -version
  -
  -Under Lunix:
  -
  -  $ merlin.sh -version
   
   The installation of Merlin is now complete, however, two plugins are
   provided with the installation supporting merlin development under the 
  
  
  
  1.42      +3 -3      avalon/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
  
  Index: DefaultFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- DefaultFactory.java	1 Apr 2004 20:06:21 -0000	1.41
  +++ DefaultFactory.java	19 Apr 2004 10:50:42 -0000	1.42
  @@ -258,7 +258,7 @@
           // install any blocks declared within the kernel context
           //
   
  -        getLogger().info( "install phase" );
  +        getLogger().debug( "install phase" );
           URL[] urls = criteria.getDeploymentURLs();
           for( int i=0; i<urls.length; i++ )
           {
  @@ -266,7 +266,7 @@
   
               if( getLogger().isInfoEnabled() )
               {
  -                getLogger().info( 
  +                getLogger().debug( 
                     "installing: " 
                     + StringHelper.toString( url ) );
               }
  @@ -472,7 +472,7 @@
       private ContainmentModel createApplicationModel( 
         SystemContext system, Configuration config ) throws Exception
       {
  -        getLogger().info( "building application model" );
  +        getLogger().debug( "building application model" );
           LoggingManager logging = system.getLoggingManager();
           final Logger logger = logging.getLoggerForCategory("");
           ClassLoader api = system.getAPIClassLoader();
  
  
  
  1.4       +1 -1      avalon/merlin/site/xdocs/starting/installation/cvs.xml
  
  Index: cvs.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/installation/cvs.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cvs.xml	16 Apr 2004 13:42:48 -0000	1.3
  +++ cvs.xml	19 Apr 2004 10:50:42 -0000	1.4
  @@ -101,7 +101,7 @@
                   </p>
                   <p>
                   The following maven command will install a plugin into the maven system

  -                (check dstribution for latest version numbers).
  +                (check distribution for latest version numbers).
                   </p>
   <source><![CDATA[
   $ maven -DgroupId=avalon-util -DartifactId=avalon-util-plugin -Dversion=1.0.dev-0 plugin:download
  
  
  
  1.3       +15 -21    avalon/merlin/site/xdocs/starting/installation/install.3.3.xml
  
  Index: install.3.3.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/installation/install.3.3.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- install.3.3.xml	25 Jan 2004 13:28:50 -0000	1.2
  +++ install.3.3.xml	19 Apr 2004 10:50:42 -0000	1.3
  @@ -38,8 +38,6 @@
     /merlin
       /bin
       /config
  -    /docs
  -    /plugins
       /system
       README.TXT
       LICENSE.TXT
  @@ -84,38 +82,34 @@
   Versions of Merlin prior to the 3.2-dev 20031210 build maintained 
   a local repository of jar files under the %MERLIN_HOME%/repository
   directory.  As of the 20031210 build the repository is maintained 
  -under AVALON_HOME which defaults to ${user.home}/.avalon.  To 
  -override this behaviour you can either define a AVALON_HOME 
  -environment variable or you can add a merlin.properties file to 
  -${user.home} containing the "merlin.repository" property key and 
  -a value point to you preferred repository location.
  +under AVALON_HOME/repository where AVALON_HOME defaults to 
  +${user.home}/.avalon.  To override the AVALON_HOME directory you 
  +can either define a AVALON_HOME environment variable or you can 
  +add a merlin.properties file to ${user.home} containing the 
  +"merlin.repository" property key and a value point to you preferred 
  +repository location.
           </p>
   
         </subsection>
   
         <subsection name="Maven Plugin Installation">
  -        <p>
  -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).
  -        </p>
  -<source><![CDATA[
  -  %MAVEN_HOME%\plugins\avalon-meta-plugin-1.3.2.jar
  -  %MAVEN_HOME%\plugins\merlin-plugin-3.3-SNAPSHOT.jar
  -]]></source>
   
           <p>
  -Please note that if you are upgrading an existing Maven installation you must
  -delete the following two directories:
  +The merlin system installation is now complete.  Three plugins 
  +supporting development are provided and can be installed using the 
  +commands listed below (please check the packaged INSTALL.TXT for 
  +correct version numbers):
           </p>
   
   <source><![CDATA[
  -  %MAVEN_HOME%\plugins\merlin-plugin-* 
  -  %MAVEN_HOME%\plugins\avalon-meta-plugin-*
  +$ maven -DgroupId=avalon-util -DartifactId=avalon-util-plugin -Dversion=1.0.dev-0 plugin:download
  +$ maven -DgroupId=avalon-meta -DartifactId=avalon-meta-plugin -Dversion=1.4.dev-0 plugin:download
  +$ maven -DgroupId=merlin -DartifactId=merlin-plugin -Dversion=3.3.dev-0 plugin:download
   ]]></source>
   
         </subsection>
  +
  +
         <subsection name="Validating your installation.">
   
           <p>
  
  
  

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


Mime
View raw message