[maven2] 10/87: Tidied up classpath - moved information from rules to build.properties/xml. (Still further tidying to be done)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven2.

commit ba3c5ba152755ea7d5d956ad251c43c42737ce8c
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Mon Jun 18 17:57:50 2007 +0000

    Tidied up classpath - moved information from rules to build.properties/xml.
    (Still further tidying to be done)
---
 debian/build.properties | 24 +++++++++++++++++++++++-
 debian/build.xml        |  2 +-
 debian/rules            | 24 +-----------------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index 08b7a43..52c8c61 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -9,4 +9,26 @@ classpath.compile = \
                     /usr/share/java/plexus-interactivity-api.jar:\
                     /usr/share/java/plexus-utils.jar:\
                     /usr/share/java/wagon-provider-api.jar:\
-		    /usr/share/maven-ant-helper/maven-ant-helper.jar
+		    /usr/share/maven-ant-helper/maven-ant-helper.jar:\
+			\
+                    /usr/share/java/junit.jar:\
+                    /usr/share/java/commons-cli.jar:\
+                    /usr/share/java/bsh.jar:\
+../lib/doxia-core-1.0-alpha-8.jar:\
+../lib/doxia-decoration-model-1.0-alpha-8.jar:\
+../lib/doxia-sink-api-1.0-alpha-7.jar:\
+../lib/doxia-site-renderer-1.0-alpha-8.jar:\
+                    /usr/share/java/wagon-file.jar:\
+                    /usr/share/java/wagon-http-lightweight.jar:\
+                    /usr/share/java/wagon-http-shared.jar:\
+                    /usr/share/java/wagon-provider-api.jar:\
+                    /usr/share/java/wagon-ssh.jar:\
+                    /usr/share/java/wagon-ssh-common.jar:\
+                    /usr/share/java/wagon-ssh-external.jar:\
+                    /usr/share/java/classworlds.jar:\
+                    /usr/share/java/plexus-utils.jar:\
+                    /usr/share/java/plexus-container-default.jar:\
+                    /usr/share/java/plexus-interactivity-api.jar:\
+                    /usr/share/java/modello-core.jar:\
+                    /usr/share/java/modello-plugin-xml.jar:\
+                    /usr/share/java/modello-plugin-xpp3.jar
diff --git a/debian/build.xml b/debian/build.xml
index 1f095fd..b5a52ac 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -51,7 +51,7 @@
 </target>
 
 <target name="generate-sources">
-    <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/maven-ant-helper/maven-ant-helper.jar"/>
+    <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/java/maven-ant-helper.jar:/usr/share/java/modello-core.jar:/usr/share/java/modello-plugin-xml.jar:/usr/share/java/modello-plugin-xpp3.jar"/>
     <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="java" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
     <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-reader" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
     <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-writer" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
diff --git a/debian/rules b/debian/rules
index 9628736..8d52077 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,33 +9,11 @@ VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f
 JAVA_HOME            := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar \
-			junit.jar \
-			commons-cli.jar \
-			bsh.jar \
-			\
-			../lib/doxia-core-1.0-alpha-8.jar \
-			../lib/doxia-decoration-model-1.0-alpha-8.jar \
-			../lib/doxia-sink-api-1.0-alpha-7.jar \
-			../lib/doxia-site-renderer-1.0-alpha-8.jar \
-			\
-			wagon-file.jar \
-			wagon-http-lightweight.jar \
-			wagon-http-shared.jar \
-			wagon-provider-api.jar \
-			wagon-ssh.jar \
-			wagon-ssh-common.jar \
-			wagon-ssh-external.jar \
 			\
 			classworlds.jar \
 			plexus-utils.jar \
 			plexus-container-default.jar \
-			plexus-interactivity-api.jar \
-			\
-			modello-core.jar \
-			modello-plugin-xml.jar \
-			modello-plugin-xpp3.jar \
-			\
-			maven-ant-helper.jar
+			plexus-interactivity-api.jar
 
 
 #    TODO - all of the build-depends above must be copied into control

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2.git