Author: twerner Date: 2009-01-29 21:31:32 +0000 (Thu, 29 Jan 2009) New Revision: 7904
Added: trunk/maven-debian-helper/etc/fake-poms.conf Modified: trunk/maven-debian-helper/debian/changelog trunk/maven-debian-helper/maven-debian-helper/pom.xml trunk/maven-debian-helper/maven-debian-plugin/pom.xml trunk/maven-debian-helper/pom.xml trunk/maven-debian-helper/share/maven-debian-helper/copy-repo.sh Log: UNRELEASED * Implement pom faking. Modified: trunk/maven-debian-helper/debian/changelog =================================================================== --- trunk/maven-debian-helper/debian/changelog 2009-01-29 21:01:59 UTC (rev 7903) +++ trunk/maven-debian-helper/debian/changelog 2009-01-29 21:31:32 UTC (rev 7904) @@ -1,3 +1,10 @@ +maven-debian-helper (0.4) unstable; urgency=low + + UNRELEASED + * Implement pom faking. + + -- Torsten Werner <[email protected]> Thu, 29 Jan 2009 20:23:33 +0100 + maven-debian-helper (0.3) unstable; urgency=low * Implement better exception handling. Added: trunk/maven-debian-helper/etc/fake-poms.conf =================================================================== --- trunk/maven-debian-helper/etc/fake-poms.conf (rev 0) +++ trunk/maven-debian-helper/etc/fake-poms.conf 2009-01-29 21:31:32 UTC (rev 7904) @@ -0,0 +1,14 @@ +dom4j dom4j +gnu-getopt getopt /usr/share/java/gnu-getopt.jar +javax.ejb ejb-api /usr/share/java/glassfish-ejb-api.jar +javax.servlet servlet-api /usr/share/java/servlet-api-2.4.jar 2.4 +javax.servlet servlet-api /usr/share/java/servlet-api-2.5.jar 2.5 +jboss.common jboss-common +junit junit /usr/share/java/junit.jar 3.8 +junit junit4 /usr/share/java/junit4.jar 4 +org.apache.ant ant +org.apache.ant ant-launcher +org.apache.ws.jaxme jaxmeapi +org.jboss jbossxb /usr/share/java/jboss-xml-binding.jar +org.jboss.microcontainer jboss-microcontainer +org.jboss.ws jbossws-parent Modified: trunk/maven-debian-helper/maven-debian-helper/pom.xml =================================================================== --- trunk/maven-debian-helper/maven-debian-helper/pom.xml 2009-01-29 21:01:59 UTC (rev 7903) +++ trunk/maven-debian-helper/maven-debian-helper/pom.xml 2009-01-29 21:31:32 UTC (rev 7904) @@ -5,7 +5,7 @@ <parent> <groupId>org.debian.maven</groupId> <artifactId>maven-debian</artifactId> - <version>0.3</version> + <version>0.4</version> </parent> <artifactId>maven-debian-helper</artifactId> Modified: trunk/maven-debian-helper/maven-debian-plugin/pom.xml =================================================================== --- trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2009-01-29 21:01:59 UTC (rev 7903) +++ trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2009-01-29 21:31:32 UTC (rev 7904) @@ -5,7 +5,7 @@ <parent> <artifactId>maven-debian</artifactId> <groupId>org.debian.maven</groupId> - <version>0.3</version> + <version>0.4</version> </parent> <artifactId>maven-debian-plugin</artifactId> Modified: trunk/maven-debian-helper/pom.xml =================================================================== --- trunk/maven-debian-helper/pom.xml 2009-01-29 21:01:59 UTC (rev 7903) +++ trunk/maven-debian-helper/pom.xml 2009-01-29 21:31:32 UTC (rev 7904) @@ -4,7 +4,7 @@ <groupId>org.debian.maven</groupId> <artifactId>maven-debian</artifactId> - <version>0.3</version> + <version>0.4</version> <packaging>pom</packaging> <name>helper tools for using Maven to build Debian packages</name> Modified: trunk/maven-debian-helper/share/maven-debian-helper/copy-repo.sh =================================================================== --- trunk/maven-debian-helper/share/maven-debian-helper/copy-repo.sh 2009-01-29 21:01:59 UTC (rev 7903) +++ trunk/maven-debian-helper/share/maven-debian-helper/copy-repo.sh 2009-01-29 21:31:32 UTC (rev 7904) @@ -5,12 +5,30 @@ SRC_REPO="/usr/share/maven-repo" DEST_REPO="$1/maven-repo" -find_all_poms() { - find $SRC_REPO -name '*.pom' -printf '%P\n' +find_src_poms() { + find -L $SRC_REPO -name '*.pom' -printf '%P\n' } +list_fakes() +{ + CONFFILES="/etc/maven2/fake-poms.conf" + if [ -r debian/fake-poms.conf ] + then + CONFFILES="$CONFFILES debian/fake-poms.conf" + fi + sed -e's,#.*,,' $CONFFILES +} + +find_dest_poms() { + find -L $DEST_REPO -name '*.pom' -printf '%P\n' +} + +find_all_meta() { + find $DEST_REPO -name 'maven-metadata-tmp.xml' +} + echo_property() { - KEY=$(echo $BASE_DIR | tr / .) + KEY=$(echo $BASEDIR | tr / .) case "$KEY" in *.maven-*-plugin|*-maven-plugin) echo "$KEY.version = $VERSION" @@ -23,10 +41,6 @@ esac } -find_all_meta() { - find $DEST_REPO -name 'maven-metadata-tmp.xml' -} - header() { echo '<?xml version="1.0" encoding="UTF-8"?>' echo '<metadata>' @@ -51,17 +65,50 @@ exit 1 fi -find_all_poms | while read POM; do +find_src_poms | while read POM; do VER_DIR=$(dirname $POM) + BASEDIR=$(dirname $VER_DIR) + mkdir -p $DEST_REPO/$BASEDIR + ln -s $SRC_REPO/$VER_DIR $DEST_REPO/$BASEDIR/ +done + +list_fakes | while read GROUPID ARTIFACTID JARFILE VERSION +do + GROUPDIR=$(echo $GROUPID | tr . /) + BASEDIR="$DEST_REPO/$GROUPDIR/$ARTIFACTID" + JARFILE=${JARFILE:-"/usr/share/java/$ARTIFACTID.jar"} + VERSION=${VERSION:-"debian"} + if [ -d $BASEDIR/$VERSION ] + then + echo "skip faking of existing $GROUPID:$ARTIFACTID::$VERSION" + continue + else + mkdir -p $BASEDIR/$VERSION/ + fi + if [ -r $JARFILE ] + then + PACKAGING="jar" + ln -s $JARFILE $BASEDIR/$VERSION/$ARTIFACTID-$VERSION.jar + else + PACKAGING="pom" + fi + cat > $BASEDIR/$VERSION/$ARTIFACTID-$VERSION.pom <<.EOF +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>$GROUPID</groupId> + <artifactId>$ARTIFACTID</artifactId> + <version>$VERSION</version> + <packaging>$PACKAGING</packaging> +</project> +.EOF +done + +find_dest_poms | while read POM; do + VER_DIR=$(dirname $POM) VERSION=$(basename $VER_DIR) - BASE_DIR=$(dirname $VER_DIR) - - mkdir -p $DEST_REPO/$BASE_DIR - ln -s $SRC_REPO/$VER_DIR $DEST_REPO/$BASE_DIR/ - + BASEDIR=$(dirname $VER_DIR) VER_TAG=" <version>$VERSION</version>" - echo "$VER_TAG" >> $DEST_REPO/$BASE_DIR/maven-metadata-tmp.xml - + echo "$VER_TAG" >> $DEST_REPO/$BASEDIR/maven-metadata-tmp.xml echo_property done > $1/auto.properties _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
