[pkg-java] r8905 - in trunk/doxia/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Mon Jul 6 21:47:12 UTC 2009
Author: ludovicc-guest
Date: 2009-07-06 21:47:11 +0000 (Mon, 06 Jul 2009)
New Revision: 8905
Added:
trunk/doxia/debian/doxia-book-components.xml
trunk/doxia/debian/doxia-core-components.xml
trunk/doxia/debian/doxia-module-apt-components.xml
trunk/doxia/debian/doxia-module-confluence-components.xml
trunk/doxia/debian/doxia-module-docbook-simple-components.xml
trunk/doxia/debian/doxia-module-fml-components.xml
trunk/doxia/debian/doxia-module-fo-components.xml
trunk/doxia/debian/doxia-module-itext-components.xml
trunk/doxia/debian/doxia-module-latex-components.xml
trunk/doxia/debian/doxia-module-rtf-components.xml
trunk/doxia/debian/doxia-module-twiki-components.xml
trunk/doxia/debian/doxia-module-xdoc-components.xml
trunk/doxia/debian/doxia-module-xhtml-components.xml
trunk/doxia/debian/libdoxia-java.poms
trunk/doxia/debian/maven.rules
trunk/doxia/debian/patches/dependencies.patch
Removed:
trunk/doxia/debian/patches/itext.diff
Modified:
trunk/doxia/debian/build.properties
trunk/doxia/debian/build.xml
trunk/doxia/debian/changelog
trunk/doxia/debian/control
trunk/doxia/debian/copyright
trunk/doxia/debian/orig-tar.sh
trunk/doxia/debian/patches/series
trunk/doxia/debian/rules
Log:
* New version
Modified: trunk/doxia/debian/build.properties
===================================================================
--- trunk/doxia/debian/build.properties 2009-07-06 21:43:23 UTC (rev 8904)
+++ trunk/doxia/debian/build.properties 2009-07-06 21:47:11 UTC (rev 8905)
@@ -1,7 +1,15 @@
javadoc.dir=build/api
+maven.test.skip=true
classpath.compile = \
+ ${basedir}/doxia-logging-api/build/doxia-logging-api-${version}.jar:\
${basedir}/doxia-sink-api/build/doxia-sink-api-${version}.jar:\
${basedir}/doxia-core/build/doxia-core-${version}.jar:\
+ ${basedir}/doxia-modules/doxia-module-apt/build/doxia-module-apt-${version}.jar:\
+ ${basedir}/doxia-modules/doxia-module-docbook-simple/build/doxia-module-docbook-simple-${version}.jar:\
+ ${basedir}/doxia-modules/doxia-module-itext/build/doxia-module-itext-${version}.jar:\
+ ${basedir}/doxia-modules/doxia-module-latex/build/doxia-module-latex-${version}.jar:\
+ ${basedir}/doxia-modules/doxia-module-xdoc/build/doxia-module-xdoc-${version}.jar:\
+ ${basedir}/doxia-modules/doxia-module-xhtml/build/doxia-module-xhtml-${version}.jar:\
/usr/share/java/plexus-container-default.jar:\
/usr/share/java/plexus-i18n.jar:\
/usr/share/java/plexus-utils.jar:\
@@ -9,5 +17,10 @@
/usr/share/java/velocity.jar:\
/usr/share/java/modello-core.jar:\
/usr/share/java/modello-plugin-xml.jar:\
+ /usr/share/java/modello-plugin-xpp3.jar:\
+ /usr/share/java/modello-plugin-xsd.jar:\
/usr/share/java/maven-ant-helper.jar:\
- /usr/share/java/itext.jar
+ /usr/share/java/commons-configuration.jar:\
+ /usr/share/java/commons-lang.jar:\
+ /usr/share/java/fop.jar:\
+ /usr/share/java/itext1.jar
Modified: trunk/doxia/debian/build.xml
===================================================================
--- trunk/doxia/debian/build.xml 2009-07-06 21:43:23 UTC (rev 8904)
+++ trunk/doxia/debian/build.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -3,104 +3,97 @@
<project name="pkg-java" default="package" basedir="..">
<property file="debian/build.properties"/>
- <property name="maven.test.skip" value="true"/>
- <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+ <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="${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"/>
+ <sequential>
+ <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
<target name="clean">
- <ant target="clean" antfile="${maven.build.xml}" dir="."/>
- <ant target="clean" antfile="${maven.build.xml}" dir="doxia-sink-api"/>
- <ant target="clean" antfile="${maven.build.xml}" dir="doxia-core"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-apt"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-confluence"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-docbook-simple"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-fml"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-itext"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-latex"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-rtf"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-twiki"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-xdoc"/>
- <ant target="clean" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-xhtml"/>
+ <delete dir="build"/>
+ <cleanmodule dir="doxia-logging-api"/>
+ <cleanmodule dir="doxia-logging-api"/>
+ <cleanmodule dir="doxia-sink-api"/>
+ <cleanmodule dir="doxia-core"/>
+ <cleanmodule dir="doxia-book"/>
+ <cleanmodule dir="doxia-modules/doxia-module-apt"/>
+ <cleanmodule dir="doxia-modules/doxia-module-confluence"/>
+ <cleanmodule dir="doxia-modules/doxia-module-docbook-simple"/>
+ <cleanmodule dir="doxia-modules/doxia-module-fml"/>
+ <cleanmodule dir="doxia-modules/doxia-module-fo"/>
+ <cleanmodule dir="doxia-modules/doxia-module-itext"/>
+ <cleanmodule dir="doxia-modules/doxia-module-latex"/>
+ <cleanmodule dir="doxia-modules/doxia-module-rtf"/>
+ <cleanmodule dir="doxia-modules/doxia-module-twiki"/>
+ <cleanmodule dir="doxia-modules/doxia-module-xdoc"/>
+ <cleanmodule dir="doxia-modules/doxia-module-xhtml"/>
</target>
<target name="generate-sources">
<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="doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo" plugin="java" output="doxia-modules/doxia-module-fml/build/generated-sources" version="1.0.0"/>
+ <modello model="doxia-core/src/main/mdo/document.mdo" plugin="java" output="doxia-core/build/generated-sources" version="1.0.0"/>
+ <modello model="doxia-core/src/main/mdo/document.mdo" plugin="xpp3-reader" output="doxia-core/build/generated-sources" version="1.0.0"/>
+ <modello model="doxia-core/src/main/mdo/document.mdo" plugin="xpp3-writer" output="doxia-core/build/generated-sources" version="1.0.0"/>
+ <modello model="doxia-core/src/main/mdo/document.mdo" plugin="xsd" output="doxia-core/build/generated-sources" version="1.0.0"/>
+ <modello model="doxia-book/src/main/modello/book.mdo" plugin="java" output="doxia-book/build/generated-sources" version="1.0.0"/>
+ <modello model="doxia-book/src/main/modello/book.mdo" plugin="xpp3-reader" output="doxia-book/build/generated-sources" version="1.0.0"/>
+ <modello model="doxia-book/src/main/modello/book.mdo" plugin="xsd" output="doxia-book/build/generated-sources" version="1.0.0"/>
+ <modello model="doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo" plugin="java" output="doxia-modules/doxia-module-fml/build/generated-sources" version="1.0.0"/>
</target>
<target name="package" depends="generate-sources">
- <ant target="package" antfile="${maven.build.xml}" dir="doxia-sink-api">
- <property name="artifactId" value="doxia-sink-api"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}" dir="doxia-core">
- <property name="artifactId" value="doxia-core"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-apt">
- <property name="artifactId" value="doxia-module-apt"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-confluence">
- <property name="artifactId" value="doxia-module-confluence"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-docbook-simple">
- <property name="artifactId" value="doxia-module-docbook-simple"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-fml">
- <property name="artifactId" value="doxia-module-fml"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-itext">
- <property name="artifactId" value="doxia-module-itext"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-latex">
- <property name="artifactId" value="doxia-module-latex"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-rtf">
- <property name="artifactId" value="doxia-module-rtf"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-twiki">
- <property name="artifactId" value="doxia-module-twiki"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-xdoc">
- <property name="artifactId" value="doxia-module-xdoc"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}"
- dir="doxia-modules/doxia-module-xhtml">
- <property name="artifactId" value="doxia-module-xhtml"/>
- </ant>
+ <packagemodule dir=""/>
+ <packagemodule dir="doxia-logging-api"/>
+ <packagemodule dir="doxia-sink-api"/>
+ <packagemodule dir="doxia-core"/>
+ <packagemodule dir="doxia-modules/doxia-module-apt"/>
+ <packagemodule dir="doxia-modules/doxia-module-confluence"/>
+ <packagemodule dir="doxia-modules/doxia-module-docbook-simple"/>
+ <packagemodule dir="doxia-modules/doxia-module-fml"/>
+ <packagemodule dir="doxia-modules/doxia-module-fo"/>
+ <packagemodule dir="doxia-modules/doxia-module-itext"/>
+ <packagemodule dir="doxia-modules/doxia-module-latex"/>
+ <packagemodule dir="doxia-modules/doxia-module-rtf"/>
+ <packagemodule dir="doxia-modules/doxia-module-twiki"/>
+ <packagemodule dir="doxia-modules/doxia-module-xdoc"/>
+ <packagemodule dir="doxia-modules/doxia-module-xhtml"/>
+ <packagemodule dir="doxia-book"/>
</target>
<target name="javadoc">
<javadoc destdir="${javadoc.dir}">
- <packageset dir="doxia-sink-api/src/main/java/"/>
<packageset dir="doxia-core/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-apt/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-confluence/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-docbook-simple/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-fml/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-itext/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-latex/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-rtf/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-twiki/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-xdoc/src/main/java/"/>
- <packageset dir="doxia-modules/doxia-module-xhtml/src/main/java/"/>
+ <packageset dir="doxia-book/src/main/java/"/>
+ <packageset dir="doxia-logging-api/src/main/java/"/>
+ <packageset dir="doxia-sink-api/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-apt/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-confluence/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-docbook-simple/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-fml/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-fo/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-itext/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-latex/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-rtf/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-twiki/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-xdoc/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-xhtml/src/main/java/"/>
</javadoc>
</target>
Modified: trunk/doxia/debian/changelog
===================================================================
--- trunk/doxia/debian/changelog 2009-07-06 21:43:23 UTC (rev 8904)
+++ trunk/doxia/debian/changelog 2009-07-06 21:47:11 UTC (rev 8905)
@@ -1,3 +1,23 @@
+doxia (1.1-1) unstable; urgency=low
+
+ * New upstream version, add myself to uploaders
+ * Add the Maven POMs to the package,
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Remove the patch itext.diff, use a dependency on libitext1-java
+ instead to keep using version 1.x of iText.
+ * Add a dependency on fop and libcommons-configuration-java to build the new
+ doxia-module-fo
+ * Remove the dependency on libplexus-container-default-java, it's replaced
+ by a transitive dependency on libplexus-containers-java (from
+ libplexus-i18n-java)
+ * Remove the dependency on classpath-doc on the java-doc package,
+ it's not needed
+ * Remove full text of the Apache 2.0 license from debian/copyright
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Mon, 06 Jul 2009 22:51:54 +0100
+
doxia (1.0-alpha-11-4) unstable; urgency=low
* Change debian/rules to really use default-jdk. (Closes: #535919)
Modified: trunk/doxia/debian/control
===================================================================
--- trunk/doxia/debian/control 2009-07-06 21:43:23 UTC (rev 8904)
+++ trunk/doxia/debian/control 2009-07-06 21:47:11 UTC (rev 8905)
@@ -2,9 +2,13 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstol <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
-Build-Depends-Indep: default-jdk, ant-optional, libxalan2-java, libbcpg-java, libbcpg-java-doc, libbcprov-java, libbcprov-java-doc, classpath-doc, libcommons-cli-java, libwagon-java, libplexus-i18n-java, libplexus-velocity-java, libmodello-java, velocity, maven-ant-helper, libitext-java
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), quilt
+Uploaders: Trygve Laugstol <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>,
+ Torsten Werner <twerner at debian.org>
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ libmodello-java,
+ libplexus-containers-java, libplexus-utils-java, libplexus-i18n-java, libxerces2-java,
+ libcommons-configuration-java, fop, liblog4j1.2-java, libjaxp1.3-java, libitext1-java
+Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk, quilt
Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia
@@ -12,7 +16,8 @@
Package: libdoxia-java
Architecture: all
-Depends: libplexus-utils-java, velocity, libplexus-container-default-java, libplexus-velocity-java, ${misc:Depends}
+Depends: ${misc:Depends}, libplexus-containers-java, libplexus-utils-java, libplexus-i18n-java, libxerces2-java
+Recommends: libcommons-configuration-java, fop, liblog4j1.2-java, libjaxp1.3-java, libitext1-java
Suggests: libdoxia-java-doc
Description: a powerful content generation framework
Doxia is a content generation framework which aims to provide its users
@@ -29,7 +34,7 @@
Package: libdoxia-java-doc
Architecture: all
Section: doc
-Depends: classpath-doc, ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: libdoxia-java
Description: a powerful content generation framework
Doxia is a content generation framework which aims to provide its users
Modified: trunk/doxia/debian/copyright
===================================================================
--- trunk/doxia/debian/copyright 2009-07-06 21:43:23 UTC (rev 8904)
+++ trunk/doxia/debian/copyright 2009-07-06 21:47:11 UTC (rev 8905)
@@ -8,7 +8,7 @@
'/usr/share/common-licenses/GPL-2'.
-plexus-velocity was downloaded from
+Doxia was downloaded from
http://maven.apache.org/doxia/
Upstream Authors:
@@ -67,207 +67,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-/*
- * Apache License
- * Version 2.0, January 2004
- * http://www.apache.org/licenses/
- *
- * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- * 1. Definitions.
- *
- * "License" shall mean the terms and conditions for use, reproduction,
- * and distribution as defined by Sections 1 through 9 of this document.
- *
- * "Licensor" shall mean the copyright owner or entity authorized by
- * the copyright owner that is granting the License.
- *
- * "Legal Entity" shall mean the union of the acting entity and all
- * other entities that control, are controlled by, or are under common
- * control with that entity. For the purposes of this definition,
- * "control" means (i) the power, direct or indirect, to cause the
- * direction or management of such entity, whether by contract or
- * otherwise, or (ii) ownership of fifty percent (50%) or more of the
- * outstanding shares, or (iii) beneficial ownership of such entity.
- *
- * "You" (or "Your") shall mean an individual or Legal Entity
- * exercising permissions granted by this License.
- *
- * "Source" form shall mean the preferred form for making modifications,
- * including but not limited to software source code, documentation
- * source, and configuration files.
- *
- * "Object" form shall mean any form resulting from mechanical
- * transformation or translation of a Source form, including but
- * not limited to compiled object code, generated documentation,
- * and conversions to other media types.
- *
- * "Work" shall mean the work of authorship, whether in Source or
- * Object form, made available under the License, as indicated by a
- * copyright notice that is included in or attached to the work
- * (an example is provided in the Appendix below).
- *
- * "Derivative Works" shall mean any work, whether in Source or Object
- * form, that is based on (or derived from) the Work and for which the
- * editorial revisions, annotations, elaborations, or other modifications
- * represent, as a whole, an original work of authorship. For the purposes
- * of this License, Derivative Works shall not include works that remain
- * separable from, or merely link (or bind by name) to the interfaces of,
- * the Work and Derivative Works thereof.
- *
- * "Contribution" shall mean any work of authorship, including
- * the original version of the Work and any modifications or additions
- * to that Work or Derivative Works thereof, that is intentionally
- * submitted to Licensor for inclusion in the Work by the copyright owner
- * or by an individual or Legal Entity authorized to submit on behalf of
- * the copyright owner. For the purposes of this definition, "submitted"
- * means any form of electronic, verbal, or written communication sent
- * to the Licensor or its representatives, including but not limited to
- * communication on electronic mailing lists, source code control systems,
- * and issue tracking systems that are managed by, or on behalf of, the
- * Licensor for the purpose of discussing and improving the Work, but
- * excluding communication that is conspicuously marked or otherwise
- * designated in writing by the copyright owner as "Not a Contribution."
- *
- * "Contributor" shall mean Licensor and any individual or Legal Entity
- * on behalf of whom a Contribution has been received by Licensor and
- * subsequently incorporated within the Work.
- *
- * 2. Grant of Copyright License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * copyright license to reproduce, prepare Derivative Works of,
- * publicly display, publicly perform, sublicense, and distribute the
- * Work and such Derivative Works in Source or Object form.
- *
- * 3. Grant of Patent License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * (except as stated in this section) patent license to make, have made,
- * use, offer to sell, sell, import, and otherwise transfer the Work,
- * where such license applies only to those patent claims licensable
- * by such Contributor that are necessarily infringed by their
- * Contribution(s) alone or by combination of their Contribution(s)
- * with the Work to which such Contribution(s) was submitted. If You
- * institute patent litigation against any entity (including a
- * cross-claim or counterclaim in a lawsuit) alleging that the Work
- * or a Contribution incorporated within the Work constitutes direct
- * or contributory patent infringement, then any patent licenses
- * granted to You under this License for that Work shall terminate
- * as of the date such litigation is filed.
- *
- * 4. Redistribution. You may reproduce and distribute copies of the
- * Work or Derivative Works thereof in any medium, with or without
- * modifications, and in Source or Object form, provided that You
- * meet the following conditions:
- *
- * (a) You must give any other recipients of the Work or
- * Derivative Works a copy of this License; and
- *
- * (b) You must cause any modified files to carry prominent notices
- * stating that You changed the files; and
- *
- * (c) You must retain, in the Source form of any Derivative Works
- * that You distribute, all copyright, patent, trademark, and
- * attribution notices from the Source form of the Work,
- * excluding those notices that do not pertain to any part of
- * the Derivative Works; and
- *
- * (d) If the Work includes a "NOTICE" text file as part of its
- * distribution, then any Derivative Works that You distribute must
- * include a readable copy of the attribution notices contained
- * within such NOTICE file, excluding those notices that do not
- * pertain to any part of the Derivative Works, in at least one
- * of the following places: within a NOTICE text file distributed
- * as part of the Derivative Works; within the Source form or
- * documentation, if provided along with the Derivative Works; or,
- * within a display generated by the Derivative Works, if and
- * wherever such third-party notices normally appear. The contents
- * of the NOTICE file are for informational purposes only and
- * do not modify the License. You may add Your own attribution
- * notices within Derivative Works that You distribute, alongside
- * or as an addendum to the NOTICE text from the Work, provided
- * that such additional attribution notices cannot be construed
- * as modifying the License.
- *
- * You may add Your own copyright statement to Your modifications and
- * may provide additional or different license terms and conditions
- * for use, reproduction, or distribution of Your modifications, or
- * for any such Derivative Works as a whole, provided Your use,
- * reproduction, and distribution of the Work otherwise complies with
- * the conditions stated in this License.
- *
- * 5. Submission of Contributions. Unless You explicitly state otherwise,
- * any Contribution intentionally submitted for inclusion in the Work
- * by You to the Licensor shall be under the terms and conditions of
- * this License, without any additional terms or conditions.
- * Notwithstanding the above, nothing herein shall supersede or modify
- * the terms of any separate license agreement you may have executed
- * with Licensor regarding such Contributions.
- *
- * 6. Trademarks. This License does not grant permission to use the trade
- * names, trademarks, service marks, or product names of the Licensor,
- * except as required for reasonable and customary use in describing the
- * origin of the Work and reproducing the content of the NOTICE file.
- *
- * 7. Disclaimer of Warranty. Unless required by applicable law or
- * agreed to in writing, Licensor provides the Work (and each
- * Contributor provides its Contributions) on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied, including, without limitation, any warranties or conditions
- * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- * PARTICULAR PURPOSE. You are solely responsible for determining the
- * appropriateness of using or redistributing the Work and assume any
- * risks associated with Your exercise of permissions under this License.
- *
- * 8. Limitation of Liability. In no event and under no legal theory,
- * whether in tort (including negligence), contract, or otherwise,
- * unless required by applicable law (such as deliberate and grossly
- * negligent acts) or agreed to in writing, shall any Contributor be
- * liable to You for damages, including any direct, indirect, special,
- * incidental, or consequential damages of any character arising as a
- * result of this License or out of the use or inability to use the
- * Work (including but not limited to damages for loss of goodwill,
- * work stoppage, computer failure or malfunction, or any and all
- * other commercial damages or losses), even if such Contributor
- * has been advised of the possibility of such damages.
- *
- * 9. Accepting Warranty or Additional Liability. While redistributing
- * the Work or Derivative Works thereof, You may choose to offer,
- * and charge a fee for, acceptance of support, warranty, indemnity,
- * or other liability obligations and/or rights consistent with this
- * License. However, in accepting such obligations, You may act only
- * on Your own behalf and on Your sole responsibility, not on behalf
- * of any other Contributor, and only if You agree to indemnify,
- * defend, and hold each Contributor harmless for any liability
- * incurred by, or claims asserted against, such Contributor by reason
- * of your accepting any such warranty or additional liability.
- *
- * END OF TERMS AND CONDITIONS
- *
- * APPENDIX: How to apply the Apache License to your work.
- *
- * To apply the Apache License to your work, attach the following
- * boilerplate notice, with the fields enclosed by brackets "[]"
- * replaced with your own identifying information. (Don't include
- * the brackets!) The text should be enclosed in the appropriate
- * comment syntax for the file format. We also recommend that a
- * file or class name and description of purpose be included on the
- * same "printed page" as the copyright notice for easier
- * identification within third-party archives.
- *
- * Copyright [yyyy] [name of copyright owner]
- *
- * 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
Added: trunk/doxia/debian/doxia-book-components.xml
===================================================================
--- trunk/doxia/debian/doxia-book-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-book-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,130 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
+ <role-hint>rtf</role-hint>
+ <implementation>org.apache.maven.doxia.book.services.renderer.RtfBookRenderer</implementation>
+ <description>RTF book renderer with the <code>iText</code> framework.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.Doxia</role>
+ <field-name>doxia</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
+ <role-hint>pdf</role-hint>
+ <implementation>org.apache.maven.doxia.book.services.renderer.PdfBookRenderer</implementation>
+ <description>PDF book renderer with the <code>iText</code> framework.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.Doxia</role>
+ <field-name>doxia</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
+ <role-hint>xhtml</role-hint>
+ <implementation>org.apache.maven.doxia.book.services.renderer.XHtmlBookRenderer</implementation>
+ <description><p>XHtmlBookRenderer class.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.Doxia</role>
+ <field-name>doxia</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
+ <role-hint>doc-book</role-hint>
+ <implementation>org.apache.maven.doxia.book.services.renderer.DocbookBookRenderer</implementation>
+ <description>An implementation of <code>BookRenderer</code> for docbook</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.Doxia</role>
+ <field-name>doxia</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
+ <role-hint>xdoc</role-hint>
+ <implementation>org.apache.maven.doxia.book.services.renderer.XdocBookRenderer</implementation>
+ <description>An implementation of <code>BookRenderer</code> for Xdoc</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.Doxia</role>
+ <field-name>doxia</field-name>
+ </requirement>
+ <requirement>
+ <role>org.codehaus.plexus.i18n.I18N</role>
+ <field-name>i18n</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
+ <role-hint>latex</role-hint>
+ <implementation>org.apache.maven.doxia.book.services.renderer.LatexBookRenderer</implementation>
+ <description><p>LatexBookRenderer class.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.Doxia</role>
+ <field-name>doxia</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.book.services.validation.BookValidator</role>
+ <implementation>org.apache.maven.doxia.book.services.validation.DefaultBookValidator</implementation>
+ <description>Default implementation of BookValidator.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.book.services.io.BookIo</role>
+ <implementation>org.apache.maven.doxia.book.services.io.DefaultBookIo</implementation>
+ <description><p>DefaultBookIo class.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.module.site.manager.SiteModuleManager</role>
+ <field-name>siteModuleManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.book.services.indexer.BookIndexer</role>
+ <implementation>org.apache.maven.doxia.book.services.indexer.DefaultBookIndexer</implementation>
+ <description>Default implementation of BookIndexer.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.Doxia</role>
+ <field-name>doxia</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.book.BookDoxia</role>
+ <implementation>org.apache.maven.doxia.book.DefaultBookDoxia</implementation>
+ <description>Default implementation of BookDoxia.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.book.services.io.BookIo</role>
+ <field-name>bookIo</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.doxia.book.services.validation.BookValidator</role>
+ <field-name>bookValidator</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.doxia.book.services.indexer.BookIndexer</role>
+ <field-name>bookIndexer</field-name>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
+ <field-name>bookRenderers</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-core-components.xml
===================================================================
--- trunk/doxia/debian/doxia-core-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-core-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,73 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.parser.manager.ParserManager</role>
+ <implementation>org.apache.maven.doxia.parser.manager.DefaultParserManager</implementation>
+ <description>Simple implementation of the <code>ParserManager</code> interface.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <field-name>parsers</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.module.site.manager.SiteModuleManager</role>
+ <implementation>org.apache.maven.doxia.module.site.manager.DefaultSiteModuleManager</implementation>
+ <description>Simple implementation of the SiteModuleManager interface.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.module.site.SiteModule</role>
+ <field-name>siteModules</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.macro.Macro</role>
+ <role-hint>echo</role-hint>
+ <implementation>org.apache.maven.doxia.macro.EchoMacro</implementation>
+ <description>A simple macro that prints out the key and value of some supplied parameters.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.macro.Macro</role>
+ <role-hint>snippet</role-hint>
+ <implementation>org.apache.maven.doxia.macro.snippet.SnippetMacro</implementation>
+ <description>A macro that prints out the content of a file or a URL.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.macro.Macro</role>
+ <role-hint>swf</role-hint>
+ <implementation>org.apache.maven.doxia.macro.SwfMacro</implementation>
+ <description>Macro for embedding Flash (SWF) within Maven documentation.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.macro.manager.MacroManager</role>
+ <implementation>org.apache.maven.doxia.macro.manager.DefaultMacroManager</implementation>
+ <description>Default implementation of <code>MacroManager</code></description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.macro.Macro</role>
+ <field-name>macros</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.macro.Macro</role>
+ <role-hint>toc</role-hint>
+ <implementation>org.apache.maven.doxia.macro.toc.TocMacro</implementation>
+ <description>Macro to display a <code>Table Of Content</code> in a given <code>Sink</code>.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.Doxia</role>
+ <implementation>org.apache.maven.doxia.DefaultDoxia</implementation>
+ <description>Simple implementation of the Doxia interface:
+uses a ParserManager to lookup a parser.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.parser.manager.ParserManager</role>
+ <field-name>parserManager</field-name>
+ </requirement>
+ </requirements>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-apt-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-apt-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-apt-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>apt</role-hint>
+ <implementation>org.apache.maven.doxia.module.apt.AptParser</implementation>
+ <description>The APT parser.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.macro.manager.MacroManager</role>
+ <field-name>macroManager</field-name>
+ </requirement>
+ </requirements></component>
+ <component>
+ <role>org.apache.maven.doxia.module.site.SiteModule</role>
+ <role-hint>apt</role-hint>
+ <implementation>org.apache.maven.doxia.module.apt.AptSiteModule</implementation>
+ <description><p>AptSiteModule class.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>apt</role-hint>
+ <implementation>org.apache.maven.doxia.module.apt.AptSinkFactory</implementation>
+ <description>APT implementation of the Sink factory.</description>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-confluence-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-confluence-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-confluence-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,22 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>confluence</role-hint>
+ <implementation>org.apache.maven.doxia.module.confluence.ConfluenceParser</implementation>
+ <description>Parse the <a href="http://www.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.module.site.SiteModule</role>
+ <role-hint>confluence</role-hint>
+ <implementation>org.apache.maven.doxia.module.confluence.ConfluenceSiteModule</implementation>
+ <description><p>ConfluenceSiteModule class.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>confluence</role-hint>
+ <implementation>org.apache.maven.doxia.module.confluence.ConfluenceSinkFactory</implementation>
+ <description>Confluence implementation of the Sink factory.</description>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-docbook-simple-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-docbook-simple-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-docbook-simple-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.module.site.SiteModule</role>
+ <role-hint>docbook</role-hint>
+ <implementation>org.apache.maven.doxia.module.docbook.DocBookSiteModule</implementation>
+ <description><p>DocBookSiteModule class.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>docbook</role-hint>
+ <implementation>org.apache.maven.doxia.module.docbook.DocBookParser</implementation>
+ <description>Parse a <a href="http://www.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>docbook</role-hint>
+ <implementation>org.apache.maven.doxia.module.docbook.DocbookSinkFactory</implementation>
+ <description>Docbook implementation of the Sink factory.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>doc-book</role-hint>
+ <implementation>org.apache.maven.doxia.module.docbook.DocBookParser</implementation>
+ <description>Parse a <code>Docbook</code> document and emit events into the specified doxia
+ Sink.</description>
+ </component><component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>doc-book</role-hint>
+ <implementation>org.apache.maven.doxia.module.docbook.DocbookSinkFactory</implementation>
+ <description>Docbook implementation of the Sink factory.</description>
+ </component><component>
+ <role>org.apache.maven.doxia.module.site.SiteModule</role>
+ <role-hint>doc-book</role-hint>
+ <implementation>org.apache.maven.doxia.module.docbook.DocBookSiteModule</implementation>
+ <description />
+ </component></components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-fml-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-fml-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-fml-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,16 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.module.site.SiteModule</role>
+ <role-hint>fml</role-hint>
+ <implementation>org.apache.maven.doxia.module.fml.FmlSiteModule</implementation>
+ <description><p>FmlSiteModule class.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>fml</role-hint>
+ <implementation>org.apache.maven.doxia.module.fml.FmlParser</implementation>
+ <description>Parse a fml model and emit events into the specified doxia Sink.</description>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-fo-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-fo-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-fo-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,10 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>fo</role-hint>
+ <implementation>org.apache.maven.doxia.module.fo.FoSinkFactory</implementation>
+ <description>FO implementation of the Sink factory.</description>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-itext-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-itext-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-itext-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,10 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>itext</role-hint>
+ <implementation>org.apache.maven.doxia.module.itext.ITextSinkFactory</implementation>
+ <description>IText implementation of the Sink factory.</description>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-latex-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-latex-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-latex-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,10 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>latex</role-hint>
+ <implementation>org.apache.maven.doxia.module.latex.LatexSinkFactory</implementation>
+ <description>Latex implementation of the Sink factory.</description>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-rtf-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-rtf-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-rtf-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,10 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>rtf</role-hint>
+ <implementation>org.apache.maven.doxia.module.rtf.RtfSinkFactory</implementation>
+ <description>Rtf implementation of the Sink factory.</description>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-twiki-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-twiki-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-twiki-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,22 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.module.site.SiteModule</role>
+ <role-hint>twiki</role-hint>
+ <implementation>org.apache.maven.doxia.module.twiki.TWikiSiteModule</implementation>
+ <description>{@link org.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>twiki</role-hint>
+ <implementation>org.apache.maven.doxia.module.twiki.TWikiParser</implementation>
+ <description>Parse the <a href="http://twiki.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>twiki</role-hint>
+ <implementation>org.apache.maven.doxia.module.twiki.TWikiSinkFactory</implementation>
+ <description>TWiki implementation of the Sink factory.</description>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-xdoc-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-xdoc-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-xdoc-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.module.site.SiteModule</role>
+ <role-hint>xdoc</role-hint>
+ <implementation>org.apache.maven.doxia.module.xdoc.XdocSiteModule</implementation>
+ <description><p>XdocSiteModule class.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>xdoc</role-hint>
+ <implementation>org.apache.maven.doxia.module.xdoc.XdocSinkFactory</implementation>
+ <description>Xdoc implementation of the Sink factory.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>xdoc</role-hint>
+ <implementation>org.apache.maven.doxia.module.xdoc.XdocParser</implementation>
+ <description>Parse an xdoc model and emit events into the specified doxia Sink.</description>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.doxia.macro.manager.MacroManager</role>
+ <field-name>macroManager</field-name>
+ </requirement>
+ </requirements></component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/doxia-module-xhtml-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-xhtml-components.xml (rev 0)
+++ trunk/doxia/debian/doxia-module-xhtml-components.xml 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,22 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.doxia.sink.SinkFactory</role>
+ <role-hint>xhtml</role-hint>
+ <implementation>org.apache.maven.doxia.module.xhtml.XhtmlSinkFactory</implementation>
+ <description>Xhtml implementation of the Sink factory.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.parser.Parser</role>
+ <role-hint>xhtml</role-hint>
+ <implementation>org.apache.maven.doxia.module.xhtml.XhtmlParser</implementation>
+ <description>Parse an xhtml model and emit events into a Doxia Sink.</description>
+ </component>
+ <component>
+ <role>org.apache.maven.doxia.module.site.SiteModule</role>
+ <role-hint>xhtml</role-hint>
+ <implementation>org.apache.maven.doxia.module.xhtml.XhtmlSiteModule</implementation>
+ <description><p>XhtmlSiteModule class.</description>
+ </component>
+ </components>
+</component-set>
Added: trunk/doxia/debian/libdoxia-java.poms
===================================================================
--- trunk/doxia/debian/libdoxia-java.poms (rev 0)
+++ trunk/doxia/debian/libdoxia-java.poms 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,18 @@
+pom.xml --no-parent
+doxia-core/pom.xml
+doxia-book/pom.xml
+doxia-logging-api/pom.xml
+doxia-sink-api/pom.xml
+doxia-modules/pom.xml
+doxia-modules/doxia-module-apt/pom.xml
+doxia-modules/doxia-module-confluence/pom.xml
+doxia-modules/doxia-module-docbook-simple/pom.xml
+doxia-modules/doxia-module-fml/pom.xml
+doxia-modules/doxia-module-fo/pom.xml
+doxia-modules/doxia-module-itext/pom.xml
+doxia-modules/doxia-module-latex/pom.xml
+doxia-modules/doxia-module-rtf/pom.xml
+doxia-modules/doxia-module-twiki/pom.xml
+doxia-modules/doxia-module-xdoc/pom.xml
+doxia-modules/doxia-module-xhtml/pom.xml
+
Added: trunk/doxia/debian/maven.rules
===================================================================
--- trunk/doxia/debian/maven.rules (rev 0)
+++ trunk/doxia/debian/maven.rules 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,3 @@
+com.lowagie itext jar 1.4
+junit junit jar s/3\..*/3.x/
+log4j log4j jar s/1\.2\..*/1.2.x/
Modified: trunk/doxia/debian/orig-tar.sh
===================================================================
--- trunk/doxia/debian/orig-tar.sh 2009-07-06 21:43:23 UTC (rev 8904)
+++ trunk/doxia/debian/orig-tar.sh 2009-07-06 21:47:11 UTC (rev 8905)
@@ -5,6 +5,8 @@
TAG=doxia-$2
svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/$TAG $DIR
+# remove as it's packaged elsewhere
+rm -r $DIR/doxia-maven-plugin
tar -c -z -f $TAR $DIR
rm -rf $DIR ../$TAG
Added: trunk/doxia/debian/patches/dependencies.patch
===================================================================
--- trunk/doxia/debian/patches/dependencies.patch (rev 0)
+++ trunk/doxia/debian/patches/dependencies.patch 2009-07-06 21:47:11 UTC (rev 8905)
@@ -0,0 +1,14 @@
+--- a/doxia-modules/doxia-module-fo/pom.xml
++++ b/doxia-modules/doxia-module-fo/pom.xml
+@@ -71,11 +71,6 @@
+ <version>1.0.b2</version>
+ </dependency>
+ <dependency>
+- <groupId>xml-apis</groupId>
+- <artifactId>xmlParserAPIs</artifactId>
+- <version>2.0.2</version>
+- </dependency>
+- <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
Deleted: trunk/doxia/debian/patches/itext.diff
===================================================================
--- trunk/doxia/debian/patches/itext.diff 2009-07-06 21:43:23 UTC (rev 8904)
+++ trunk/doxia/debian/patches/itext.diff 2009-07-06 21:47:11 UTC (rev 8905)
@@ -1,153 +0,0 @@
-some fixes for iText 2 but there are still some FIXMEs
-http://jira.codehaus.org/browse/DOXIA-267
-
-Index: doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
-===================================================================
---- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java 2007-01-16 15:27:31.000000000 +0100
-+++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java 2008-11-28 16:46:06.000000000 +0100
-@@ -23,7 +23,7 @@
-
- import com.lowagie.text.Font;
- import com.lowagie.text.FontFactory;
--import com.lowagie.text.markup.MarkupTags;
-+import com.lowagie.text.html.Markup;
- import com.lowagie.text.pdf.DefaultFontMapper;
- import com.lowagie.text.pdf.FontMapper;
-
-@@ -38,16 +38,16 @@
- public class ITextFont
- {
- /** A normal font style */
-- public static final String NORMAL = MarkupTags.CSS_VALUE_NORMAL;
-+ public static final String NORMAL = Markup.CSS_VALUE_NORMAL;
-
- /** A bold font style */
-- public static final String BOLD = MarkupTags.CSS_VALUE_BOLD;
-+ public static final String BOLD = Markup.CSS_VALUE_BOLD;
-
- /** A italic font style */
-- public static final String ITALIC = MarkupTags.CSS_VALUE_ITALIC;
-+ public static final String ITALIC = Markup.CSS_VALUE_ITALIC;
-
- /** An underline font style */
-- public static final String UNDERLINE = MarkupTags.CSS_VALUE_UNDERLINE;
-+ public static final String UNDERLINE = Markup.CSS_VALUE_UNDERLINE;
-
- /** A default font name */
- public static final String DEFAULT_FONT_NAME = FontFactory.HELVETICA;
-@@ -258,7 +258,7 @@
- {
- Font font = getCurrentFont();
-
-- return String.valueOf( font.color().getBlue() );
-+ return String.valueOf( font.getColor().getBlue() );
- }
-
- /**
-@@ -270,7 +270,7 @@
- {
- Font font = getCurrentFont();
-
-- return String.valueOf( font.color().getGreen() );
-+ return String.valueOf( font.getColor().getGreen() );
- }
-
- /**
-@@ -282,7 +282,7 @@
- {
- Font font = getCurrentFont();
-
-- return String.valueOf( font.color().getRed() );
-+ return String.valueOf( font.getColor().getRed() );
- }
-
- /**
-Index: doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
-===================================================================
---- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java 2007-08-31 14:55:39.000000000 +0200
-+++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java 2008-11-28 16:46:06.000000000 +0100
-@@ -1172,9 +1172,9 @@
- try
- {
- Image image = Image.getInstance( new URL( urlName ) );
-- image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
-- width = image.plainWidth();
-- height = image.plainHeight();
-+ image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
-+ width = image.getPlainWidth();
-+ height = image.getPlainHeight();
- }
- catch ( BadElementException e )
- {
-Index: doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
-===================================================================
---- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java 2007-01-16 15:27:31.000000000 +0100
-+++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java 2008-11-28 16:48:14.000000000 +0100
-@@ -22,9 +22,11 @@
- import com.lowagie.text.DocumentException;
- import com.lowagie.text.PageSize;
- import com.lowagie.text.Rectangle;
-+/* FIXME: update for iText 2
- import com.lowagie.text.xml.XmlToHtml;
- import com.lowagie.text.xml.XmlToPdf;
- import com.lowagie.text.xml.XmlToRtf;
-+*/
-
- import java.io.InputStream;
- import java.io.OutputStream;
-@@ -68,7 +70,7 @@
- */
- public static String getPageSize( Rectangle rect )
- {
-- if ( ( rect.width() == PageSize.LETTER.width() ) && ( rect.height() == PageSize.LETTER.height() ) )
-+ if ( ( rect.getWidth() == PageSize.LETTER.getWidth() ) && ( rect.getHeight() == PageSize.LETTER.getHeight() ) )
- {
- return "LETTER";
- }
-@@ -111,6 +113,7 @@
- */
- public static void writePdf( InputStream is, OutputStream os )
- {
-+ /* FIXME: update for iText 2
- try
- {
- XmlToPdf x = new XmlToPdf();
-@@ -121,6 +124,7 @@
- {
- throw new RuntimeException( "DocumentException : " + e.getMessage() );
- }
-+ */
- }
-
- /**
-@@ -134,6 +138,7 @@
- */
- public static void writeRtf( InputStream is, OutputStream os )
- {
-+ /* FIXME: update for iText 2
- try
- {
- XmlToRtf x = new XmlToRtf();
-@@ -143,6 +148,7 @@
- {
- throw new RuntimeException( "DocumentException : " + e.getMessage() );
- }
-+ */
- }
-
- /**
-@@ -156,6 +162,7 @@
- */
- public static void writeHtml( InputStream is, OutputStream os )
- {
-+ /* FIXME: update for iText 2
- try
- {
- XmlToHtml x = new XmlToHtml();
-@@ -165,5 +172,6 @@
- {
- throw new RuntimeException( "DocumentException : " + e.getMessage() );
- }
-+ */
- }
- }
Modified: trunk/doxia/debian/patches/series
===================================================================
--- trunk/doxia/debian/patches/series 2009-07-06 21:43:23 UTC (rev 8904)
+++ trunk/doxia/debian/patches/series 2009-07-06 21:47:11 UTC (rev 8905)
@@ -1 +1 @@
-itext.diff
+dependencies.patch
Modified: trunk/doxia/debian/rules
===================================================================
--- trunk/doxia/debian/rules 2009-07-06 21:43:23 UTC (rev 8904)
+++ trunk/doxia/debian/rules 2009-07-06 21:47:11 UTC (rev 8905)
@@ -4,44 +4,52 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
+DEB_JARS := ant-nodeps
DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := ./debian/build.xml
-DEB_ANT_ARGS := -Dversion=$(VERSION)
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
API_DOCS := build/api
+CORE_LIBS := core book logging-api sink-api
+MODULES := apt confluence docbook-simple fml fo itext latex rtf twiki xdoc xhtml
get-orig-source:
- uscan --force-download
+ -uscan --download-version $(VERSION) --force-download --rename
+makebuilddir/lib$(PACKAGE)-java::
+ set -e; for COMPONENT in doxia-core doxia-book $(addprefix doxia-modules/doxia-module-, $(MODULES)); do \
+ COMPONENT_FILE=debian/$$(echo $$COMPONENT | cut -d'/' -f2 -)-components.xml; \
+ if [ -e $$COMPONENT_FILE ]; then \
+ install -d $$COMPONENT/build/classes/META-INF/plexus; \
+ install -m644 -T $$COMPONENT_FILE $$COMPONENT/build/classes/META-INF/plexus/components.xml; \
+ fi \
+ done
+
binary-post-install/lib$(PACKAGE)-java::
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-apt/build/$(PACKAGE)-module-apt-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-apt-$(VERSION).jar usr/share/java/$(PACKAGE)-module-apt.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-confluence/build/$(PACKAGE)-module-confluence-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-confluence-$(VERSION).jar usr/share/java/$(PACKAGE)-module-confluence.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-docbook-simple/build/$(PACKAGE)-module-docbook-simple-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-docbook-simple-$(VERSION).jar usr/share/java/$(PACKAGE)-module-docbook-simple.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-fml/build/$(PACKAGE)-module-fml-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-fml-$(VERSION).jar usr/share/java/$(PACKAGE)-module-fml.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-itext/build/$(PACKAGE)-module-itext-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-itext-$(VERSION).jar usr/share/java/$(PACKAGE)-module-itext.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-latex/build/$(PACKAGE)-module-latex-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-latex-$(VERSION).jar usr/share/java/$(PACKAGE)-module-latex.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-rtf/build/$(PACKAGE)-module-rtf-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-rtf-$(VERSION).jar usr/share/java/$(PACKAGE)-module-rtf.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-twiki/build/$(PACKAGE)-module-twiki-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-twiki-$(VERSION).jar usr/share/java/$(PACKAGE)-module-twiki.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-xdoc/build/$(PACKAGE)-module-xdoc-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-xdoc-$(VERSION).jar usr/share/java/$(PACKAGE)-module-xdoc.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-xhtml/build/$(PACKAGE)-module-xhtml-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-xhtml-$(VERSION).jar usr/share/java/$(PACKAGE)-module-xhtml.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-core/build/$(PACKAGE)-core-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-core-$(VERSION).jar usr/share/java/$(PACKAGE)-core.jar
- dh_install -plib$(PACKAGE)-java $(PACKAGE)-sink-api/build/$(PACKAGE)-sink-api-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-sink-api-$(VERSION).jar usr/share/java/$(PACKAGE)-sink-api.jar
+ mh_installpoms -plib$(PACKAGE)-java
+ set -e; for LIB in $(CORE_LIBS); do \
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=$(PACKAGE)-$$LIB $(PACKAGE)-$$LIB/pom.xml $(PACKAGE)-$$LIB/build/$(PACKAGE)-$$LIB-$(VERSION).jar; \
+ done
+ set -e; for MODULE in $(MODULES); do \
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=$(PACKAGE)-module-$$MODULE $(PACKAGE)-modules/doxia-module-$$MODULE/pom.xml $(PACKAGE)-modules/doxia-module-$$MODULE/build/$(PACKAGE)-module-$$MODULE-$(VERSION).jar; \
+ done
binary-post-install/lib$(PACKAGE)-java-doc::
dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
+
+clean::
+ -rm -rf debian/tmp
+
+# Extract plexus components.xml files generated from a standard Maven build
+PLEXUS_COMPONENTS=$(shell find . -name components.xml | grep "target/classes" | sed -re "s,.*/([a-z-]+)/target/.*,debian/\1-components.xml,")
+
+debian/%-components.xml:
+ # In $*
+ find . -type f -path *$*/target/classes/META-INF/plexus/components.xml -exec cp '{}' $@ \;
+ if [ -e $*/target/classes/META-INF/plexus/components.xml ]; then \
+ cp $*/target/classes/META-INF/plexus/components.xml $@; \
+ fi
+
+copy-plexus-components: $(PLEXUS_COMPONENTS)
More information about the pkg-java-commits
mailing list