[pkg-java] r13773 - in trunk/maven-repo-helper: debian src/main/java/org/debian/maven/repo

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-06-08 22:57:07 +0000 (Wed, 08 Jun 2011)
New Revision: 13773

Modified:
   trunk/maven-repo-helper/debian/changelog
   trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
Log:
TODO: Add support for packages built with dh 7 and javahelper: use the following
line in your rules file:
dh $@ --with javahelper --with jh_mavenrepohelper
This will build the package with javahelper, and the resulting
jar will be installed in the Maven repository (you need of course the
<package>.poms file and the POM files in your package).

Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog	2011-06-08 22:55:16 UTC (rev 13772)
+++ trunk/maven-repo-helper/debian/changelog	2011-06-08 22:57:07 UTC (rev 13773)
@@ -2,6 +2,12 @@
 
   [ Ludovic Claude ]
   * Match jar with bundle as they are equivalent
+  * TODO: Add support for packages built with dh 7 and javahelper: use the following
+    line in your rules file:
+     dh $@ --with javahelper --with jh_mavenrepohelper
+    This will build the package with javahelper, and the resulting
+    jar will be installed in the Maven repository (you need of course the
+    <package>.poms file and the POM files in your package).
 
   [ Damien Raude-Morvan ]
   * Keep relativePath attribute on parent pom.

Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java	2011-06-08 22:55:16 UTC (rev 13772)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java	2011-06-08 22:57:07 UTC (rev 13773)
@@ -668,7 +668,7 @@
     }
 
     private void copyAndFillProjectHeader(XMLStreamReader parser, XMLStreamWriter writer, int inLevel, boolean keepPomVersion, POMInfo info, POMInfo original, Dependency parent, String debianPackage) throws XMLStreamException {
-	if (parser.getNamespaceCount() == 0) {
+        if (parser.getNamespaceCount() == 0) {
             writer.writeNamespace(null, "http://maven.apache.org/POM/4.0.0");
             writer.writeNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
             // The correct URL is http://maven.apache.org/xsd/maven-4.0.0.xsd but
@@ -716,10 +716,10 @@
             writer.writeCharacters(parent.getVersion());
             writer.writeEndElement();
             if (null != parent.getRelativePath()) {
-        	indent(writer, inLevel + 1);
-        	writer.writeStartElement("relativePath");
-        	writer.writeCharacters(parent.getRelativePath());
-        	writer.writeEndElement();
+                indent(writer, inLevel + 1);
+                writer.writeStartElement("relativePath");
+                writer.writeCharacters(parent.getRelativePath());
+                writer.writeEndElement();
             }
             indent(writer, inLevel);
             writer.writeEndElement();