evenisse    2003/09/08 05:05:09

  Modified:    src/plugins-build/plugin plugin.jelly
               src/plugins-build/plugin/xdocs changes.xml
  Log:
  Revert Maven-791
  
  Revision  Changes    Path
  1.15      +4 -18     maven/src/plugins-build/plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/plugin/plugin.jelly,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- plugin.jelly      8 Sep 2003 09:15:20 -0000       1.14
  +++ plugin.jelly      8 Sep 2003 12:05:09 -0000       1.15
  @@ -8,21 +8,7 @@
     xmlns:u="jelly:util"
     xmlns:x="jelly:xml">
     
  -  <goal name="plugin:check" description="Check if project is a plugin">
  -    <u:file var="projectFile" 
  -      name="${basedir}/project.xml" />
  -    <u:file var="jellyFile" 
  -      name="${basedir}/plugin.jelly" />
  -    <j:if test="${!projectFile.exists()}">
  -      <j:set var="notPlugin" value="true"/>
  -    </j:if>
  -    <j:if test="${!pluginFile.exists()}">
  -      <j:set var="notPlugin" value="true"/>
  -    </j:if>
  -    <ant:fail if="notPlugin">This project is a non-plugin project.</ant:fail>
  -  </goal>
  -
  -  <goal name="plugin" prereqs="plugin:check"
  +  <goal name="plugin"
       description="Build a plugin jar and install to the maven.repo.local">
   
       <!-- Plugins are just a jar. -->
  @@ -84,7 +70,7 @@
   
     <!-- generate a skeletal navigation.xml for the plugin specified
          by the 'plugin' variable -->
  -  <goal name="plugin:generate-navigation" prereqs="plugin:check"
  +  <goal name="plugin:generate-navigation"
       description="Generate navigation.xml for the plugin">
   
       <j:set var="skip" value="false" />
  @@ -104,7 +90,7 @@
     </goal>
   
     <!-- generate a skeletal goals.xml for the plugin specified -->
  -  <goal name="plugin:generate-goals" prereqs="plugin:check"
  +  <goal name="plugin:generate-goals"
       description="Generate goals.xml for the plugin">
   
       <j:set var="skip" value="false" />
  @@ -144,7 +130,7 @@
     </goal>
   
     <!-- generate properties documentation -->
  -  <goal name="plugin:generate-properties" prereqs="plugin:check"
  +  <goal name="plugin:generate-properties"
       description="Generate properties.xml for the plugin">
   
   
  
  
  
  1.3       +0 -3      maven/src/plugins-build/plugin/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/plugin/xdocs/changes.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- changes.xml       8 Sep 2003 09:15:20 -0000       1.2
  +++ changes.xml       8 Sep 2003 12:05:09 -0000       1.3
  @@ -8,9 +8,6 @@
     <body>
        <release version="1.1" date="in CVS">
         <action dev="evenisse" type="fix">
  -        Fixed MAVEN-791. Check if project is a plugin.
  -      </action>
  -      <action dev="evenisse" type="fix">
           Fixed MAVEN-708. Fix the goals description generation if there is no 
plugin.jelly file.
         </action>
       </release>
  
  
  

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

Reply via email to