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

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-04-05 21:51:15 +0000 (Mon, 05 Apr 2010)
New Revision: 12018

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: Fix methods override to install -javadoc JAR flavors.

Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog	2010-04-05 21:42:16 UTC (rev 12017)
+++ trunk/maven-debian-helper/debian/changelog	2010-04-05 21:51:15 UTC (rev 12018)
@@ -1,3 +1,9 @@
+maven-debian-helper (0.12) unstable; urgency=low
+
+  * SysInstallDocMojo: Fix methods override to install -javadoc JAR flavors.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 05 Apr 2010 23:46:22 +0200
+
 maven-debian-helper (0.11) unstable; urgency=low
 
   * SysInstallMojo: Read generated pom.properties after POMCleaner

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	2010-04-05 21:42:16 UTC (rev 12017)
+++ trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallDocMojo.java	2010-04-05 21:51:15 UTC (rev 12018)
@@ -12,14 +12,14 @@
 public class SysInstallDocMojo extends SysInstallMojo
 {
 
-  protected String jarName()
+  protected String destJarName()
   {
-    return getArtifactId() + "-" + getVersion() + "-javadoc.jar";
+    return getDestArtifactId() + "-" + getVersion() + "-javadoc.jar";
   }
 
   protected String debianJarName()
   {
-    return getArtifactId() + "-" + getDebianVersion() + "-javadoc.jar";
+    return getDestArtifactId() + "-" + getDebianVersion() + "-javadoc.jar";
   }
 
   /**

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	2010-04-05 21:42:16 UTC (rev 12017)
+++ trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java	2010-04-05 21:51:15 UTC (rev 12018)
@@ -145,6 +145,11 @@
   {
       return artifactId;
   }
+  
+  protected String getDestArtifactId()
+  {
+      return destArtifactId;
+  }
 
   protected String getVersion()
   {