[pkg-java] r7794 - in trunk/maven-ant-helper: debian src/main/java

[twerner at alioth.debian.org]

Author: twerner
Date: 2009-01-07 18:52:04 +0000 (Wed, 07 Jan 2009)
New Revision: 7794

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/debian/control
   trunk/maven-ant-helper/src/main/java/ModelloTask.java
Log:
merge experimental branch


Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2009-01-06 21:26:44 UTC (rev 7793)
+++ trunk/maven-ant-helper/debian/changelog	2009-01-07 18:52:04 UTC (rev 7794)
@@ -1,3 +1,10 @@
+maven-ant-helper (4) experimental; urgency=low
+
+  * Update modello ant task to support the new modello package.
+  * Add myself to Uploaders.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 05 Dec 2008 12:18:27 +0100
+
 maven-ant-helper (3) unstable; urgency=low
 
   * Changed "Depends: libmodello-java" to a "Recommends".

Modified: trunk/maven-ant-helper/debian/control
===================================================================
--- trunk/maven-ant-helper/debian/control	2009-01-06 21:26:44 UTC (rev 7793)
+++ trunk/maven-ant-helper/debian/control	2009-01-07 18:52:04 UTC (rev 7794)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>
+Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
 Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional
 Standards-Version: 3.7.2
@@ -10,7 +10,7 @@
 Package: maven-ant-helper
 Architecture: all
 Section: devel
-Recommends: libmodello-java
+Recommends: libmodello-java (>= 1.0-alpha-21-1)
 Description: helper scripts for building Maven components with ant
  An environment that can be used to simplify the creation of Debian packages
  to support the Maven system. A "modello" ant task is also provided.

Modified: trunk/maven-ant-helper/src/main/java/ModelloTask.java
===================================================================
--- trunk/maven-ant-helper/src/main/java/ModelloTask.java	2009-01-06 21:26:44 UTC (rev 7793)
+++ trunk/maven-ant-helper/src/main/java/ModelloTask.java	2009-01-07 18:52:04 UTC (rev 7794)
@@ -50,13 +50,23 @@
         log( "Running the '" + plugin + "' Modello plugin using model file " + model + " for version " + version );
 
         URL[] urls = new URL[] {
-            new URL( "file:/usr/share/java/libplexus-utils.jar" ),
             new URL( "file:/usr/share/java/plexus-utils.jar" ),
             new URL( "file:/usr/share/java/plexus-classworlds.jar" ),
-            new URL( "file:/usr/share/java/plexus-container-default.jar" ),
+            new URL( "file:/usr/share/java/plexus-container-default-1.0.jar" ),
             new URL( "file:/usr/share/java/modello-core.jar" ),
+            new URL( "file:/usr/share/java/modello-plugin-converters.jar" ),
+            new URL( "file:/usr/share/java/modello-plugin-dom4j.jar" ),
+            new URL( "file:/usr/share/java/modello-plugin-jdom.jar" ),
+            new URL( "file:/usr/share/java/modello-plugin-jpox.jar" ),
+            new URL( "file:/usr/share/java/modello-plugin-plexus-registry.jar" ),
+            new URL( "file:/usr/share/java/modello-plugin-stax.jar" ),
+            new URL( "file:/usr/share/java/modello-plugin-store.jar" ),
+            new URL( "file:/usr/share/java/modello-plugin-xdoc.jar" ),
             new URL( "file:/usr/share/java/modello-plugin-xml.jar" ),
             new URL( "file:/usr/share/java/modello-plugin-xpp3.jar" ),
+            new URL( "file:/usr/share/java/modello-plugin-xsd.jar" ),
+            new URL( "file:/usr/share/java/google-collect.jar" ),
+            new URL( "file:/usr/share/java/xbean-reflect.jar" ),
         };
 
         ClassLoader cl = new URLClassLoader( urls );