michal      2003/07/07 02:52:34

  Modified:    src/plugins-build/ejb/xdocs changes.xml goals.xml
               src/plugins-build/ejb plugin.jelly project.xml
  Log:
  Added install, install-snapshot, deploy, deploy-snapshot goals
  
  Revision  Changes    Path
  1.3       +3 -0      maven/src/plugins-build/ejb/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/ejb/xdocs/changes.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- changes.xml       4 Jul 2003 08:05:39 -0000       1.2
  +++ changes.xml       7 Jul 2003 09:52:33 -0000       1.3
  @@ -6,6 +6,9 @@
     </properties>
     <body>
       <release version="1.1" date="in CVS">
  +      <action dev="michal" type="add">
  +        Added deploy, deploy-snapshot and install-snapshot goals
  +      </action>
         <action dev="michal" type="fix">
           Fixes for MAVEN-518.
           Artifact processing in the plugin 
  
  
  
  1.2       +38 -27    maven/src/plugins-build/ejb/xdocs/goals.xml
  
  Index: goals.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/ejb/xdocs/goals.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- goals.xml 24 Jan 2003 03:45:10 -0000      1.1
  +++ goals.xml 7 Jul 2003 09:52:33 -0000       1.2
  @@ -1,35 +1,46 @@
   <?xml version="1.0"?>
   <document>
  -
     <properties>
       <title>Maven EJB Plug-in Goals</title>
  +    <author email="[EMAIL PROTECTED]">Michal Maczka</author>
       <author email="[EMAIL PROTECTED]">Nathan Coast</author>
     </properties>
  -
     <body>
  -    <section name="Goals">
  -      <table>
  -        <tr><th>Goal</th><th>Description</th></tr>
  -        <tr>
  -          <td>ejb</td>
  -          <td>
  -            Default goal - see ejb:ejb
  -          </td>
  -        </tr>
  -        <tr>
  -          <td>ejb:ejb</td>
  -          <td>
  -            constructs the ejb-jar file from the compiled sources 
  -            and resources.
  -          </td>
  -        </tr>
  -        <tr>
  -          <td>ejb:install</td>
  -          <td>
  -            Installs the generated ejb-jar file into the local repository
  -          </td>
  -        </tr>
  -      </table>
  -    </section>
  - </body>
  +    <goals>
  +      <goal>
  +        <name>ejb</name>
  +        <description>
  +          Build a ejb file. 
  +          This goal simply executes the <a href="ejb:ejb">ejb:ejb</a> goal
  +        </description>
  +      </goal>
  +      <goal>
  +        <name>ejb:init</name>
  +        <description>Initialize the file system and attain any necessary 
goals</description>
  +      </goal>
  +      <goal>
  +        <name>ejb:ejb</name>
  +        <description>
  +          Constructs the ejb-jar file from the compiled sources 
  +          and resources.
  +        </description>
  +      </goal>      
  +      <goal>
  +        <name>ejb:install</name>
  +        <description>Installs the generated ejb-jar file into the local 
repository</description>
  +      </goal>
  +      <goal>
  +        <name>ejb:install-snapshot</name>
  +        <description>Install the snapshot version of the ejb into the local 
repository</description>
  +      </goal>      
  +      <goal>
  +        <name>ejb:deploy</name>
  +        <description>Deploy the ejb to the remote repository(ies)</description>
  +      </goal>
  +      <goal>
  +        <name>ejb:deploy-snapshot</name>
  +        <description>Deploy the snapshot version of the ejb to the remote 
