Author: ludovicc-guest Date: 2009-07-02 16:43:16 +0000 (Thu, 02 Jul 2009) New Revision: 8802
Added: trunk/libxbean-java/debian/README.Debian trunk/libxbean-java/debian/build.properties trunk/libxbean-java/debian/libxbean-java-doc.doc-base trunk/libxbean-java/debian/libxbean-java-doc.docs trunk/libxbean-java/debian/libxbean-java.poms trunk/libxbean-java/debian/maven.rules Removed: trunk/libxbean-java/debian/ant.properties trunk/libxbean-java/debian/maven-build.xml Modified: trunk/libxbean-java/debian/build.xml trunk/libxbean-java/debian/control trunk/libxbean-java/debian/orig-tar.sh trunk/libxbean-java/debian/rules Log: * New version Added: trunk/libxbean-java/debian/README.Debian =================================================================== --- trunk/libxbean-java/debian/README.Debian (rev 0) +++ trunk/libxbean-java/debian/README.Debian 2009-07-02 16:43:16 UTC (rev 8802) @@ -0,0 +1,14 @@ +libxbean-java +-------------- + +This package does not contain the following XBean modules as they +rely on some additional dependencies: +- maven-xbean-plugin +- xbean-classloader +- xbean-spring + +I would advise to package those additional modules in a separate package, to +avoid circular dependencies as Maven uses XBean + + -- Ludovic Claude <[email protected]> Tue, 05 May 2009 18:10:17 +0100 + Deleted: trunk/libxbean-java/debian/ant.properties =================================================================== --- trunk/libxbean-java/debian/ant.properties 2009-07-02 14:51:24 UTC (rev 8801) +++ trunk/libxbean-java/debian/ant.properties 2009-07-02 16:43:16 UTC (rev 8802) @@ -1,4 +0,0 @@ -classpath.compile= -classpath.test= -javadoc.dir=build/api -maven.test.skip=true Added: trunk/libxbean-java/debian/build.properties =================================================================== --- trunk/libxbean-java/debian/build.properties (rev 0) +++ trunk/libxbean-java/debian/build.properties 2009-07-02 16:43:16 UTC (rev 8802) @@ -0,0 +1,3 @@ +javadoc.dir=build/docs/api +maven.test.skip=true +build.javaVersion=1.5 Modified: trunk/libxbean-java/debian/build.xml =================================================================== --- trunk/libxbean-java/debian/build.xml 2009-07-02 14:51:24 UTC (rev 8801) +++ trunk/libxbean-java/debian/build.xml 2009-07-02 16:43:16 UTC (rev 8802) @@ -2,30 +2,36 @@ <project name="xbean" default="package" basedir=".."> + <property file="debian/build.properties"/> + <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/> <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> <macrodef name="cleanmodule"> <attribute name="dir"/> <sequential> - <ant target="clean" - antfile="${basedir}/debian/maven-build.xml" dir="@{dir}"/> + <ant target="clean" antfile="${maven.build}" dir="@{dir}"> + <property name="debian.dir" location="debian" /> + <property name="project.dir" value="@{dir}" /> + </ant> </sequential> </macrodef> <macrodef name="packagemodule"> <attribute name="dir"/> - <attribute name="artifactId"/> + <attribute name="classpath" default="${classpath.compile}" /> <sequential> - <ant target="package" antfile="${basedir}/debian/maven-build.xml" dir="@{dir}"> - <property name="artifactId" value="@{artifactId}"/> + <ant target="package" antfile="${maven.build}" dir="@{dir}"> + <property name="debian.dir" location="debian" /> + <property name="project.dir" value="@{dir}" /> + <property name="classpath.compile" value="@{classpath}"/> </ant> </sequential> </macrodef> <target name="clean"> <delete dir="build"/> - <cleanmodule dir="maven-xbean-plugin"/> - <cleanmodule dir="xbean-classloader"/> + <!--cleanmodule dir="maven-xbean-plugin"/> + <cleanmodule dir="xbean-classloader"/--> <cleanmodule dir="xbean-classpath"/> <cleanmodule dir="xbean-finder"/> <cleanmodule dir="xbean-naming"/> @@ -35,16 +41,21 @@ <!-- we do not build all modules yet --> <target name="package"> - <packagemodule dir="xbean-classpath" artifactId="xbean-classpath"/> - <packagemodule dir="xbean-naming" artifactId="xbean-naming"/> - <packagemodule dir="xbean-reflect" artifactId="xbean-reflect"/> - <packagemodule dir="xbean-telnet" artifactId="xbean-telnet"/> + <packagemodule dir=""/> + <packagemodule dir="xbean-classpath"/> + <packagemodule dir="xbean-finder" classpath="${classpath.compile}:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"/> + <packagemodule dir="xbean-naming"/> + <packagemodule dir="xbean-reflect" classpath="${classpath.compile}:/usr/share/java/asm2.jar:/usr/share/java/asm2-commons.jar"/> + <packagemodule dir="xbean-telnet"/> </target> - <!-- we do not build documentation yet --> <target name="javadoc"> <javadoc destdir="${javadoc.dir}"> + <packageset dir="xbean-classpath/src/main/java/"/> + <packageset dir="xbean-finder/src/main/java/"/> + <packageset dir="xbean-naming/src/main/java/"/> <packageset dir="xbean-reflect/src/main/java/"/> + <packageset dir="xbean-telnet/src/main/java/"/> </javadoc> </target> Modified: trunk/libxbean-java/debian/control =================================================================== --- trunk/libxbean-java/debian/control 2009-07-02 14:51:24 UTC (rev 8801) +++ trunk/libxbean-java/debian/control 2009-07-02 16:43:16 UTC (rev 8802) @@ -1,17 +1,20 @@ Source: libxbean-java -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: ant, debhelper (>= 5), cdbs, openjdk-6-jdk, maven-ant-helper, - libcommons-logging-java, liblog4j1.2-java, libasm2-java, groovy -Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 5), cdbs, default-jdk +Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, + libcommons-logging-java, liblog4j1.2-java, libasm2-java, libasm3-java, groovy +Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxbean-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxbean-java/ Homepage: http://geronimo.apache.org/xbean/ Package: libxbean-java Architecture: all +Depends: ${misc:Depends} +Recommends: libcommons-logging-java, liblog4j1.2-java, libasm2-java, libasm3-java, groovy Description: plugin based Java application server The goal of XBean project is to created a plugin based server analogous to Eclipse being a plugin based IDE. XBean will be able to discover, download and @@ -19,3 +22,17 @@ include support for multiple IoC systems, support for running with no IoC system, JMX without JMX code, lifecycle and class loader management, and a rock solid Spring integration. + +Package: libxbean-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: API documentation for XBean + The goal of XBean project is to created a plugin based server analogous to + Eclipse being a plugin based IDE. XBean will be able to discover, download and + install server plugins from an Internet based repository. In addition, we + include support for multiple IoC systems, support for running with no IoC + system, JMX without JMX code, lifecycle and class loader management, and a rock + solid Spring integration. + . + This package contains the API documentation for libxbean-java Added: trunk/libxbean-java/debian/libxbean-java-doc.doc-base =================================================================== --- trunk/libxbean-java/debian/libxbean-java-doc.doc-base (rev 0) +++ trunk/libxbean-java/debian/libxbean-java-doc.doc-base 2009-07-02 16:43:16 UTC (rev 8802) @@ -0,0 +1,11 @@ +Document: libxbean-java +Title: Programmer API for XBean +Author: Apache Commons Lang developers +Abstract: The goal of XBean project is to created a plugin based server analogous to + Eclipse being a plugin based IDE. XBean will be able to discover, download and + install server plugins from an Internet based repository. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libxbean-java-doc/api/index.html +Files: /usr/share/doc/libxbean-java-doc/api/* Added: trunk/libxbean-java/debian/libxbean-java-doc.docs =================================================================== --- trunk/libxbean-java/debian/libxbean-java-doc.docs (rev 0) +++ trunk/libxbean-java/debian/libxbean-java-doc.docs 2009-07-02 16:43:16 UTC (rev 8802) @@ -0,0 +1 @@ +build/docs/api Added: trunk/libxbean-java/debian/libxbean-java.poms =================================================================== --- trunk/libxbean-java/debian/libxbean-java.poms (rev 0) +++ trunk/libxbean-java/debian/libxbean-java.poms 2009-07-02 16:43:16 UTC (rev 8802) @@ -0,0 +1,7 @@ +pom.xml --no-parent +xbean-classpath/pom.xml +xbean-finder/pom.xml +xbean-naming/pom.xml +xbean-reflect/pom.xml +xbean-telnet/pom.xml + Deleted: trunk/libxbean-java/debian/maven-build.xml =================================================================== --- trunk/libxbean-java/debian/maven-build.xml 2009-07-02 14:51:24 UTC (rev 8801) +++ trunk/libxbean-java/debian/maven-build.xml 2009-07-02 16:43:16 UTC (rev 8802) @@ -1,117 +0,0 @@ -<?xml version="1.0"?> - -<project name="pkg-java" default="package" basedir=".."> - - <target name="init"> - <available property="available.resources" file="src/main/resources"/> - - <fail unless="artifactId" message="Missing required property: artifactId"/> - <fail unless="version" message="Missing required property: version"/> - <fail unless="basedir" message="Missing required property: basedir"/> - - <echo message="Compile classpath: ${classpath.full.compile}"/> - <echo message="Test classpath: ${classpath.full.test}"/> - </target> - - <!-- - | LIFECYCLE: Clean - |--> - - <target name="clean"> - <delete dir="${build.directory}"/> - </target> - - <!-- - | LIFECYCLE: jar - | - | This mimics the default Maven build life-cycle: http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html - |--> - - <target name="process-resources" depends="init" if="available.resources"> - <mkdir dir="${build.outputDirectory}"/> - <copy todir="${build.outputDirectory}"> - <fileset dir="src/main/resources"/> - </copy> - </target> - - <target name="compile" depends="process-resources"> - <mkdir dir="${build.outputDirectory}"/> - <mkdir dir="${build.directory}/generated-sources"/> - <javac - destdir="${build.outputDirectory}" - classpath="${classpath.compile}" - nowarn="true" - source="1.5" target="1.5" - debug="on"> - <src path="${build.sourceDirectory}"/> - <src path="${build.directory}/generated-sources"/> - </javac> - </target> - - <target name="process-test-resources" depends="compile" unless="maven.test.skip"> - <mkdir dir="${build.testOutputDirectory}"/> - <copy todir="${build.testOutputDirectory}"> - <fileset dir="src/test/resources"/> - </copy> - </target> - - <target name="test-compile" depends="process-test-resources" unless="maven.test.skip"> - <mkdir dir="${build.testOutputDirectory}"/> - <javac - destdir="${build.testOutputDirectory}" - classpath="${classpath.full.test}" - nowarn="true" - source="1.5" target="1.5" - debug="on"> - <src path="${build.testSourceDirectory}"/> - </javac> - </target> - - <target name="test" depends="test-compile" unless="maven.test.skip"> - <mkdir dir="${build.directory}/test-output"/> - <junit printsummary="yes" haltonfailure="no"> <!-- fork="yes" forkmode="once" --> - <sysproperty key="basedir" value="${basedir}"/> - <classpath> - <pathelement path="${classpath.full.test}"/> - </classpath> - - <formatter type="plain"/> - <batchtest todir="${build.directory}/test-output"> - <fileset dir="${build.testSourceDirectory}"> - <include name="**/*Test.java"/> - <exclude name="**/Abstract*"/> - <exclude name="${maven.test.exclude}"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="package" depends="test"> -<!-- - <delete file="${jar}"/> - - <mkdir dir="${build.directory}/META-INF/maven/org.codehaus.modello/modello-core" /> - <copy file="./modello-core/pom.xml" todir="${build.directory}/META-INF/maven/org.codehaus.modello/modello-core" /> ---> - <jar jarfile="${build.directory}/${artifactId}-${version}.jar" - basedir="${build.outputDirectory}"/> - </target> - - <!-- - | Javadoc - |--> - - <target name="javadoc"> - <mkdir dir="${javadoc.dir}"/> - <javadoc - packagenames="org.codehaus.*" - sourcepath="${build.sourceDirectory}" - destdir="${javadoc.dir}" - author="true" - version="true" - windowtitle="${package} API" - doctitle="${package} - ${version}" - classpath="${classpath.full.compile}" > - </javadoc> - </target> -</project> Added: trunk/libxbean-java/debian/maven.rules =================================================================== --- trunk/libxbean-java/debian/maven.rules (rev 0) +++ trunk/libxbean-java/debian/maven.rules 2009-07-02 16:43:16 UTC (rev 8802) @@ -0,0 +1,6 @@ +asm * * s/2\..*/2.x/ +asm * * s/3\..*/3.x/ +log4j log4j jar s/1\.2\..*/1.2.x/ +junit junit jar s/3\..*/3.x/ +# force using commons-logging instead of only the api +commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ Property changes on: trunk/libxbean-java/debian/orig-tar.sh ___________________________________________________________________ Modified: svn:executable - + * Modified: trunk/libxbean-java/debian/rules =================================================================== --- trunk/libxbean-java/debian/rules 2009-07-02 14:51:24 UTC (rev 8801) +++ trunk/libxbean-java/debian/rules 2009-07-02 16:43:16 UTC (rev 8802) @@ -3,21 +3,23 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') -VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g") -JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_JARS := asm2 asm2-commons commons-logging groovy log4j-1.2 -DEB_ANT_BUILD_TARGET := package +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-nodeps commons-logging groovy log4j-1.2 +DEB_ANT_BUILD_TARGET := package javadoc DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Dversion=$(VERSION) +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION) MODULES := classpath naming reflect telnet get-orig-source: - uscan --force-download --rename + uscan --download-version $(VERSION) --force-download --rename binary-post-install/$(PACKAGE):: - for MODULE in $(MODULES); do \ - dh_install -p$(PACKAGE) xbean-$$MODULE/build/xbean-$$MODULE-$(VERSION).jar usr/share/java; \ - dh_link -p$(PACKAGE) /usr/share/java/xbean-$$MODULE-$(VERSION).jar /usr/share/java/xbean-$$MODULE.jar; \ - done + mh_installpoms -p$(PACKAGE) + set -e; for MODULE in $(MODULES); do \ + mh_installjar -p$(PACKAGE) -l xbean-$$MODULE/pom.xml xbean-$$MODULE/build/xbean-$$MODULE-$(VERSION).jar; \ + done +clean:: + -rm -rf debian/tmp Property changes on: trunk/libxbean-java/debian/rules ___________________________________________________________________ Modified: svn:executable - + * _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
