diff -Nru maven-reporting-impl-2.0.4.2/debian/build.properties maven-reporting-impl-2.1/debian/build.properties --- maven-reporting-impl-2.0.4.2/debian/build.properties 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -javadoc.dir=target/api -build.directory=target -maven.test.skip=true diff -Nru maven-reporting-impl-2.0.4.2/debian/changelog maven-reporting-impl-2.1/debian/changelog --- maven-reporting-impl-2.0.4.2/debian/changelog 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/changelog 2011-09-15 20:28:17.000000000 +0000 @@ -1,3 +1,22 @@ +maven-reporting-impl (2.1-1) unstable; urgency=low + + * New upstream release. + * Remove patch that is no longer needed. + * Add Maven rule for junit. + + -- Torsten Werner Thu, 15 Sep 2011 21:32:59 +0200 + +maven-reporting-impl (2.0.5-1) unstable; urgency=low + + * New upstream release. + * Update Standards-Version: 3.9.1. + * Switch to source format 3.0. + * Refresh patch. + * Use Maven to build the package but do not build tests because they FTBFS. + * Add a documentation package. + + -- Torsten Werner Tue, 23 Aug 2011 23:56:00 +0200 + maven-reporting-impl (2.0.4.2-1) unstable; urgency=low * New upstream release. diff -Nru maven-reporting-impl-2.0.4.2/debian/control maven-reporting-impl-2.1/debian/control --- maven-reporting-impl-2.0.4.2/debian/control 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/control 2011-08-23 21:51:21.000000000 +0000 @@ -3,19 +3,20 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Torsten Werner , Michael Koch -Build-Depends: debhelper (>= 7), cdbs, quilt, default-jdk -Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, - libmaven2-core-java, libdoxia-java, libcommons-validator-java, - libplexus-utils-java, libdoxia-sitetools-java -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libcommons-validator-java, libdoxia-java, libdoxia-sitetools-java, libmaven-doxia-tools-java, + libmaven2-core-java, libplexus-utils-java, default-jdk-doc, libdoxia-java-doc, + libmaven2-core-java-doc, libplexus-utils-java-doc, libmaven-javadoc-plugin-java +Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-reporting-impl Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-reporting-impl Homepage: http://maven.apache.org/shared/maven-reporting-impl/ Package: libmaven-reporting-impl-java Architecture: all -Depends: libmaven2-core-java, libdoxia-java, libcommons-validator-java, - libplexus-utils-java, libdoxia-sitetools-java, ${misc:Depends} +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libmaven-reporting-impl-java-doc Description: Maven Reporting API Implementation Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, @@ -33,3 +34,27 @@ * Allowing transparent migration to new features . This package implements the Maven Reporting API. + +Package: libmaven-reporting-impl-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libmaven-reporting-impl-java +Description: Documentation for Maven Reporting API Implementation + Maven is a software project management and comprehension tool. Based on the + concept of a project object model (POM), Maven can manage a project's build, + reporting and documentation from a central piece of information. + . + Maven's primary goal is to allow a developer to comprehend the complete + state of a development effort in the shortest period of time. In order to + attain this goal there are several areas of concern that Maven attempts + to deal with: + . + * Making the build process easy + * Providing a uniform build system + * Providing quality project information + * Providing guidelines for best practices development + * Allowing transparent migration to new features + . + This package contains the API documentation of libmaven-reporting-impl-java. diff -Nru maven-reporting-impl-2.0.4.2/debian/copyright maven-reporting-impl-2.1/debian/copyright --- maven-reporting-impl-2.0.4.2/debian/copyright 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/copyright 2011-08-23 21:51:21.000000000 +0000 @@ -1,29 +1,16 @@ -This package was debianized by Torsten Werner . - -The Debian packaging is Copyright (c) 2008 Torsten Werner and is -licensed under the GNU General Public License version 3. On Debian -systems, the complete text of the GNU General Public License can be -found in '/usr/share/common-licenses/GPL-3'. - -It was downloaded from . - -Upstream author: Vincent Siveton - -Copyright: 2001-2005 Apache Software Foundation. - -License: - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -On Debian systems, the complete text of the Apache License -version 2.0 can be found in /usr/share/common-licenses/Apache-2.0 +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: Maven Reporting Implementation +Upstream-Contact: Vincent Siveton as Java Developer +Source: http://maven.apache.org/shared/maven-reporting-impl/ + +Files: * +Copyright: 2001-2011, Vincent Siveton +License: Apache-2.0 + +Files: debian/* +Copyright: 2008-2011, Torsten Werner +License: Apache-2.0 + +License: Apache-2.0 + On Debian GNU/Linux system you can find the complete text of the + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' diff -Nru maven-reporting-impl-2.0.4.2/debian/libmaven-reporting-impl-java-doc.doc-base.api maven-reporting-impl-2.1/debian/libmaven-reporting-impl-java-doc.doc-base.api --- maven-reporting-impl-2.0.4.2/debian/libmaven-reporting-impl-java-doc.doc-base.api 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/debian/libmaven-reporting-impl-java-doc.doc-base.api 2011-08-23 21:51:21.000000000 +0000 @@ -0,0 +1,10 @@ +Document: libmaven-reporting-impl-java +Title: API Javadoc for Maven Reporting Implementation +Author: Maven Reporting Implementation developers +Abstract: This is the API Javadoc provided for the + libmaven-reporting-impl-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libmaven-reporting-impl-java/api/index.html +Files: /usr/share/doc/libmaven-reporting-impl-java/api/* diff -Nru maven-reporting-impl-2.0.4.2/debian/libmaven-reporting-impl-java-doc.install maven-reporting-impl-2.1/debian/libmaven-reporting-impl-java-doc.install --- maven-reporting-impl-2.0.4.2/debian/libmaven-reporting-impl-java-doc.install 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/debian/libmaven-reporting-impl-java-doc.install 2011-08-23 21:51:21.000000000 +0000 @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libmaven-reporting-impl-java/api + diff -Nru maven-reporting-impl-2.0.4.2/debian/libmaven-reporting-impl-java.poms maven-reporting-impl-2.1/debian/libmaven-reporting-impl-java.poms --- maven-reporting-impl-2.0.4.2/debian/libmaven-reporting-impl-java.poms 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/libmaven-reporting-impl-java.poms 2011-08-23 21:51:21.000000000 +0000 @@ -1 +1,26 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the tag from the POM +# --package=: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=: name to use when installing the library in /usr/share/java +# --usj-version=: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=: the destination for the real jar +# it will be installed with mh_install. +# --classifier=: Optional, the classifier for the jar. Empty by default. +# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created +# temporarily for certain artifacts such as Javadoc jars. +# +pom.xml --no-parent --has-package-version diff -Nru maven-reporting-impl-2.0.4.2/debian/maven.cleanIgnoreRules maven-reporting-impl-2.1/debian/maven.cleanIgnoreRules --- maven-reporting-impl-2.0.4.2/debian/maven.cleanIgnoreRules 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/debian/maven.cleanIgnoreRules 2011-08-23 21:51:21.000000000 +0000 @@ -0,0 +1,17 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + diff -Nru maven-reporting-impl-2.0.4.2/debian/maven.ignoreRules maven-reporting-impl-2.1/debian/maven.ignoreRules --- maven-reporting-impl-2.0.4.2/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/debian/maven.ignoreRules 2011-08-23 21:51:21.000000000 +0000 @@ -0,0 +1,17 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +junit-addons junit-addons * * * * diff -Nru maven-reporting-impl-2.0.4.2/debian/maven.properties maven-reporting-impl-2.1/debian/maven.properties --- maven-reporting-impl-2.0.4.2/debian/maven.properties 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/debian/maven.properties 2011-08-23 21:51:21.000000000 +0000 @@ -0,0 +1,4 @@ +# Include here properties to pass to Maven during the build. +# For example: +maven.test.skip=true + diff -Nru maven-reporting-impl-2.0.4.2/debian/maven.publishedRules maven-reporting-impl-2.1/debian/maven.publishedRules --- maven-reporting-impl-2.0.4.2/debian/maven.publishedRules 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/debian/maven.publishedRules 2011-08-23 21:51:21.000000000 +0000 @@ -0,0 +1,19 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + diff -Nru maven-reporting-impl-2.0.4.2/debian/maven.rules maven-reporting-impl-2.1/debian/maven.rules --- maven-reporting-impl-2.0.4.2/debian/maven.rules 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/maven.rules 2011-09-15 19:34:54.000000000 +0000 @@ -1 +1,19 @@ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x + +org.apache.maven.reporting maven-reporting-impl jar s/.*/debian/ * * junit junit jar s/3\..*/3.x/ diff -Nru maven-reporting-impl-2.0.4.2/debian/orig-tar.sh maven-reporting-impl-2.1/debian/orig-tar.sh --- maven-reporting-impl-2.0.4.2/debian/orig-tar.sh 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/orig-tar.sh 2011-08-23 21:51:21.000000000 +0000 @@ -1,16 +1,16 @@ #!/bin/sh -e -TAR=../maven-reporting-impl_$2.orig.tar.gz -DIR=maven-reporting-impl-$2 -TAG=maven-reporting-impl-$2 +VERSION=$2 +TAR=../maven-reporting-impl_$VERSION.orig.tar.gz +DIR=maven-reporting-impl-$VERSION +TAG=$(echo "maven-reporting-impl-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') -svn export http://svn.apache.org/repos/asf/maven/shared/tags/$TAG $DIR -tar -c -z -f $TAR $DIR +svn export http://svn.apache.org/repos/asf/maven/shared/tags/${TAG}/ $DIR +GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR rm -rf $DIR ../$TAG # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout - mv $TAR $origDir - echo "moved $TAR to $origDir" + mv $TAR $origDir && echo "moved $TAR to $origDir" fi diff -Nru maven-reporting-impl-2.0.4.2/debian/patches/doxia1_1.patch maven-reporting-impl-2.1/debian/patches/doxia1_1.patch --- maven-reporting-impl-2.0.4.2/debian/patches/doxia1_1.patch 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/patches/doxia1_1.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java -+++ b/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java -@@ -16,7 +16,7 @@ - * limitations under the License. - */ - --import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; -+import org.apache.maven.doxia.sink.render.RenderingContext; - import org.apache.maven.doxia.sink.Sink; - import org.apache.maven.doxia.siterenderer.Renderer; - import org.apache.maven.doxia.siterenderer.RendererException; diff -Nru maven-reporting-impl-2.0.4.2/debian/patches/series maven-reporting-impl-2.1/debian/patches/series --- maven-reporting-impl-2.0.4.2/debian/patches/series 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -doxia1_1.patch diff -Nru maven-reporting-impl-2.0.4.2/debian/README.source maven-reporting-impl-2.1/debian/README.source --- maven-reporting-impl-2.0.4.2/debian/README.source 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/README.source 2011-08-23 21:51:21.000000000 +0000 @@ -1,5 +1,9 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. +Information about maven-reporting-impl +------------------------------ -See /usr/share/doc/quilt/README.source for a detailed explanation. +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. diff -Nru maven-reporting-impl-2.0.4.2/debian/rules maven-reporting-impl-2.1/debian/rules --- maven-reporting-impl-2.0.4.2/debian/rules 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/rules 2011-08-23 21:51:21.000000000 +0000 @@ -1,26 +1,9 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/maven.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps doxia-sink-api doxia-site-renderer maven-core maven-reporting-api \ - maven-plugin-api maven-project doxia-module-xhtml doxia-core doxia-logging-api \ - doxia-decoration-model commons-validator plexus-utils -DEB_ANT_BUILD_TARGET := package #javadoc -DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml -DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -API_DOCS := target/api +JAVA_HOME := /usr/lib/jvm/default-java get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar - -clean:: - -rm -rf debian/tmp + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename diff -Nru maven-reporting-impl-2.0.4.2/debian/source/format maven-reporting-impl-2.1/debian/source/format --- maven-reporting-impl-2.0.4.2/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/debian/source/format 2011-10-17 15:38:17.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru maven-reporting-impl-2.0.4.2/debian/TODO maven-reporting-impl-2.1/debian/TODO --- maven-reporting-impl-2.0.4.2/debian/TODO 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/debian/TODO 2011-08-23 21:51:21.000000000 +0000 @@ -0,0 +1 @@ +- fix tests diff -Nru maven-reporting-impl-2.0.4.2/debian/watch maven-reporting-impl-2.1/debian/watch --- maven-reporting-impl-2.0.4.2/debian/watch 2011-10-17 15:38:17.000000000 +0000 +++ maven-reporting-impl-2.1/debian/watch 2011-08-23 21:51:21.000000000 +0000 @@ -1,3 +1,4 @@ version=3 -http://svn.apache.org/repos/asf/maven/shared/tags/ maven-reporting-impl-(.*)/ \ - debian debian/orig-tar.sh +opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ + http://svn.apache.org/repos/asf/maven/shared/tags/ \ + maven-reporting-impl-(\d.*)/ debian debian/orig-tar.sh diff -Nru maven-reporting-impl-2.0.4.2/pom.xml maven-reporting-impl-2.1/pom.xml --- maven-reporting-impl-2.0.4.2/pom.xml 2009-07-18 18:23:50.000000000 +0000 +++ maven-reporting-impl-2.1/pom.xml 2010-05-09 20:19:46.000000000 +0000 @@ -1,4 +1,4 @@ - + + org.apache.maven maven-project ${mavenVersion} - commons-validator - commons-validator - 1.2.0 + org.apache.maven + maven-plugin-api + ${mavenVersion} + + org.apache.maven.doxia - doxia-core + doxia-sink-api ${doxiaVersion} - org.apache.maven - maven-plugin-api - ${mavenVersion} - - - org.apache.maven.reporting - maven-reporting-api - ${mavenVersion} + org.apache.maven.doxia + doxia-core + ${doxiaVersion} org.apache.maven.doxia doxia-site-renderer ${doxiaVersion} + + + + commons-validator + commons-validator + 1.2.0 + + + org.codehaus.plexus + plexus-utils + 1.5.8 + + + + + junit + junit + 3.8.2 + test + junit-addons junit-addons @@ -100,52 +124,20 @@ - - - - - org.apache.maven.plugins - maven-site-plugin - 2.0 - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2-beta-4 - - - - - - release - + reporting + - - maven-assembly-plugin - - - make-project-src-distro - package - - single - - - - src/main/assembly/source-release.xml - - gnu - - - + org.codehaus.mojo + clirr-maven-plugin + + 2.0.4.1 + - + - - \ No newline at end of file + diff -Nru maven-reporting-impl-2.0.4.2/src/main/assembly/source-release.xml maven-reporting-impl-2.1/src/main/assembly/source-release.xml --- maven-reporting-impl-2.0.4.2/src/main/assembly/source-release.xml 2009-07-18 18:02:47.000000000 +0000 +++ maven-reporting-impl-2.1/src/main/assembly/source-release.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ - - - - - source-release - - tar.gz - tar.bz2 - zip - - - - ${project.basedir} - / - true - - **/*.iws - **/*.ipr - **/*.iml - *.log - target/** - - - - ${project.build.directory}/maven-shared-archive-resources/META-INF - / - - - diff -Nru maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java --- maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java 2009-07-18 18:23:50.000000000 +0000 +++ maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/AbstractMavenMultiPageReport.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -package org.apache.maven.reporting; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.siterenderer.RendererException; -import org.apache.maven.reporting.sink.MultiPageSink; -import org.apache.maven.reporting.sink.SinkFactory; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * @author Emmanuel Venisse - * @version $Id: MavenReport.java 163376 2005-02-23 00:06:06Z brett $ - */ -public abstract class AbstractMavenMultiPageReport - extends AbstractMavenReport -{ - private SinkFactory factory; - - private List sinks = new ArrayList(); - - public void setSinkFactory( SinkFactory factory ) - { - this.factory = factory; - } - - public SinkFactory getSinkFactory() - { - return factory; - } - - public boolean useDefaultSiteDescriptor() - { - return true; - } - - public abstract boolean usePageLinkBar(); - - private Sink getSink( String outputName ) - throws RendererException, IOException - { - return factory.getSink( outputName ); - } - - public MultiPageSink startPage( String outputName ) - throws RendererException, IOException - { - return new MultiPageSink( outputName, getSink( outputName ) ); - } - - public void endPage( MultiPageSink sink ) - { - if ( usePageLinkBar() ) - { - sinks.add( sink ); - } - else - { - sink.closeSink(); - } - } - - protected void closeReport() - { - if ( !sinks.isEmpty() ) - { - for ( Iterator i = sinks.iterator(); i.hasNext(); ) - { - MultiPageSink currentSink = (MultiPageSink) i.next(); - - currentSink.paragraph(); - - for ( int counter = 1; counter <= sinks.size(); counter++ ) - { - if ( counter > 1 ) - { - currentSink.text( " " ); - } - MultiPageSink sink = (MultiPageSink) sinks.get( counter - 1 ); - sink.link( sink.getOutputName() + ".html" ); - sink.text( String.valueOf( counter ) ); - sink.link_(); - } - currentSink.paragraph_(); - currentSink.closeSink(); - } - } - - super.closeReport(); - } -} diff -Nru maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java --- maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java 2009-05-02 22:17:09.000000000 +0000 +++ maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java 2010-05-09 20:17:20.000000000 +0000 @@ -20,119 +20,271 @@ */ import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.render.RenderingContext; +import org.apache.maven.doxia.site.decoration.DecorationModel; import org.apache.maven.doxia.siterenderer.Renderer; +import org.apache.maven.doxia.siterenderer.RendererException; +import org.apache.maven.doxia.siterenderer.SiteRenderingContext; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; -import org.apache.maven.reporting.sink.SinkFactory; +import org.codehaus.plexus.util.IOUtil; import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; import java.util.Locale; /** - * The basis for a Maven report. + * The basis for a Maven report which can be generated both as part of a site generation or + * as a direct standalone invocation. * * @author Emmanuel Venisse - * @version $Id: MavenReport.java 163376 2005-02-23 00:06:06Z brett $ + * @version $Id: AbstractMavenReport.java 942606 2010-05-09 20:17:20Z hboutemy $ + * @since 2.0 + * @see #execute() + * @see #generate(Sink, SinkFactory, Locale) + * @see #executeReport(Locale) */ public abstract class AbstractMavenReport extends AbstractMojo - implements MavenReport + implements MavenMultiPageReport { + /** The current sink to use */ private Sink sink; - private Locale locale = Locale.ENGLISH; - - protected abstract Renderer getSiteRenderer(); - - protected abstract String getOutputDirectory(); - - protected abstract MavenProject getProject(); + /** The sink factory to use */ + private SinkFactory sinkFactory; + /** The current report output directory to use */ private File reportOutputDirectory; /** + * This method is called when the report generation is invoked directly as a standalone Mojo. + * + * @throws MojoExecutionException if an error occurs when generating the report + * @see org.apache.maven.plugins.site.ReportDocumentRender * @see org.apache.maven.plugin.Mojo#execute() */ public void execute() throws MojoExecutionException { + if ( !canGenerateReport() ) + { + return; + } + + Writer writer = null; try { - String outputDirectory = getOutputDirectory(); + File outputDirectory = new File( getOutputDirectory() ); + + String filename = getOutputName() + ".html"; - SiteRendererSink sink = - SinkFactory.createSink( new File( outputDirectory ), getOutputName() + ".html" ); + Locale locale = Locale.getDefault(); - generate( sink, Locale.getDefault() ); + SiteRenderingContext siteContext = new SiteRenderingContext(); + siteContext.setDecoration( new DecorationModel() ); + siteContext.setTemplateName( "org/apache/maven/doxia/siterenderer/resources/default-site.vm" ); + siteContext.setLocale( locale ); - // TODO: add back when skinning support is in the site renderer -// getSiteRenderer().copyResources( outputDirectory, "maven" ); + RenderingContext context = new RenderingContext( outputDirectory, filename ); + + SiteRendererSink sink = new SiteRendererSink( context ); + + generate( sink, null, locale ); + + outputDirectory.mkdirs(); + + writer = new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, filename ) ), "UTF-8" ); + + getSiteRenderer().generateDocument( writer, sink, siteContext ); + + //getSiteRenderer().copyResources( siteContext, new File( project.getBasedir(), "src/site/resources" ), + // outputDirectory ); + } + catch ( RendererException e ) + { + throw new MojoExecutionException( + "An error has occurred in " + getName( Locale.ENGLISH ) + " report generation.", e ); + } + catch ( IOException e ) + { + throw new MojoExecutionException( + "An error has occurred in " + getName( Locale.ENGLISH ) + " report generation.", e ); } catch ( MavenReportException e ) { - throw new MojoExecutionException( "An error has occurred in " + getName( locale ) + " report generation.", - e ); + throw new MojoExecutionException( + "An error has occurred in " + getName( Locale.ENGLISH ) + " report generation.", e ); + } + finally + { + IOUtil.close( writer ); } } /** - * @see org.apache.maven.reporting.MavenReport#generate(org.codehaus.doxia.sink.Sink, java.util.Locale) + * Generate a report. + * + * @param aSink the sink to use for the generation. + * @param aLocale the wanted locale to generate the report, could be null. + * @throws MavenReportException if any + * @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead. + */ + public void generate( org.codehaus.doxia.sink.Sink aSink, Locale aLocale ) + throws MavenReportException + { + getLog().warn( "Deprecated API called - not org.apache.maven.doxia.sink.Sink instance and no SinkFactory" + + " available. Please update this plugin." ); + generate( aSink, null, aLocale ); + } + + /** + * Generate a report. + * + * @param aSink + * @param aLocale + * @throws MavenReportException + * @see org.apache.maven.reporting.MavenReport#generate(org.apache.maven.doxia.sink.Sink, java.util.Locale) + * @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead. */ - public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale ) + public void generate( Sink aSink, Locale aLocale ) throws MavenReportException { - if ( sink == null ) + getLog().warn( "Deprecated API called - no SinkFactory available. Please update this plugin." ); + generate( aSink, null, aLocale ); + } + + /** + * This method is called when the report generation is invoked by maven-site-plugin. + * + * @param aSink + * @param aSinkFactory + * @param aLocale + * @throws MavenReportException + */ + public void generate( Sink aSink, SinkFactory aSinkFactory, Locale aLocale ) + throws MavenReportException + { + if ( aSink == null ) { throw new MavenReportException( "You must specify a sink." ); } - this.sink = sink; + if ( !canGenerateReport() ) + { + getLog().info( "This report cannot be generated as part of the current build. " + + "The report name should be referenced in this line of output." ); + return; + } - executeReport( locale ); + this.sink = aSink; - closeReport(); - } + this.sinkFactory = aSinkFactory; - protected abstract void executeReport( Locale locale ) - throws MavenReportException; + executeReport( aLocale ); - protected void closeReport() - { + closeReport(); } + /** {@inheritDoc} */ public String getCategoryName() { return CATEGORY_PROJECT_REPORTS; } + /** {@inheritDoc} */ public File getReportOutputDirectory() { if ( reportOutputDirectory == null ) { reportOutputDirectory = new File( getOutputDirectory() ); } + return reportOutputDirectory; } + /** {@inheritDoc} */ public void setReportOutputDirectory( File reportOutputDirectory ) { this.reportOutputDirectory = reportOutputDirectory; } + /** + * Actions when closing the report. + */ + protected void closeReport() + { + getSink().close(); + } + + /** + * @return the sink used + */ public Sink getSink() { return sink; } + /** + * @return the sink factory used + */ + public SinkFactory getSinkFactory() + { + return sinkFactory; + } + + /** + * @see org.apache.maven.reporting.MavenReport#isExternalReport() + * @return false by default. + */ public boolean isExternalReport() { return false; } + /** {@inheritDoc} */ public boolean canGenerateReport() { return true; } + + /** + * @return the site renderer used. + */ + protected abstract Renderer getSiteRenderer(); + + /** + * The output directory when the mojo is run directly from the command line. Implementors should use this method to + * return the value of a mojo parameter that the user may use to customize the output directory. + *
+ * Note: + * When the mojo is run as part of a site generation, Maven will set the effective output directory via + * {@link org.apache.maven.reporting.MavenReport#setReportOutputDirectory(java.io.File)}. In this case, the return + * value of this method is irrelevant. Therefore, developers should always call {@link #getReportOutputDirectory()} + * to get the effective output directory for the report. The later method will eventually fallback to this method + * if the mojo is not run as part of a site generation. + * + * @return The path to the output directory as specified in the plugin configuration for this report. + */ + protected abstract String getOutputDirectory(); + + /** + * @return the Maven project instance. + */ + protected abstract MavenProject getProject(); + + /** + * Execute the generation of the report. + * + * @param locale the wanted locale to return the report's description, could be null. + * @throws MavenReportException if any + */ + protected abstract void executeReport( Locale locale ) + throws MavenReportException; } diff -Nru maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java --- maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java 2009-07-18 18:23:50.000000000 +0000 +++ maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java 2010-05-09 20:17:20.000000000 +0000 @@ -39,7 +39,7 @@ * @author Jason van Zyl * @author Emmanuel Venisse * @author Vincent Siveton - * @version $Id: AbstractMavenReportRenderer.java 748481 2009-02-27 10:51:56Z vsiveton $ + * @version $Id: AbstractMavenReportRenderer.java 942606 2010-05-09 20:17:20Z hboutemy $ * @since 2.0 * @TODO Later it may be appropriate to create something like a VelocityMavenReportRenderer * that could take a velocity template and pipe that through Doxia rather than coding them @@ -113,9 +113,6 @@ { section = section + 1; - sink.anchor( HtmlTools.encodeId( name ) ); - sink.anchor_(); - switch ( section ) { case 1: @@ -168,6 +165,9 @@ // TODO: warning - just don't start a section break; } + + sink.anchor( HtmlTools.encodeId( name ) ); + sink.anchor_(); } /** @@ -224,7 +224,23 @@ */ protected void startTable() { + startTable( new int[] {Sink.JUSTIFY_LEFT}, false ); + } + + /** + * Convenience method to wrap the table start in the current sink. + * + * @param justification the justification of table cells. + * @param grid whether to draw a grid around cells. + * + * @see Sink#table() + * @see Sink#tableRows(int[],boolean) + * @since 2.1 + */ + protected void startTable( int[] justification, boolean grid ) + { sink.table(); + sink.tableRows( justification, grid ); } /** @@ -234,6 +250,7 @@ */ protected void endTable() { + sink.tableRows_(); sink.table_(); } @@ -603,9 +620,9 @@ String[] schemes = {"http", "https"}; UrlValidator urlValidator = new UrlValidator( schemes ); - if ( ( EmailValidator.getInstance().isValid( href ) ) || - ( ( href.indexOf( "?" ) != -1 ) && - ( EmailValidator.getInstance().isValid( href.substring( 0, href.indexOf( "?" ) ) ) ) ) ) + if ( ( EmailValidator.getInstance().isValid( href ) ) + || ( ( href.indexOf( "?" ) != -1 ) + && ( EmailValidator.getInstance().isValid( href.substring( 0, href.indexOf( "?" ) ) ) ) ) ) { return "mailto:" + href; } @@ -638,7 +655,7 @@ { if ( href.length() > 2 ) { - return href.substring(2, href.length() ); + return href.substring( 2, href.length() ); } return "."; diff -Nru maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java --- maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java 2010-05-03 23:07:20.000000000 +0000 @@ -0,0 +1,37 @@ +package org.apache.maven.reporting; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.sink.SinkFactory; + +import java.util.Locale; + +/** + * Temporary copy of maven-reporting-api class to avoid + * Maven 3 prerequisite, since maven-reporting-api is included + * in Maven 2 then internal version is preferred. + */ +public interface MavenMultiPageReport + extends MavenReport +{ + void generate( Sink sink, SinkFactory sinkFactory, Locale locale ) + throws MavenReportException; +} diff -Nru maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java --- maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java 2009-05-02 22:17:09.000000000 +0000 +++ maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/sink/MultiPageSink.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,752 +0,0 @@ -package org.apache.maven.reporting.sink; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.doxia.sink.SinkAdapter; -import org.apache.maven.doxia.sink.Sink; - -/** - * @author Emmanuel Venisse - * - */ -public class MultiPageSink - extends SinkAdapter -{ - private String outputName; - - private Sink sink; - - public MultiPageSink( String outputName, Sink sink ) - { - this.outputName = outputName; - this.sink = sink; - } - - public String getOutputName() - { - return outputName; - } - - public Sink getEmbeddedSink() - { - return sink; - } - - public void closeSink() - { - sink.body_(); - sink.flush(); - sink.close(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#anchor_() - */ - public void anchor_() - { - sink.anchor_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#anchor(java.lang.String) - */ - public void anchor( String arg0 ) - { - sink.anchor( arg0 ); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#author_() - */ - public void author_() - { - sink.author_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#author() - */ - public void author() - { - sink.author(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#body() - */ - public void body() - { - sink.body(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#body_() - */ - public void body_() - { - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#bold_() - */ - public void bold_() - { - sink.bold_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#bold() - */ - public void bold() - { - sink.bold(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#close() - */ - public void close() - { - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#date_() - */ - public void date_() - { - sink.date_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#date() - */ - public void date() - { - sink.date(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#definedTerm_() - */ - public void definedTerm_() - { - sink.definedTerm_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#definedTerm() - */ - public void definedTerm() - { - sink.definedTerm(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#definition_() - */ - public void definition_() - { - sink.definition_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#definition() - */ - public void definition() - { - sink.definition(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#definitionList_() - */ - public void definitionList_() - { - sink.definitionList_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#definitionList() - */ - public void definitionList() - { - sink.definitionList(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#definitionListItem_() - */ - public void definitionListItem_() - { - sink.definitionListItem_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#definitionListItem() - */ - public void definitionListItem() - { - sink.definitionListItem(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#figure_() - */ - public void figure_() - { - sink.figure_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#figure() - */ - public void figure() - { - sink.figure(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#figureCaption_() - */ - public void figureCaption_() - { - sink.figureCaption_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#figureCaption() - */ - public void figureCaption() - { - sink.figureCaption(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#figureGraphics(java.lang.String) - */ - public void figureGraphics( String arg0 ) - { - sink.figureGraphics( arg0 ); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#flush() - */ - public void flush() - { - sink.flush(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#head_() - */ - public void head_() - { - sink.head_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#head() - */ - public void head() - { - sink.head(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#horizontalRule() - */ - public void horizontalRule() - { - sink.horizontalRule(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#italic_() - */ - public void italic_() - { - sink.italic_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#italic() - */ - public void italic() - { - sink.italic(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#lineBreak() - */ - public void lineBreak() - { - sink.lineBreak(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#link_() - */ - public void link_() - { - sink.link_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#link(java.lang.String) - */ - public void link( String arg0 ) - { - sink.link( arg0 ); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#list_() - */ - public void list_() - { - sink.list_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#list() - */ - public void list() - { - sink.list(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#listItem_() - */ - public void listItem_() - { - sink.listItem_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#listItem() - */ - public void listItem() - { - sink.listItem(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#monospaced_() - */ - public void monospaced_() - { - sink.monospaced_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#monospaced() - */ - public void monospaced() - { - sink.monospaced(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#nonBreakingSpace() - */ - public void nonBreakingSpace() - { - sink.nonBreakingSpace(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#numberedList_() - */ - public void numberedList_() - { - sink.numberedList_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#numberedList(int) - */ - public void numberedList( int arg0 ) - { - sink.numberedList( arg0 ); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#numberedListItem_() - */ - public void numberedListItem_() - { - sink.numberedListItem_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#numberedListItem() - */ - public void numberedListItem() - { - sink.numberedListItem(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#pageBreak() - */ - public void pageBreak() - { - sink.pageBreak(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#paragraph_() - */ - public void paragraph_() - { - sink.paragraph_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#paragraph() - */ - public void paragraph() - { - sink.paragraph(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#rawText(java.lang.String) - */ - public void rawText( String arg0 ) - { - sink.rawText( arg0 ); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section1_() - */ - public void section1_() - { - sink.section1_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section1() - */ - public void section1() - { - sink.section1(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section2_() - */ - public void section2_() - { - sink.section2_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section2() - */ - public void section2() - { - sink.section2(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section3_() - */ - public void section3_() - { - sink.section3_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section3() - */ - public void section3() - { - sink.section3(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section4_() - */ - public void section4_() - { - sink.section4_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section4() - */ - public void section4() - { - sink.section4(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section5_() - */ - public void section5_() - { - sink.section5_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#section5() - */ - public void section5() - { - sink.section5(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle_() - */ - public void sectionTitle_() - { - sink.sectionTitle_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle() - */ - public void sectionTitle() - { - sink.sectionTitle(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle1_() - */ - public void sectionTitle1_() - { - sink.sectionTitle1_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle1() - */ - public void sectionTitle1() - { - sink.sectionTitle1(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle2_() - */ - public void sectionTitle2_() - { - sink.sectionTitle2_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle2() - */ - public void sectionTitle2() - { - sink.sectionTitle2(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle3_() - */ - public void sectionTitle3_() - { - sink.sectionTitle3_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle3() - */ - public void sectionTitle3() - { - sink.sectionTitle3(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle4_() - */ - public void sectionTitle4_() - { - sink.sectionTitle4_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle4() - */ - public void sectionTitle4() - { - sink.sectionTitle4(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle5_() - */ - public void sectionTitle5_() - { - sink.sectionTitle5_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#sectionTitle5() - */ - public void sectionTitle5() - { - sink.sectionTitle5(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#table_() - */ - public void table_() - { - sink.table_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#table() - */ - public void table() - { - sink.table(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableCaption_() - */ - public void tableCaption_() - { - sink.tableCaption_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableCaption() - */ - public void tableCaption() - { - sink.tableCaption(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableCell_() - */ - public void tableCell_() - { - sink.tableCell_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableCell() - */ - public void tableCell() - { - sink.tableCell(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableHeaderCell_() - */ - public void tableHeaderCell_() - { - sink.tableHeaderCell_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableHeaderCell() - */ - public void tableHeaderCell() - { - sink.tableHeaderCell(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableRow_() - */ - public void tableRow_() - { - sink.tableRow_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableRow() - */ - public void tableRow() - { - sink.tableRow(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableRows_() - */ - public void tableRows_() - { - sink.tableRows_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#tableRows(int[], boolean) - */ - public void tableRows( int[] arg0, boolean arg1 ) - { - sink.tableRows( arg0, arg1 ); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#text(java.lang.String) - */ - public void text( String arg0 ) - { - sink.text( arg0 ); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#title_() - */ - public void title_() - { - sink.title_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#title() - */ - public void title() - { - sink.title(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#verbatim_() - */ - public void verbatim_() - { - sink.verbatim_(); - } - - /** - * @see org.codehaus.doxia.module.xhtml.SinkAdapter#verbatim(boolean) - */ - public void verbatim( boolean arg0 ) - { - sink.verbatim( arg0 ); - } -} diff -Nru maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java --- maven-reporting-impl-2.0.4.2/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java 2009-05-02 22:17:09.000000000 +0000 +++ maven-reporting-impl-2.1/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -package org.apache.maven.reporting.sink; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; -import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.siterenderer.Renderer; -import org.apache.maven.doxia.siterenderer.RendererException; -import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; - -import java.io.File; -import java.io.IOException; - -/** - * @author Emmanuel Venisse - * @version $Id: MavenReport.java 163376 2005-02-23 00:06:06Z brett $ - */ -public class SinkFactory -{ - private String siteDirectory; - - private Renderer siteRenderer; - - public void setSiteRenderer( Renderer siteRenderer ) - { - this.siteRenderer = siteRenderer; - } - - public void setSiteDirectory( String siteDirectory ) - { - this.siteDirectory = siteDirectory; - } - - public Sink getSink( String outputFileName ) - throws RendererException, IOException - { - return createSink( new File( siteDirectory ), outputFileName ); - } - - public static SiteRendererSink createSink( File basedir, String document ) - { - return new SiteRendererSink( new RenderingContext( basedir, document ) ); - } -} diff -Nru maven-reporting-impl-2.0.4.2/src/site/apt/index.apt maven-reporting-impl-2.1/src/site/apt/index.apt --- maven-reporting-impl-2.0.4.2/src/site/apt/index.apt 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/src/site/apt/index.apt 2010-05-09 20:17:20.000000000 +0000 @@ -0,0 +1,21 @@ + ----- + Maven Reporting Implementation + ----- + Hervé Boutemy + ----- + 2010-05-09 + ----- + +Maven Reporting Implementation + + Abstract classes to manage report generation. + + Until Maven 2.0.4, <<>> was included in Maven 2 core distribution: version + used was completely driven by Maven version used. It was removed from Maven core starting with Maven 2.0.5 and + moved to shared components to improve fexibility: starting with Maven 2.0.5, each plugin can choose its + <<>> version independently from Maven. + + <<>> uses Doxia 1.0, then is used for reporting plugins wanting Maven 2.0.x compatibility. + + <<>> uses Doxia 1.1: using this version implies for a reporting plugin that it has Maven 2.1 + as prerequisite. diff -Nru maven-reporting-impl-2.0.4.2/src/site/site.xml maven-reporting-impl-2.1/src/site/site.xml --- maven-reporting-impl-2.0.4.2/src/site/site.xml 1970-01-01 00:00:00.000000000 +0000 +++ maven-reporting-impl-2.1/src/site/site.xml 2010-05-08 22:41:48.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + + + + + \ No newline at end of file