You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/04/22 07:10:31 UTC

cvs commit: avalon/util/xdocs/plugin index.xml

mcconnell    2004/04/21 22:10:31

  Modified:    logging/logkit/impl maven.xml
               logging/logkit/plugins/datagram maven.xml
               logging/logkit/plugins/socket maven.xml
               logging/logkit/plugins/syslog maven.xml
               maven-plugins/artifact plugin.jelly
               merlin/impl maven.xml
               repository/impl maven.xml
               repository/site/xdocs/start/tutorial index.xml
               util/xdocs/plugin index.xml
  Log:
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.5       +2 -2      avalon/logging/logkit/impl/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/impl/maven.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- maven.xml	22 Apr 2004 04:38:05 -0000	1.4
  +++ maven.xml	22 Apr 2004 05:10:31 -0000	1.5
  @@ -1,7 +1,7 @@
  -<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
  +<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant" xmlns:artifact="avalon:artifact">
   
     <postGoal name="java:prepare-filesystem">
  -    <attainGoal name="avalon:artifact-install"/>
  +    <attainGoal name="artifact:install"/>
     </postGoal>
   
   
  
  
  
  1.3       +1 -1      avalon/logging/logkit/plugins/datagram/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/plugins/datagram/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	22 Apr 2004 04:38:05 -0000	1.2
  +++ maven.xml	22 Apr 2004 05:10:31 -0000	1.3
  @@ -1,7 +1,7 @@
   <project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
   
     <postGoal name="java:prepare-filesystem">
  -    <attainGoal name="avalon:artifact-install"/>
  +    <attainGoal name="artifact:install"/>
     </postGoal>
   
   </project>
  
  
  
  1.3       +1 -1      avalon/logging/logkit/plugins/socket/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/plugins/socket/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	22 Apr 2004 04:38:05 -0000	1.2
  +++ maven.xml	22 Apr 2004 05:10:31 -0000	1.3
  @@ -1,7 +1,7 @@
   <project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
   
     <postGoal name="java:prepare-filesystem">
  -    <attainGoal name="avalon:artifact-install"/>
  +    <attainGoal name="artifact:install"/>
     </postGoal>
   
   </project>
  
  
  
  1.3       +1 -1      avalon/logging/logkit/plugins/syslog/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/logging/logkit/plugins/syslog/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	22 Apr 2004 04:38:05 -0000	1.2
  +++ maven.xml	22 Apr 2004 05:10:31 -0000	1.3
  @@ -1,7 +1,7 @@
   <project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
   
     <postGoal name="java:prepare-filesystem">
  -    <attainGoal name="avalon:artifact-install"/>
  +    <attainGoal name="artifact:install"/>
     </postGoal>
   
   </project>
  
  
  
  1.4       +5 -6      avalon/maven-plugins/artifact/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/artifact/plugin.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.jelly	22 Apr 2004 04:35:11 -0000	1.3
  +++ plugin.jelly	22 Apr 2004 05:10:31 -0000	1.4
  @@ -4,17 +4,16 @@
     xmlns:define="jelly:define"
     xmlns:util="jelly:util"
     xmlns:maven="jelly:maven"
  -  xmlns:ant="jelly:ant"
  -  xmlns:avalon="avalon-artifact">
  +  xmlns:ant="jelly:ant" >
   
  -  <goal name="avalon:artifact-install" prereqs="avalon:artifact">
  +  <define:taglib uri="avalon:artifact"/>
  +
  +  <goal name="artifact:install" prereqs="artifact:create">
       <ant:copy toDir="${maven.repo.local}/${pom.groupId}/jars" 
          file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar.meta" 
          verbose="yes"/>
     </goal>
   
  -  <define:taglib uri="avalon-artifact"/>
  -
     <!--
     #
     # Write out an artifact descriptor for the projects jar file.
  @@ -22,7 +21,7 @@
     # and classification following by dependency information.
     #
     -->
  -  <goal name="avalon:artifact">
  +  <goal name="artifact:create">
   
         <maven:snapshot project="${pom}"/>
   
  
  
  
  1.13      +1 -1      avalon/merlin/impl/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/impl/maven.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- maven.xml	22 Apr 2004 02:25:02 -0000	1.12
  +++ maven.xml	22 Apr 2004 05:10:31 -0000	1.13
  @@ -8,7 +8,7 @@
     <ant:property name="pom.specificationVersion" value="&merlin-spec;"/>
   
     <postGoal name="java:prepare-filesystem">
  -    <attainGoal name="avalon:artifact-install"/>
  +    <attainGoal name="artifact:install"/>
     </postGoal>
   
     <!--
  
  
  
  1.6       +1 -1      avalon/repository/impl/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/repository/impl/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	22 Apr 2004 04:38:05 -0000	1.5
  +++ maven.xml	22 Apr 2004 05:10:31 -0000	1.6
  @@ -4,7 +4,7 @@
       value="org/apache/avalon/repository/impl/DefaultRepositoryCriteria"/>
   
     <postGoal name="test:test">
  -    <attainGoal name="avalon:artifact-install"/>
  +    <attainGoal name="artifact:install"/>
     </postGoal>
   
   </project>
  
  
  
  1.4       +1 -1      avalon/repository/site/xdocs/start/tutorial/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/repository/site/xdocs/start/tutorial/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml	25 Jan 2004 17:30:25 -0000	1.3
  +++ index.xml	22 Apr 2004 05:10:31 -0000	1.4
  @@ -68,7 +68,7 @@
             </source>
             <p>
      The content of the meta file is automatically generated using the
  -   avalon-plugin avalon:artifact goal. Two examples of factory meta 
  +   avalon-plugin artifact:install goal. Two examples of factory meta 
      are provides, one concerning the <a href="logkit.meta">logkit</a>
      factory and a second describing the <a href="merlin.meta">merlin</a>
      factory.
  
  
  
  1.4       +1 -1      avalon/util/xdocs/plugin/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/util/xdocs/plugin/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml	21 Feb 2004 13:27:06 -0000	1.3
  +++ index.xml	22 Apr 2004 05:10:31 -0000	1.4
  @@ -31,7 +31,7 @@
           of classloader metadata associated with a jar file.</p>
           <p>The generation of metyada is triggered using the following goal:</p>
           <source>
  -avalon:artifact
  +artifact:install
   </source>
           <p>The goal generates a file with the same name as the 
           jar artifact + ".meta".</p>
  
  
  

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