repository(ies)</description>
  +      </goal>  
  +    </goals>      
  +  </body>
   </document>
  
  
  
  1.8       +55 -9     maven/src/plugins-build/ejb/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/ejb/plugin.jelly,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly      4 Jul 2003 08:05:40 -0000       1.7
  +++ plugin.jelly      7 Jul 2003 09:52:34 -0000       1.8
  @@ -3,7 +3,8 @@
   <project xmlns:j="jelly:core"
            xmlns:ant="jelly:ant"
            xmlns:license="license" 
  -         xmlns:util="jelly:util">
  +         xmlns:util="jelly:util"
  +         xmlns:artifact="artifact">
   
     <!--==================================================================-->
     <!-- Default goal : Builds a ejb file                                 -->
  @@ -16,6 +17,8 @@
     <goal name="ejb:init" 
       description="Initialize filesystem and other resources for an ejb build">
   
  +   <j:set var="maven.ejb.final.name" 
  +      value="${maven.build.dir}/${maven.final.name}.jar"/>
   
       <j:if test="${sourcesPresent == 'true'}">
         <attainGoal name="test:test"/>
  @@ -41,7 +44,7 @@
   
       <!-- jar task used for now due to problems with ejb jar not including 
            files other than class files -->
  -    <ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
  +    <ant:jar jarfile="${maven.ejb.final.name}">
         
         <!-- include marked dependencies -->
         <j:forEach var="lib" items="${pom.artifacts}">
  @@ -102,20 +105,63 @@
       </ant:jar>
   
     </goal>
  -
  +     
     <!--==================================================================-->
     <!-- Install the ejb in the local repository                          -->
  -  <!--==================================================================-->
  +  <!--==================================================================-->    
     <goal name="ejb:install"
           prereqs="ejb:ejb"
           description="Install the ejb in the local repository">
  +     
  +     <artifact:install
  +        artifact="${maven.ejb.final.name}"
  +        type="ejb"
  +        project="${pom}"/> 
  +  
  +  </goal>
  +  
  +  <!--==================================================================-->
  +  <!-- Install the snapshot version of the ejb in the local repository  -->
  +  <!--==================================================================-->      
  +  <goal name="ejb:install-snapshot"
  +        prereqs="ejb:ejb" 
  +        description="Install the snapshot version of the ejb in the local 
repository">
  +        
  +      <artifact:install-snapshot
  +        artifact="${maven.ejb.final.name}"
  +        type="ejb"
  +        project="${pom}"/> 
  +        
  +  </goal>
   
  -    <ant:property name="maven.ejb.install.dir"
  -      value="${maven.repo.local}/${pom.artifactDirectory}/ejbs"/>
  -    <ant:mkdir dir="${maven.ejb.install.dir}"/>
  -    <ant:copy file="${maven.build.dir}/${maven.final.name}.jar"
  -      tofile="${maven.ejb.install.dir}/${maven.final.name}.jar"/>
  +  <!--==================================================================-->
  +  <!-- Deploys the ejb to the remote repository                         -->
  +  <!--==================================================================-->      
  +  <goal name="ejb:deploy" 
  +        prereqs="ejb:ejb" 
  +        description="Deploys the ejb to the remote repository">
  +
  +     <artifact:deploy
  +        artifact="${maven.ejb.final.name}"
  +        type="ejb"
  +        project="${pom}"/>   
  +        
  +  </goal>      
  +        
  +  <!--==================================================================-->
  +  <!-- Deploys the snapshot of the ejb to the remote repository         -->
  +  <!--==================================================================-->      
  +  <goal name="ejb:deploy-snapshot" 
  +        prereqs="ejb:ejb"
  +        description="Deploys the snapshot version of the ejb to remote repository"> 
 
   
  +     <artifact:deploy-snapshot
  +        artifact="${maven.ejb.final.name}"
  +        type="ejb"
  +        project="${pom}"/>    
  +        
     </goal>
  +  
  +  
   
   </project>
  
  
  
  1.12      +9 -0      maven/src/plugins-build/ejb/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/ejb/project.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.xml       4 Jul 2003 08:05:40 -0000       1.11
  +++ project.xml       7 Jul 2003 09:52:34 -0000       1.12
  @@ -34,6 +34,15 @@
           <role>Java Developer</role>
         </roles>
       </developer>
  +    <developer>
  +      <name>Michal Maczka</name>
  +      <id>michal</id>
  +      <email>[EMAIL PROTECTED]</email>
  +      <roles>
  +        <role>Java Developer</role>
  +      </roles>
  +    </developer>
  +    
     </developers>
     <dependencies/>
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to