You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by vm...@apache.org on 2003/06/17 19:57:47 UTC

cvs commit: maven/src/plugins-build/ear/xdocs changes.xml

vmassol     2003/06/17 10:57:47

  Modified:    src/plugins-build/ear plugin.jelly project.xml
               src/plugins-build/ear/xdocs changes.xml
  Log:
  Fixed warning message about application.xml being included twice
  
  Revision  Changes    Path
  1.8       +4 -3      maven/src/plugins-build/ear/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/ear/plugin.jelly,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly	8 May 2003 20:53:55 -0000	1.7
  +++ plugin.jelly	17 Jun 2003 17:57:47 -0000	1.8
  @@ -42,9 +42,10 @@
         file="${maven.ear.manifest}"/>
   
       <ant:ear destfile="${maven.build.dir}/${maven.final.name}.ear"
  -         appxml="${maven.ear.appxml}"
  -         basedir="${maven.ear.src}"
  -         excludes="${maven.ear.appxml}">
  +         appxml="${maven.ear.appxml}">
  +
  +      <fileset dir="${maven.ear.src}" casesensitive="false" 
  +        excludes="**/META-INF/application.xml"/>
   
         <!-- include marked dependencies -->
         <j:forEach var="dep" items="${pom.dependencies}">
  
  
  
  1.10      +17 -1     maven/src/plugins-build/ear/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/ear/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	8 May 2003 20:53:55 -0000	1.9
  +++ project.xml	17 Jun 2003 17:57:47 -0000	1.10
  @@ -5,7 +5,7 @@
     <pomVersion>3</pomVersion>
     <id>maven-ear-plugin</id>
     <name>Maven EAR Plugin</name>
  -  <currentVersion>1.1</currentVersion>
  +  <currentVersion>1.2-SNAPSHOT</currentVersion>
     <description>Ear Plugin for Maven</description>
     <shortDescription>Ear Plugin for Maven</shortDescription>
     <url>http://maven.apache.org/reference/plugins/ear/</url>
  @@ -16,6 +16,13 @@
     </repository>
     <versions/>
     <branches/>
  +  <versions>
  +    <version>
  +      <id>1.2</id>
  +      <name>1.2</name>
  +      <tag>HEAD</tag>
  +    </version>
  +  </versions>
     <developers>
       <developer>
         <name>Nathan Coast</name>
  @@ -40,6 +47,15 @@
         <id>michal</id>
         <email>michal.maczka@dimatics.com</email>
         <organization/>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    <developer>
  +      <name>Vincent Massol</name>
  +      <id>vmassol</id>
  +      <email>vmassol@pivolis.com</email>
  +      <organization>Pivolis</organization>
         <roles>
           <role>Java Developer</role>
         </roles>
  
  
  
  1.3       +9 -3      maven/src/plugins-build/ear/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/ear/xdocs/changes.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- changes.xml	8 May 2003 20:53:55 -0000	1.2
  +++ changes.xml	17 Jun 2003 17:57:47 -0000	1.3
  @@ -5,14 +5,20 @@
       <author email="nathan.coast@blueyonder.co.uk">Nathan Coast</author>
     </properties>
     <body>
  -    <release version="1.0" date="2002-08-04">
  -      <action dev="ncoast" type="add">
  -        Initial plugin created
  +    <release version="1.2" date="in CVS">
  +      <action dev="vmassol" type="fix">
  +        Removed warning about application.xml being added twice to the
  +        EAR.
         </action>
       </release>
       <release version="1.1" date="2003-05-08">
         <action dev="michal" type="add">
           Added autogeneration of application.xml file
  +      </action>
  +    </release>
  +    <release version="1.0" date="2002-08-04">
  +      <action dev="ncoast" type="add">
  +        Initial plugin created
         </action>
       </release>
     </body>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org