You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/09/28 19:16:08 UTC

cvs commit: jakarta-turbine-2/src/maven-plugin plugin.jelly

epugh       2003/09/28 10:16:08

  Modified:    src/maven-plugin/xdocs goals.xml index.xml properties.xml
                        changes.xml navigation.xml
               src/maven-plugin plugin.jelly
  Log:
  Add new turbine:inplace-war and turbine:inplace-clean goals that allow inplace development
  
  Revision  Changes    Path
  1.2       +22 -0     jakarta-turbine-2/src/maven-plugin/xdocs/goals.xml
  
  Index: goals.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/maven-plugin/xdocs/goals.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- goals.xml	10 Feb 2003 07:55:42 -0000	1.1
  +++ goals.xml	28 Sep 2003 17:16:07 -0000	1.2
  @@ -4,6 +4,7 @@
     <properties>
       <title>Maven Turbine Plug-in Goals</title>
       <author email="mpoeschl@marmot.at">Martin Poeschl</author>
  +    <author email="epugh@upstate.com">Eric Pugh</author>
     </properties>
     <body>
       <goals>
  @@ -12,6 +13,11 @@
           <description>
             Setup the environment to start developing a Turbine base application
             from scratch.
  +          <p>
  +           You must specify the package that you want the code to be
  +           generated into, e.g.
  +          </p>
  +          <source>maven -Dpackage=com.mycompany.project genapp</source>
           </description>
         </goal>
         <goal>
  @@ -20,6 +26,22 @@
             Generate an simple application (like the TDK).
           </description>
         </goal>
  +      <goal>
  +        <name>turbine:inplace-war</name>
  +        <description>
  +		  Builds an inplace exploded WAR webapp.  Run this the first time to 
  +		  setup your inplace development.  Also runs the eclipse plugin to
  +		  update your .project and .classpath files.  This faciliates using Eclipse
  +		  and Turbine baseds apps together.
  +        </description>
  +      </goal>      
  +      <goal>
  +        <name>turbine:inplace-clean</name>
  +        <description>
  +          Cleans an inplace exploded WAR webapp.  Note, this deletes any
  +          files in the 'src/WEB-INF/classes' and 'src/WEB-INF/lib' directories!
  +        </description>
  +      </goal>      
       </goals>
     </body>
   </document>
  
  
  
  1.2       +9 -9      jakarta-turbine-2/src/maven-plugin/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/maven-plugin/xdocs/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	10 Feb 2003 07:55:42 -0000	1.1
  +++ index.xml	28 Sep 2003 17:16:07 -0000	1.2
  @@ -4,22 +4,22 @@
     <properties>
       <title>Maven Turbine Plug-in</title>
       <author email="mpoeschl@marmot.at">Martin Poeschl</author>
  +    <author email="epugh@upstate.com">Eric Pugh</author>
     </properties>
   
     <body>
  -    <section name="Maven Turbine Generator Plug-in">
  +    <section name="Maven Turbine Plug-in">
  +     
         <p>
  -        This plugin is a replacement for the TDK.
  +        This plugin is for working with Turbine.
         </p>
         <p>
  -        It should help to setup the environment to develop Turbine based
  -        applications.
  +		It has goals to help you setup your base Turbine environment.  Additionally it has 
  +		goals to help you with inplace code/build/compile development.
         </p>
  -      <p>
  -        You must specify the package that you want the code to be
  -        generated into, e.g.
  -      </p>
  -      <source>maven -Dpackage=com.mycompany.project genapp</source>
  +     
  +     
  +
       </section>
     </body>
   </document>
  
  
  
  1.2       +1 -0      jakarta-turbine-2/src/maven-plugin/xdocs/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/maven-plugin/xdocs/properties.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- properties.xml	10 Feb 2003 07:55:42 -0000	1.1
  +++ properties.xml	28 Sep 2003 17:16:07 -0000	1.2
  @@ -17,6 +17,7 @@
               Specifies the name of the Java package that code will be
               generated for.
             </td>
  +          <td/>
           </tr>
         </table>
       </section>
  
  
  
  1.2       +4 -0      jakarta-turbine-2/src/maven-plugin/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/maven-plugin/xdocs/changes.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- changes.xml	28 Sep 2003 17:00:15 -0000	1.1
  +++ changes.xml	28 Sep 2003 17:16:07 -0000	1.2
  @@ -9,6 +9,10 @@
   
       <release version="2.4-dev" date="in CVS">
         <action dev="epugh" type="add">
  +        Added goals turbine:inplace-war and turbine:inplace-clean to facilate inplace editing
  +        of war files.
  +      </action>     	
  +      <action dev="epugh" type="add">
           Put various *.master files directly in the plugin resouces directory.
         </action>    
         <action dev="epugh" type="update">
  
  
  
  1.2       +2 -0      jakarta-turbine-2/src/maven-plugin/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/maven-plugin/xdocs/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	10 Feb 2003 07:55:42 -0000	1.1
  +++ navigation.xml	28 Sep 2003 17:16:07 -0000	1.2
  @@ -6,8 +6,10 @@
     <body>
       <links>
         <item name="Turbine" href="http://jakarta.apache.org/turbine/"/>
  +      <item name="Maven" href="http://maven.apache.org/"/>      
       </links>
       <menu name="Overview">
  +      <item name="Overview"           href="/index.html" />
         <item name="Goals"              href="/goals.html" />
         <item name="Properties"         href="/properties.html" />
       </menu>
  
  
  
  1.3       +36 -1     jakarta-turbine-2/src/maven-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/maven-plugin/plugin.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly	10 Feb 2003 07:55:41 -0000	1.2
  +++ plugin.jelly	28 Sep 2003 17:16:08 -0000	1.3
  @@ -2,7 +2,8 @@
   
   <project
     xmlns:j="jelly:core"
  -  xmlns:u="jelly:util">
  +  xmlns:u="jelly:util"
  +  xmlns:ant="jelly:ant">
   
     <goal
       name="turbine:base"
  @@ -68,4 +69,38 @@
       <attainGoal name="turbine:base"/>
     </goal>
   
  + <goal name="turbine:inplace-war" description="Builds an inplace exploded Turbine webapp">
  +
  +     <j:set var="warWebappBuildDir"
  +        value="${maven.src.dir}/webapp"/>    
  +     <echo message="war dir:${warBuildDir}"/>
  +     <j:set var="maven.war.webapp.dir" value="${warWebappBuildDir}"/>
  +     <j:set var="maven.war.build.dir" value="${warWebappBuildDir}"/>
  +
  +     <ant:property name="maven.test.skip" value="true"/>
  +     <ant:property name="maven.war.webapp.dir" value="${warWebappBuildDir}"/>
  +     <ant:property name="maven.war.build.dir" value="${warWebappBuildDir}"/>
  +     <attainGoal name="eclipse"/>
  +     <attainGoal name="war:webapp"/>
  +     
  +   </goal>
  +   
  +   <goal name="turbine:inplace-clean" description="Cleans an inplace exploded Turbine webapp">
  +
  +     <j:set var="warWebappBuildDir"
  +        value="${maven.src.dir}/webapp"/>    
  +     <echo message="war dir:${warBuildDir}"/>
  +     <j:set var="maven.war.webapp.dir" value="${warWebappBuildDir}"/>
  +     <j:set var="maven.war.build.dir" value="${warWebappBuildDir}"/>
  +
  +     <ant:property name="maven.test.skip" value="true"/>
  +     <ant:property name="maven.war.webapp.dir" value="${warWebappBuildDir}"/>
  +     <ant:property name="maven.war.build.dir" value="${warWebappBuildDir}"/>
  +     
  +     <ant:delete dir="${warWebappBuildDir}/WEB-INF/lib"/>
  +     <ant:delete dir="${warWebappBuildDir}/WEB-INF/classes"/>
  +     <attainGoal name="clean"/>
  +     
  +     
  +   </goal>  
   </project>
  
  
  

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