[pkg-java] r13769 - in trunk/maven-debian-helper: debian maven-debian-plugin/src/main/java/org/debian/maven/plugin

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-06-08 21:36:06 +0000 (Wed, 08 Jun 2011)
New Revision: 13769

Modified:
   trunk/maven-debian-helper/debian/changelog
   trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
   trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
Log:
SysInstallDocMojo, SysInstallMojo: Drop initProperties method and only rely
on Maven mojo attributes injection of "debianPackage" and "destPackage".
Closes: #628693.

Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog	2011-06-08 18:55:09 UTC (rev 13768)
+++ trunk/maven-debian-helper/debian/changelog	2011-06-08 21:36:06 UTC (rev 13769)
@@ -1,4 +1,4 @@
-maven-debian-helper (1.4.3) UNRELEASED; urgency=low
+maven-debian-helper (1.4.3) unstable; urgency=low
 
   * DependenciesSolver: Don't use Properties.store() method since
     it escape some chars (like " >\=") from variables.
@@ -8,8 +8,11 @@
     Closes: #613364
   * mh_resolve_dependencies: Always launch Maven in offline mode
     with --offline option (as already done on mh_make). Closes: #629356
+  * SysInstallDocMojo, SysInstallMojo: Drop initProperties method and only rely
+    on Maven mojo attributes injection of "debianPackage" and "destPackage".
+    Closes: #628693.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 08 Jun 2011 00:51:52 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 08 Jun 2011 23:22:11 +0200
 
 maven-debian-helper (1.4.2) unstable; urgency=low
 

Modified: trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java	2011-06-08 18:55:09 UTC (rev 13768)
+++ trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java	2011-06-08 21:36:06 UTC (rev 13769)
@@ -43,7 +43,6 @@
    */
   protected void runMojo() throws IOException
   {
-    initProperties();
     copyJar();
   }
 

Modified: trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java	2011-06-08 18:55:09 UTC (rev 13768)
+++ trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java	2011-06-08 21:36:06 UTC (rev 13769)
@@ -117,11 +117,18 @@
   private File debianDir;
 
   /**
-   * Debian package
+   * Debian package (send from commande line)
    *
    * @parameter expression="${debian.package}"
    */
   private String debianPackage;
+  
+  /**
+   * Debian package destination (set by xxx.poms file).
+   * By defaul, equals to <code>debianPackage</code> attribute.
+   *
+   * @parameter expression="${debian.package}"
+   */
   private String destPackage;
 
   /**
@@ -446,8 +453,6 @@
     if (pomOption != null && pomOption.isIgnore()) {
         throw new RuntimeException("POM file " + pomFile + " should be ignored");
     }
-
-    destPackage = debianPackage;
     if (pomOption != null && pomOption.getDestPackage() != null) {
       destPackage = pomOption.getDestPackage();
     }
@@ -516,26 +521,6 @@
   }
 
   /**
-   * Initialize some properties which don't seem to be set automatically
-   * by Maven Mojo mechanism.
-   */
-  protected void initProperties()
-  {
-    if (debianDir == null)
-    {
-      debianDir = new File(System.getProperty("debian.dir"));
-    }
-    if (debianPackage == null)
-    {
-      debianPackage = System.getProperty("debian.package");
-    }
-    if (repoDir == null)
-    {
-      repoDir = new File(System.getProperty("maven.repo.local"));
-    }
-  }
-
-  /**
      * Prepare the destination  directories: remove the directory symlinks that were created
      * by copy-repo.sh if they exist as they point to a directory owned by root and that cannot
      * be modified.
@@ -550,7 +535,6 @@
    */
   protected void runMojo() throws IOException
   {
-    //initProperties();
     cleanPom();
     prepareDestDirs();
     copyPom();