You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2004/05/20 19:05:11 UTC

cvs commit: maven-components/maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven plugin.xml

jvanzyl     2004/05/20 10:05:11

  Modified:    maven-plugins/maven-jar-plugin project.xml
               maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin
                        JarPlugin.java
               maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven
                        plugin.xml
  Log:
  turn into a maven plugin and add @tags for descriptor generation.
  
  Revision  Changes    Path
  1.3       +0 -48     maven-components/maven-plugins/maven-jar-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	12 Apr 2004 20:14:18 -0000	1.2
  +++ project.xml	20 May 2004 17:05:11 -0000	1.3
  @@ -10,53 +10,5 @@
     <artifactId>maven-jar-plugin</artifactId>
     <name>Maven</name>
     <version>1.0-SNAPSHOT</version>
  -  <inceptionYear>2001</inceptionYear>
     <package>org.apache.maven</package>
  -  <repository>
  -    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-components/maven-plugins/maven-jar-plugin</connection>
  -    <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:maven-components/maven-plugins/maven-jar-plugin</developerConnection>
  -    <url>http://cvs.apache.org/viewcvs.cgi/maven/</url>
  -  </repository>
  -  <dependencies>
  -    <dependency>
  -      <groupId>maven</groupId>
  -      <artifactId>maven-core</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>maven</groupId>
  -      <artifactId>maven-model</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>maven</groupId>
  -      <artifactId>maven-project</artifactId>
  -      <version>2.0-SNAPSHOT</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>xpp3</groupId>
  -      <artifactId>xpp3</artifactId>
  -      <version>1.1.3.3</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>plexus</groupId>
  -      <artifactId>plexus</artifactId>
  -      <version>0.14-SNAPSHOT</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>classworlds</groupId>
  -      <artifactId>classworlds</artifactId>
  -      <version>1.1-SNAPSHOT</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>xstream</groupId>
  -      <artifactId>xstream</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>plexus</groupId>
  -      <artifactId>plexus-compiler</artifactId>
  -      <version>1.0-SNAPSHOT</version>
  -    </dependency>
  -  </dependencies>
   </project>
  
  
  
  1.2       +32 -8     maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/JarPlugin.java
  
  Index: JarPlugin.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/JarPlugin.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JarPlugin.java	15 Mar 2004 19:32:22 -0000	1.1
  +++ JarPlugin.java	20 May 2004 17:05:11 -0000	1.2
  @@ -68,6 +68,20 @@
   import java.util.jar.Manifest;
   
   /**
  + * @maven.plugin.id jar
  + * @maven.plugin.description Maven plugin to build jars
  + *
  + * @parameter jarName String true validator description
  + * @parameter outputDirectory String true validator description
  + * @parameter basedir String true validator description
  + *
  + * @goal.name jar
  + * @goal.jar.description build a jar
  + * @goal.jar.prereq test
  + * @goal.jar.prereq resources
  + * @goal.jar.parameter jarName #maven.final.name
  + * @goal.jar.parameter outputDirectory #maven.build.dir
  + * @goal.jar.parameter basedir #maven.build.dest
    *
    * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
    * @version $Id$
  @@ -80,17 +94,27 @@
    * maven.remote.group
    */
   public class JarPlugin
  +    extends AbstractPlugin
   {
  -    private String jarName;
  +    public void execute( PluginExecutionRequest request, PluginExecutionResponse response )
  +        throws Exception
  +    {
  +        // ----------------------------------------------------------------------
  +        //
  +        // ----------------------------------------------------------------------
   
  -    private String outputDirectory;
  +        System.out.println( request.getParameter( "basedir" ) );
   
  -    private String basedir;
  +        File basedir = new File( (String) request.getParameter( "basedir" ) );
  +
  +        String outputDirectory = (String) request.getParameter( "outputDirectory" );
  +
  +        String jarName = (String) request.getParameter( "jarName" );
  +
  +        // ----------------------------------------------------------------------
  +        //
  +        // ----------------------------------------------------------------------
   
  -    public void execute()
  -        throws Exception
  -    {
  -        File basedir = new File( this.basedir );
   
           File jarFile = new File( new File( outputDirectory ), jarName + ".jar" );
   
  
  
  
  1.6       +31 -7     maven-components/maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven/plugin.xml
  
  Index: plugin.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/src/main/resources/META-INF/maven/plugin.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- plugin.xml	22 Mar 2004 18:12:15 -0000	1.5
  +++ plugin.xml	20 May 2004 17:05:11 -0000	1.6
  @@ -1,15 +1,35 @@
   <plugin>
     <id>jar</id>
     <implementation>org.apache.maven.plugin.JarPlugin</implementation>
  -  <instantiation-strategy>per-lookup</instantiation-strategy>
  -  <mode>field</mode>
  +  <instantiationStrategy>singleton</instantiationStrategy>
  +  <mode>integrated</mode>
  +  <parameters>
  +    <parameter>
  +      <name>jarName</name>
  +      <type>String</type>
  +      <required>false</required>
  +      <validator>validator</validator>
  +      <description>description </description>
  +    </parameter>
  +    <parameter>
  +      <name>outputDirectory</name>
  +      <type>String</type>
  +      <required>false</required>
  +      <validator>validator</validator>
  +      <description>description </description>
  +    </parameter>
  +    <parameter>
  +      <name>basedir</name>
  +      <type>String</type>
  +      <required>false</required>
  +      <validator>validator</validator>
  +      <description>description </description>
  +    </parameter>
  +  </parameters>
     <goals>
       <goal>
         <name>jar</name>
  -      <prereqs>
  -        <prereq>test</prereq>
  -        <prereq>resources</prereq>
  -      </prereqs>
  +      <description>build a jar</description>
         <parameters>
           <parameter>
             <name>jarName</name>
  @@ -24,6 +44,10 @@
             <expression>#maven.build.dest</expression>
           </parameter>
         </parameters>
  +      <prereqs>
  +        <prereq>test</prereq>
  +        <prereq>resources</prereq>
  +      </prereqs>
       </goal>
     </goals>
  -</plugin>
  +</plugin>
  \ No newline at end of file
  
  
  

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