This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository jetty9.
commit e9fca4332639991e36cf76bc91c45efdf3903ab9 Author: Jakub Adam <[email protected]> Date: Wed Apr 11 21:38:32 2012 +0200 Build documentation package --- debian/control | 26 +++++++++++++------------- debian/libjetty8-java-doc.install | 2 +- debian/maven.ignoreRules | 1 - debian/patches/aggregate-doc.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 7 ++++++- 6 files changed, 42 insertions(+), 16 deletions(-) diff --git a/debian/control b/debian/control index 39e8906..ebbabff 100644 --- a/debian/control +++ b/debian/control @@ -25,19 +25,19 @@ Description: Java servlet engine and webserver -- core libraries extensible and flexible, thus making it an ideal platform for serving dynamic HTTP requests from any Java application. -#Package: libjetty8-java-doc -#Section: doc -#Architecture: all -#Depends: ${misc:Depends} -#Recommends: default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc -#Suggests: libjetty-java -#Description: Javadoc for the Jetty API -# Jetty is an Open Source HTTP Servlet Server written in 100% Java. -# It is designed to be light weight, high performance, embeddable, -# extensible and flexible, thus making it an ideal platform for serving -# dynamic HTTP requests from any Java application. -# . -# This package contains the Javadoc for libjetty-java. +Package: libjetty8-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Recommends: default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc +Suggests: libjetty-java +Description: Javadoc for the Jetty API + Jetty is an Open Source HTTP Servlet Server written in 100% Java. + It is designed to be light weight, high performance, embeddable, + extensible and flexible, thus making it an ideal platform for serving + dynamic HTTP requests from any Java application. + . + This package contains the Javadoc for libjetty-java. Package: libjetty8-extra-java Architecture: all diff --git a/debian/libjetty8-java-doc.install b/debian/libjetty8-java-doc.install index 81d9f37..cf64dc3 100644 --- a/debian/libjetty8-java-doc.install +++ b/debian/libjetty8-java-doc.install @@ -1 +1 @@ -api usr/share/doc/libjetty8-java +target/site/api usr/share/doc/libjetty8-java diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index a7f4f01..549ece6 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -4,7 +4,6 @@ org.apache.maven.plugins maven-assembly-plugin * * * * org.apache.maven.plugins maven-dependency-plugin * * * * org.apache.maven.plugins maven-eclipse-plugin * * * * org.apache.maven.plugins maven-enforcer-plugin * * * * -#org.apache.maven.plugins maven-javadoc-plugin * * * * org.apache.maven.plugins maven-pmd-plugin * * * * org.apache.maven.plugins maven-remote-resources-plugin * * * * org.apache.maven.plugins maven-source-plugin * * * * diff --git a/debian/patches/aggregate-doc.patch b/debian/patches/aggregate-doc.patch new file mode 100644 index 0000000..ab5d33f --- /dev/null +++ b/debian/patches/aggregate-doc.patch @@ -0,0 +1,21 @@ +From: Jakub Adam <[email protected]> +Date: Thu, 12 Apr 2012 22:46:39 +0200 +Subject: aggregate-doc + +--- + pom.xml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pom.xml b/pom.xml +index 9933028..571e228 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -281,6 +281,8 @@ + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> ++ <aggregate>true</aggregate> ++ <outputDirectory>${project.build.directory}/api</outputDirectory> + <docfilessubdirs>true</docfilessubdirs> + <detectLinks>false</detectLinks> + <detectJavaApiLink>true</detectJavaApiLink> diff --git a/debian/patches/series b/debian/patches/series index cd2a3cf..98e6f0c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ annotations-find-asm-commons.patch disable-osgi-tests.patch maven-bundle-plugin-version.patch disable-modules.patch +aggregate-doc.patch diff --git a/debian/rules b/debian/rules index 6330bed..ec2b4a8 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,8 @@ include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_MAVEN_INSTALL_TARGET := -DEB_MAVEN_DOC_TARGET := +DEB_MAVEN_INSTALL_DOC_TARGET := +DEB_MAVEN_DOC_TARGET := javadoc:aggregate DEB_MAVEN_ARGS := -P-aggregates -P-osgi LIBJETTY_JARS := continuation deploy http io jmx overlay-deployer policy rewrite security \ @@ -48,6 +49,10 @@ install/libjetty8-extra-java:: libjetty8-extra-java-mh-install done; \ dh_link -plibjetty8-extra-java usr/share/java/jetty8-monitor-$$version.jar usr/share/jetty8/lib/monitor/jetty-monitor.jar +install/libjetty8-java-doc:: + mv target/site/apidocs target/site/api + dh_install -p libjetty8-java-doc + %-mh-install: mh_install -p$(patsubst %-mh-install,%,$@) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
