MWEBSTART-242 - Be able to configure simple parameters by properties

git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/webstart@19189 52ab4f32-60fc-0310-b215-8acea882cd1b
mojohaus · Jan 7, 2014 · 217cb36 · 217cb36
1 parent 0594bf6
commit 217cb36
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractBaseJnlpMojo.java
@@ -91,26 +91,26 @@ public abstract class AbstractBaseJnlpMojo
     /**
      * The directory in which files will be stored prior to processing.
      */
-    @Parameter( defaultValue = "${project.build.directory}/jnlp", required = true )
+    @Parameter( property = "jnlp.workDirectory", defaultValue = "${project.build.directory}/jnlp", required = true )
     private File workDirectory;
 
     /**
      * The path where the libraries are placed within the jnlp structure.
      */
-    @Parameter( defaultValue = "" )
+    @Parameter( property = "jnlp.libPath", defaultValue = "" )
     protected String libPath;
 
     /**
      * The location of the directory (relative or absolute) containing non-jar resources that
      * are to be included in the JNLP bundle.
      */
-    @Parameter
+    @Parameter( property = "jnlp.resourcesDirectory" )
     private File resourcesDirectory;
 
     /**
      * The location where the JNLP Velocity template files are stored.
      */
-    @Parameter( defaultValue = "${project.basedir}/src/main/jnlp", required = true )
+    @Parameter( property = "jnlp.templateDirectory", defaultValue = "${project.basedir}/src/main/jnlp", required = true )
     private File templateDirectory;
 
     /**
@@ -131,7 +131,7 @@ public abstract class AbstractBaseJnlpMojo
      * Indicates whether or not gzip archives will be created for each of the jar
      * files included in the webstart bundle.
      */
-    @Parameter( defaultValue = "false" )
+    @Parameter( property = "jnlp.gzip", defaultValue = "false" )
     private boolean gzip;
 
     /**
@@ -145,7 +145,7 @@ public abstract class AbstractBaseJnlpMojo
      *
      * @parameter
      */
-    @Parameter
+    @Parameter( property = "jnlp.excludeTransitive" )
     private boolean excludeTransitive;
 
     /**
@@ -169,7 +169,7 @@ public abstract class AbstractBaseJnlpMojo
     /**
      * Define whether to remove existing signatures.
      */
-    @Parameter( alias = "unsign", defaultValue = "false" )
+    @Parameter( property = "jnlp.unsign", alias = "unsign", defaultValue = "false" )
     private boolean unsignAlreadySignedJars;
 
     /**
@@ -180,7 +180,7 @@ public abstract class AbstractBaseJnlpMojo
      *
      * @since 1.0-beta-2
      */
-    @Parameter( defaultValue = "true" )
+    @Parameter( property = "jnlp.canUnsign", defaultValue = "true" )
     private boolean canUnsign;
 
     /**

diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractJnlpMojo.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/AbstractJnlpMojo.java
@@ -119,23 +119,23 @@ public void setExcludes( List<String> excludes )
      *
      * @since 1.0-beta-2
      */
-    @Parameter( defaultValue = "true" )
+    @Parameter( property = "jnlp.makeArchive", defaultValue = "true" )
     private boolean makeArchive;
 
     /**
      * Flag to attach the archive or not to the project's build.
      *
      * @since 1.0-beta-2
      */
-    @Parameter( defaultValue = "true" )
+    @Parameter( property = "jnlp.attachArchive", defaultValue = "true" )
     private boolean attachArchive;
 
     /**
      * The path of the archive to generate if {@link #makeArchive} flag is on.
      *
      * @since 1.0-beta-4
      */
-    @Parameter( defaultValue = "${project.build.directory}/${project.build.finalName}.zip" )
+    @Parameter( property = "jnlp.archive", defaultValue = "${project.build.directory}/${project.build.finalName}.zip" )
     private File archive;
 
     /**
@@ -183,7 +183,7 @@ public void setExcludes( List<String> excludes )
      * <strong>Note: </strong> since version 1.0-beta-5 we use the version download protocol optimization (see
      * http://docs.oracle.com/javase/tutorial/deployment/deploymentInDepth/avoidingUnnecessaryUpdateChecks.html).
      */
-    @Parameter( defaultValue = "false" )
+    @Parameter( property = "jnlp.outputJarVersions", defaultValue = "false" )
     private boolean outputJarVersions;
 
     // ----------------------------------------------------------------------

diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpDownloadServletMojo.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpDownloadServletMojo.java
@@ -84,7 +84,7 @@ public class JnlpDownloadServletMojo
      * artifacts will be stored after processing. directory will be created
      * directly within the root of the WAR produced by the enclosing project.
      */
-    @Parameter( defaultValue = "webstart" )
+    @Parameter( property = "jnlp.outputDirectoryName", defaultValue = "webstart" )
     private String outputDirectoryName;
 
     /**

diff --git a/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpReportMojo.java b/webstart-maven-plugin/src/main/java/org/codehaus/mojo/webstart/JnlpReportMojo.java
@@ -51,13 +51,13 @@ public class JnlpReportMojo
     /**
      * Location where the site is generated.
      */
-    @Parameter( defaultValue = "${project.reporting.outputDirectory}" )
+    @Parameter( property = "jnlp.outputDirectory", defaultValue = "${project.reporting.outputDirectory}" )
     private File outputDirectory;
 
     /**
      * Directory where the jnlp artifacts and jnlp sources files reside.
      */
-    @Parameter( defaultValue = "${project.build.directory}/jnlp", required = true )
+    @Parameter( property = "jnlp.jnlpSourceDirectory", defaultValue = "${project.build.directory}/jnlp", required = true )
     private File jnlpSourceDirectory;
 
     /**