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

cvs commit: avalon/maven-plugins/meta .cvsignore plugin.jelly plugin.properties

niclas      2004/04/29 01:42:24

  Modified:    composition/impl Tag: BETTER_MAVENIZATION maven.xml
               maven-plugins/artifact Tag: BETTER_MAVENIZATION .cvsignore
                        project.properties project.xml
               maven-plugins/meta Tag: BETTER_MAVENIZATION .cvsignore
                        plugin.jelly plugin.properties
  Log:
  More for Stephen to test with...
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.8.2.8   +1 -0      avalon/composition/impl/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/composition/impl/maven.xml,v
  retrieving revision 1.8.2.7
  retrieving revision 1.8.2.8
  diff -u -r1.8.2.7 -r1.8.2.8
  --- maven.xml	29 Apr 2004 06:51:19 -0000	1.8.2.7
  +++ maven.xml	29 Apr 2004 08:42:24 -0000	1.8.2.8
  @@ -9,6 +9,7 @@
     xmlns:j="jelly:core" 
     xmlns:util="jelly:util" 
     xmlns:ant="jelly:ant"
  +  xmlns:meta="avalon:meta"
     >
     <ant:property file="${avalon.buildsystem}/project.properties" />
   
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      avalon/maven-plugins/artifact/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/artifact/.cvsignore,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- .cvsignore	22 Apr 2004 00:55:57 -0000	1.1
  +++ .cvsignore	29 Apr 2004 08:42:24 -0000	1.1.2.1
  @@ -3,4 +3,4 @@
   target
   .classpath
   .project
  -build.xml
  \ No newline at end of file
  +
  
  
  
  1.1.2.4   +0 -1      avalon/maven-plugins/artifact/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/artifact/project.properties,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- project.properties	28 Apr 2004 11:32:12 -0000	1.1.2.3
  +++ project.properties	29 Apr 2004 08:42:24 -0000	1.1.2.4
  @@ -12,7 +12,6 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
   
  -
   project.name=avalon-util-plugin
   
   avalon.buildsystem = ${basedir}/../../buildsystem
  
  
  
  1.1.2.3   +5 -3      avalon/maven-plugins/artifact/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/artifact/project.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- project.xml	27 Apr 2004 15:20:06 -0000	1.1.2.2
  +++ project.xml	29 Apr 2004 08:42:24 -0000	1.1.2.3
  @@ -11,9 +11,11 @@
     <id>&avalon-util-plugin-id;</id>
     <currentVersion>&avalon-util-plugin-version;</currentVersion>
   
  -  <name>Avalon Plugin</name>
  -  <description>Avalon Plugin for Maven</description>
  -  <shortDescription>Avalon Plugin</shortDescription>
  +  <name>Avalon Artifact Enhancer Plugin</name>
  +  <description>Avalon Artifact Enhancer Plugin creates a .meta file
  +  for each Jar which contains dependencies and other information about
  +  the Jar file.</description>
  +  <shortDescription>Avalon Artifact Enhancer Plugin</shortDescription>
     <package>org.apache.avalon</package>
   
     <build>
  
  
  
  No                   revision
  No                   revision
  1.1.2.2   +2 -0      avalon/maven-plugins/meta/Attic/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/meta/Attic/.cvsignore,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- .cvsignore	27 Apr 2004 09:34:32 -0000	1.1.2.1
  +++ .cvsignore	29 Apr 2004 08:42:24 -0000	1.1.2.2
  @@ -1,3 +1,5 @@
  +maven.log
  +velocity.log
   target
   .classpath
   .project
  
  
  
  1.1.2.3   +9 -3      avalon/maven-plugins/meta/Attic/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/meta/Attic/plugin.jelly,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- plugin.jelly	27 Apr 2004 15:20:06 -0000	1.1.2.2
  +++ plugin.jelly	29 Apr 2004 08:42:24 -0000	1.1.2.3
  @@ -36,7 +36,10 @@
   <fail message="avalon:meta has been dropped, and no longer used." />
     </goal>
     
  +  <postGoal name="java:prepare-filesystem">
  +<!--  
     <postGoal name="java:compile"  >
  +-->
   <echo>Entering the Meta Generation for Java Sources</echo>
       <ant:available property="javaSourcesPresent"
          file="${maven.src.dir}/java"/>
  @@ -45,7 +48,6 @@
          file="${maven.src.dir}/main"/>
       
       <j:set var="needsMetaGen" value="${avalon.meta.enabled}" />
  -    
       <j:if test="${needsMetaGen }" >
        <j:if test="${ (javaSourcesPresent || mainSourcesPresent )}">
         <ant:mkdir dir="${maven.build.dest}"/>
  @@ -67,17 +69,21 @@
         </ant:meta-generate>
        </j:if>
       </j:if>
  +
     </postGoal>
     
  -  <postGoal name="test:compile"  >
  +  <postGoal name="test:prepare-filesystem" >
  +
   <echo>Entering the Meta Generation for Test Sources</echo>
       <ant:mkdir dir="${maven.build.dest}"/>
       <ant:available property="testSourcesPresent"
           file="${maven.src.dir}/test"/>
  +    
       <j:set var="needsMetaGen" value="${avalon.meta.enabled}" />
       
       <j:if test="${needsMetaGen }" >
  -     <j:if test="${needsMetaGen}">
  +   
  +     <j:if test="${testSourcesPresent}">
         <ant:mkdir dir="${maven.build.dir}/test-classes"/>
         <ant:meta-generate destDir="${maven.build.dir}/test-classes" 
             format="${avalon.meta.format}" 
  
  
  
  1.1.2.2   +0 -3      avalon/maven-plugins/meta/Attic/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/avalon/maven-plugins/meta/Attic/plugin.properties,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- plugin.properties	27 Apr 2004 09:34:32 -0000	1.1.2.1
  +++ plugin.properties	29 Apr 2004 08:42:24 -0000	1.1.2.2
  @@ -27,6 +27,3 @@
   #
   avalon.meta.type.postfix=xinfo
   
  -
  -
  -
  
  
  

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