svn commit: r1804689 - in /maven/plugins/trunk/maven-ejb-plugin/src: main/java/org/apache/maven/plugins/ejb/EjbMojo.java site/apt/index.apt.vm

[kh...@apache.org]

Author: khmarbaise
Date: Thu Aug 10 17:43:04 2017
New Revision: 1804689

URL: http://svn.apache.org/viewvc?rev=1804689&view=rev
Log:
[MEJB-97] Remove param properties that doesn't make sense for CLI usage
 o Removed maven.ejb.jarName, maven.ejb.classifier, maven.ejb.clientClassifier,
   maven.ejb.ejbJar, maven.ejb.generateClient, maven.ejb.ejbVersion,
   maven.ejb.escapeBackslashesInFilePath, maven.ejb.escapeString, 
   maven.ejb.filterDeploymentDescriptor.

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

Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java?rev=1804689&r1=1804688&r2=1804689&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java Thu Aug 10 17:43:04 2017
@@ -103,13 +103,13 @@ public class EjbMojo
     /**
      * The name of the EJB file to generate.
      */
-    @Parameter( property = "maven.ejb.jarName", defaultValue = "${project.build.finalName}" )
+    @Parameter( defaultValue = "${project.build.finalName}", readonly = true )
     private String jarName;
 
     /**
      * Classifier to add to the artifact generated. If given, the artifact will be an attachment instead.
      */
-    @Parameter( property = "maven.ejb.classifier" )
+    @Parameter
     private String classifier;
 
     /**
@@ -117,19 +117,19 @@ public class EjbMojo
      * 
      * @since 3.0.0
      */
-    @Parameter( property = "maven.ejb.clientClassifier", defaultValue = DEFAULT_CLIENT_CLASSIFIER )
+    @Parameter( defaultValue = DEFAULT_CLIENT_CLASSIFIER )
     private String clientClassifier;
 
     /**
      * You can define the location of <code>ejb-jar.xml</code> file.
      */
-    @Parameter( property = "maven.ejb.ejbJar", defaultValue = DEFAULT_EJBJAR )
+    @Parameter( defaultValue = DEFAULT_EJBJAR )
     private String ejbJar;
 
     /**
      * Whether the EJB client jar should be generated or not.
      */
-    @Parameter( property = "maven.ejb.generateClient", defaultValue = "false" )
+    @Parameter( defaultValue = "false" )
     private boolean generateClient;
 
     /**
@@ -208,7 +208,7 @@ public class EjbMojo
      * 
      * @since 2.1
      */
-    @Parameter( property = "maven.ejb.ejbVersion", defaultValue = "3.1" )
+    @Parameter( defaultValue = "3.1" )
     private String ejbVersion;
 
     /**
@@ -235,7 +235,7 @@ public class EjbMojo
      *
      * @since 2.3
      */
-    @Parameter( property = "maven.ejb.escapeBackslashesInFilePath", defaultValue = "false" )
+    @Parameter( defaultValue = "false" )
     private boolean escapeBackslashesInFilePath;
 
     /**
@@ -243,7 +243,7 @@ public class EjbMojo
      *
      * @since 2.3
      */
-    @Parameter( property = "maven.ejb.escapeString" )
+    @Parameter
     protected String escapeString;
 
     /**
@@ -251,7 +251,7 @@ public class EjbMojo
      *
      * @since 2.3
      */
-    @Parameter( property = "maven.ejb.filterDeploymentDescriptor", defaultValue = "false" )
+    @Parameter( defaultValue = "false" )
     private boolean filterDeploymentDescriptor;
 
     /**

Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt.vm?rev=1804689&r1=1804688&r2=1804689&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt.vm (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt.vm Thu Aug 10 17:43:04 2017
@@ -57,7 +57,8 @@ ${project.name}
   {{{./source-repository.html}source repository}} and will find supplementary information in the
   {{{/guides/development/guide-helping.html}guide to helping with Maven}}.
   
-  Important Note: Starting with version 3.0.0 of the plugin all properties have been named like <<maven.ejb.*>>.
+  Important Note: Starting with version 3.0.0 of the plugin all properties have been removed. The configuration
+  of the plugin should be done in the <<<pom.xml>>> file and not via command line.
 
 * Examples