svn commit: r674544 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java

[de...@apache.org]

Author: dennisl
Date: Mon Jul  7 09:30:46 2008
New Revision: 674544

URL: http://svn.apache.org/viewvc?rev=674544&view=rev
Log:
o Allow ejbVersion to be specified on the command line.
o Improve Javadoc and log messages.

Modified:
    maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java

Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=674544&r1=674543&r2=674544&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Mon Jul  7 09:30:46 2008
@@ -90,7 +90,7 @@
     private String classifier;
 
     /**
-     * Whether the ejb client jar should be generated or not. Default
+     * Whether the EJB client jar should be generated or not. Default
      * is false.
      *
      * @parameter
@@ -99,9 +99,8 @@
     private String generateClient = Boolean.FALSE.toString();
 
     /**
-     * Excludes.
-     *
-     * <br/>Usage:
+     * The files and directories to exclude from the client jar. Usage:
+     * 
      * <pre>
      * &lt;clientExcludes&gt;
      * &nbsp;&nbsp;&lt;clientExclude&gt;**&#47;*Ejb.class&lt;&#47;clientExclude&gt;
@@ -116,9 +115,8 @@
     private List clientExcludes;
 
     /**
-     * Includes.
+     * The files and directories to include in the client jar. Usage:
      *
-     * <br/>Usage:
      * <pre>
      * &lt;clientIncludes&gt;
      * &nbsp;&nbsp;&lt;clientInclude&gt;**&#47;*&lt;&#47;clientInclude&gt;
@@ -132,7 +130,7 @@
     private List clientIncludes;
 
     /**
-     * The maven project.
+     * The Maven project.
      *
      * @parameter expression="${project}"
      * @required
@@ -149,16 +147,16 @@
     private JarArchiver jarArchiver;
 
     /**
-     * What EJB version should the ejb-plugin generate? ejbVersion can be "2.x" or "3.x"
-     * (where x is a digit), defaulting to "2.1".  When ejbVersion is "3.x", the
-     * ejb-jar.xml file is optional.
+     * What EJB version should the ejb-plugin generate? Valid values are "2.x" or "3.x"
+     * (where x is a digit).  When ejbVersion is "3.x", the
+     * <code>ejb-jar.xml</code> file is optional.
      * <p/>
      * Usage:
      * <pre>
      * &lt;ejbVersion&gt;3.0&lt;&#47;ejbVersion&gt;
      * </pre>
      *
-     * @parameter default-value="2.1"
+     * @parameter default-value="2.1" expression="${ejb.ejbVersion}"
      * @required
      * @since 2.1
      */
@@ -173,7 +171,7 @@
     private JarArchiver clientJarArchiver;
 
     /**
-     * The maven project's helper.
+     * The Maven project's helper.
      *
      * @parameter expression="${component.org.apache.maven.project.MavenProjectHelper}"
      * @required
@@ -190,7 +188,7 @@
     private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
 
     /**
-     * Generates an ejb jar and optionnaly an ejb-client jar.
+     * Generates an EJB jar and optionally an ejb-client jar.
      *
      * @todo Add license files in META-INF directory.
      */
@@ -199,7 +197,7 @@
     {
         if ( getLog().isInfoEnabled() )
         {
-            getLog().info( "Building ejb " + jarName + " with ejbVersion " + ejbVersion );
+            getLog().info( "Building EJB " + jarName + " with EJB version " + ejbVersion );
         }
 
         File jarFile = getEJBJarFile( basedir, jarName, classifier );
@@ -267,7 +265,7 @@
 
         if ( new Boolean( generateClient ).booleanValue() )
         {
-            getLog().info( "Building ejb client " + jarName + "-client" );
+            getLog().info( "Building EJB client " + jarName + "-client" );
 
             String[] excludes = DEFAULT_EXCLUDES;
             String[] includes = DEFAULT_INCLUDES;