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/facilities/http/test project.xml
Date Thu, 05 Feb 2004 03:17:44 GMT
mcconnell    2004/02/04 19:17:44

  Modified:    merlin   INSTALL.TXT STRUCTURE.TXT maven.xml project.xml
               merlin/facilities/http/api project.xml
               merlin/facilities/http/impl project.xml
               merlin/facilities/http/listener project.xml
               merlin/facilities/http/test project.xml
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.10      +99 -99    avalon/merlin/INSTALL.TXT
  
  Index: INSTALL.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- INSTALL.TXT	3 Feb 2004 04:53:41 -0000	1.9
  +++ INSTALL.TXT	5 Feb 2004 03:17:44 -0000	1.10
  @@ -1,99 +1,99 @@
  -
  -PROJECT: Merlin @VERSION@
  -====================================================================
  -
  -DESCRIPTION: 
  -------------
  -
  -This directory contains the merlin system installation and related 
  -resources.
  -
  -  /merlin
  -    /bin
  -    /config
  -    /system
  -    README.TXT
  -    LICENSE.TXT
  -    INSTALL.TXT
  -  /plugins
  -    @META_PLUGIN_JAR@
  -    @MERLIN_PLUGIN_JAR@
  -
  -
  -Installing Merlin.
  -------------------
  -
  -To use Merlin command line support or the Merlin NT Service
  -you will need to define the MERLIN_HOME environment
  -variable for your system and include MERLIN_HOME/bin in
  -your system path.  The MERLIN_HOME environment variable
  -should point to the merlin directory.
  -
  -Under Windows you can set environment variables by selecting the 
  -Environment Tab from the System Control Panel.
  -
  -Under Lunix you can do this as follows:
  -
  -  $ echo '
  -  > # set location of merlin
  -  > export MERLIN_HOME=/opt/merlin
  -  > # include it in the path
  -  > export PATH=$PATH:$MERLIN_HOME/bin
  -  > ' >> ~/.bash_profile
  -  $ source ~/.bash_profile
  -
  -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.
  -
  -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 
  -Maven platform.  These plugins should be placed in the Maven plugin 
  -directory (${maven.home.local}\plugins).
  -
  -  [YOUR-MAVEN-HOME]\plugins\@META_PLUGIN_JAR@
  -  [YOUR-MAVEN-HOME]\plugins\@MERLIN_PLUGIN_JAR@
  -
  -Please note that if you are upgrading an existing installation you must
  -delete the following two directories:
  -
  -  [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.
  -
  -You now have everything in place to start using the Merlin Tutorial or 
  -building you own components.  If you have any problems, please subscribe
  -and post a message to users@avalon.apache.org.
  -
  -Special Note for JRE 1.3 and earlier.
  --------------------------------------
  -
  -Some applications assume that XML parsing classes are available withing
  -the JRE.  This is not the case with JDK 1.3 and earlier.  To resolve this
  -you can copy the following files to the JAVAHOME/lib/ext directory or 
  -declare an alternative directory as a JVM argument under the 
  -MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
  -
  -  system/xml-apis/jars/xml-apis-2.0.2.jar
  -  system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
  -  system/xerces/jars/xerces-2.4.0.jar
  -
  +
  +PROJECT: Merlin @VERSION@
  +====================================================================
  +
  +DESCRIPTION: 
  +------------
  +
  +This directory contains the merlin system installation and related 
  +resources.
  +
  +  /merlin
  +    /bin
  +    /config
  +    /system
  +    README.TXT
  +    LICENSE.TXT
  +    INSTALL.TXT
  +  /plugins
  +    @META_PLUGIN_JAR@
  +    @MERLIN_PLUGIN_JAR@
  +
  +
  +Installing Merlin.
  +------------------
  +
  +To use Merlin command line support or the Merlin NT Service
  +you will need to define the MERLIN_HOME environment
  +variable for your system and include MERLIN_HOME/bin in
  +your system path.  The MERLIN_HOME environment variable
  +should point to the merlin directory.
  +
  +Under Windows you can set environment variables by selecting the 
  +Environment Tab from the System Control Panel.
  +
  +Under Lunix you can do this as follows:
  +
  +  $ echo '
  +  > # set location of merlin
  +  > export MERLIN_HOME=/opt/merlin
  +  > # include it in the path
  +  > export PATH=$PATH:$MERLIN_HOME/bin
  +  > ' >> ~/.bash_profile
  +  $ source ~/.bash_profile
  +
  +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.
  +
  +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 
  +Maven platform.  These plugins should be placed in the Maven plugin 
  +directory (${maven.home.local}\plugins).
  +
  +  [YOUR-MAVEN-HOME]\plugins\@META_PLUGIN_JAR@
  +  [YOUR-MAVEN-HOME]\plugins\@MERLIN_PLUGIN_JAR@
  +
  +Please note that if you are upgrading an existing installation you must
  +delete the following two directories:
  +
  +  [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.
  +
  +You now have everything in place to start using the Merlin Tutorial or 
  +building you own components.  If you have any problems, please subscribe
  +and post a message to users@avalon.apache.org.
  +
  +Special Note for JRE 1.3 and earlier.
  +-------------------------------------
  +
  +Some applications assume that XML parsing classes are available withing
  +the JRE.  This is not the case with JDK 1.3 and earlier.  To resolve this
  +you can copy the following files to the JAVAHOME/lib/ext directory or 
  +declare an alternative directory as a JVM argument under the 
  +MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
  +
  +  system/xml-apis/jars/xml-apis-2.0.2.jar
  +  system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
  +  system/xerces/jars/xerces-2.4.0.jar
  +
  
  
  
  1.4       +0 -3      avalon/merlin/STRUCTURE.TXT
  
  Index: STRUCTURE.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/STRUCTURE.TXT,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- STRUCTURE.TXT	15 Jan 2004 12:23:04 -0000	1.3
  +++ STRUCTURE.TXT	5 Feb 2004 03:17:44 -0000	1.4
  @@ -33,9 +33,6 @@
           +- src                   resources used to build a merlin installation
           +- tutorials             several merlin tutorials
           +- xdocs                 site documentation src 
  -    +-- repository
  -        +- spi                   resource repository interfaces
  -        +- impl                  resource repository implementation
       +-- target                   
           +- merlin                the generated installation (see 
                                    build procedure detailed below)
  
  
  
  1.47      +3 -42     avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- maven.xml	3 Feb 2004 04:53:41 -0000	1.46
  +++ maven.xml	5 Feb 2004 03:17:44 -0000	1.47
  @@ -87,46 +87,7 @@
     -->
   
     <goal name="avalon:build" description="Build Merlin."
  -    prereqs="avalon:build-logging,avalon:build-main,avalon:build-kernel,avalon:build-plugin,avalon:build-facilities"/>
  -
  -  <goal name="avalon:build-logging" description="Build Logging.">
  -
  -    <!-- build the logging service -->
  -    <maven:reactor basedir="${basedir}"
  -      includes="logging/**/project.xml"
  -      excludes="logging/logkit/test/project.xml"
  -      banner="Installing:"
  -      goals="jar:install"
  -      ignoreFailures="false" 
  -      postProcessing="true" />
  -    <j:forEach var="child" items="${reactorProjects}">
  -        <ant:copy todir="${maven.build.dir}/merlin/system/${child.groupId}/jars" 
  -             preserveLastModified="true">
  -          <ant:fileset dir="${child.file.parentFile}/target">
  -            <ant:include 
  -              name="${child.artifactId}-${child.currentVersion}.jar"/>
  -            <ant:include 
  -              name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
  -          </ant:fileset>
  -        </ant:copy>
  -        <j:set var="deps" value="${child.dependencies}"/>
  -        <j:forEach var="dep" items="${deps}">
  -          <ant:copy todir="${maven.build.dir}/merlin/system"
  -              preserveLastModified="true">
  -            <ant:fileset dir="${maven.repo.local}">
  -              <ant:include name="${dep.getArtifactDirectory()}/${dep.getType()}s/${dep.getArtifact()}"/>
  -            </ant:fileset>
  -          </ant:copy>
  -        </j:forEach>
  -    </j:forEach>
  -
  -    <!-- execute the logging service test -->
  -    <maven:reactor basedir="${basedir}"
  -      includes="logging/logkit/test/project.xml"
  -      banner="Testing:"
  -      goals="test:test"
  -      ignoreFailures="false" />
  -  </goal>
  +    prereqs="avalon:build-main,avalon:build-kernel,avalon:build-plugin,avalon:build-facilities"/>
   
     <goal name="avalon:build-main" description="Build Merlin.">
       <maven:reactor basedir="${basedir}"
  @@ -242,7 +203,6 @@
       description="Build the Merlin distribution." prereqs="avalon:build,avalon:xinstall"/>
   
     <goal name="avalon:xinstall">
  -
       <!-- add supporting resources -->
       <ant:copy toDir="${merlin.build.inst.dir}">
         <fileset dir="${basedir}">
  @@ -427,7 +387,7 @@
     <goal name="xjavadoc">
   
       <maven:reactor basedir="${basedir}"
  -      includes="activation/**/project.xml,composition/**/project.xml,extension/**/project.xml,kernel/**/project.xml,facilities/**/project.xml,logging/**/project.xml"
  +      includes="activation/**/project.xml,composition/**/project.xml,extension/**/project.xml,kernel/**/project.xml,facilities/**/project.xml"
         excludes="**/target/**,facilities/*/project.xml,**/test/project.xml"
         banner="Site Prep:"
         ignoreFailures="false"
  @@ -552,6 +512,7 @@
     -->
   
     <goal name="avalon:replicate">
  +<echo>1</echo>
       <mkdir dir="${merlin.home}"/>
       <copy toDir="${merlin.home}">
         <fileset dir="${merlin.build.inst.dir}"/>
  
  
  
  1.26      +6 -0      avalon/merlin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/project.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- project.xml	19 Jan 2004 21:43:58 -0000	1.25
  +++ project.xml	5 Feb 2004 03:17:44 -0000	1.26
  @@ -246,6 +246,12 @@
       </packageGroup>
     </packageGroups>
   
  +  <reports>
  +    <report>maven-changelog-plugin</report>
  +    <report>maven-file-activity-plugin</report>
  +    <report>maven-developer-activity-plugin</report>
  +  </reports> 
  +
     <build>
   
       <nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
  
  
  
  1.4       +1 -1      avalon/merlin/facilities/http/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/http/api/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	2 Feb 2004 19:33:44 -0000	1.3
  +++ project.xml	5 Feb 2004 03:17:44 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../../../project.xml</extend>
   
     <id>avalon-http-api</id>
     <name>Avalon HTTP API</name>
  
  
  
  1.4       +1 -1      avalon/merlin/facilities/http/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/http/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	2 Feb 2004 03:29:22 -0000	1.3
  +++ project.xml	5 Feb 2004 03:17:44 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../../../project.xml</extend>
   
     <id>avalon-http-impl</id>
     <name>Avalon HTTP Implementation</name>
  
  
  
  1.4       +1 -1      avalon/merlin/facilities/http/listener/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/http/listener/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	4 Feb 2004 18:15:14 -0000	1.3
  +++ project.xml	5 Feb 2004 03:17:44 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../../../project.xml</extend>
   
     <id>avalon-http-listener</id>
     <name>Avalon HTTP Model Listener</name>
  
  
  
  1.2       +1 -1      avalon/merlin/facilities/http/test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/http/test/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	2 Feb 2004 03:29:22 -0000	1.1
  +++ project.xml	5 Feb 2004 03:17:44 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../../../project.xml</extend>
   
     <id>avalon-http-test</id>
     <name>Avalon HTTP Test</name>
  
  
  

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


Mime
View raw message