Author: drazzib
Date: 2010-04-05 12:26:06 +0000 (Mon, 05 Apr 2010)
New Revision: 11994
Added:
trunk/uimaj/debian/patches/disable_ecore.diff
trunk/uimaj/debian/patches/docbook_tool.diff
trunk/uimaj/debian/uima-doc.doc-base.api
trunk/uimaj/debian/uima-doc.doc-base.overview
trunk/uimaj/debian/uima-doc.doc-base.ref
trunk/uimaj/debian/uima-doc.doc-base.tools
trunk/uimaj/debian/uima-doc.doc-base.tutorials
trunk/uimaj/debian/uima-doc.links
trunk/uimaj/debian/uima-examples.poms
Modified:
trunk/uimaj/debian/TODO
trunk/uimaj/debian/control
trunk/uimaj/debian/libuima-core-java.poms
trunk/uimaj/debian/patches/modules.diff
trunk/uimaj/debian/patches/script.diff
trunk/uimaj/debian/patches/series
trunk/uimaj/debian/rules
trunk/uimaj/debian/uima-doc.install
Log:
Finally build DocBooks !
Modified: trunk/uimaj/debian/TODO
===================================================================
--- trunk/uimaj/debian/TODO 2010-04-05 12:03:38 UTC (rev 11993)
+++ trunk/uimaj/debian/TODO 2010-04-05 12:26:06 UTC (rev 11994)
@@ -1,14 +1,13 @@
-- Do full source code review (org.tar.gz)
+- Do full source code review (orig.tar.gz)
Remove ./uima-docbook-tool/tools/common-lib/*.jar
Remove ./uimaj-eclipse-update-site/features/*.jar
Review copyright and licence
- Build-Depends: Upload fixed maven2/libmaven2-core (plugins version)
-- Build-Depends: Upload geronimo-activation-1.1-spec (NEW)
- Or switch to libgnujaf-java ?
-- Enable uimaj-examples module. Need:
- 1) org.eclipse.emf:common:jar:2.1.0
- 2) org.eclipse.emf:ecore:jar:2.1.0
- 3) org.eclipse.emf:ecore-xmi:jar:2.1.0
- Update manpages
- Check .desktop files with FreeDesktop and Debian Policy compliance
-- Build and install documentation reference (from docbook)
+- Install essentials descriptors inside uima-examples
+ others inside uima-docs
+- PEAR components inside /usr/share/uima/components/
+- Allow /usr/local/share/uima/components/ and
+ $HOME/.uima/components/ as alternative install dirs
+ for components
Modified: trunk/uimaj/debian/control
===================================================================
--- trunk/uimaj/debian/control 2010-04-05 12:03:38 UTC (rev 11993)
+++ trunk/uimaj/debian/control 2010-04-05 12:26:06 UTC (rev 11994)
@@ -7,7 +7,8 @@
libmaven2-core-java (>> 2.2.1-1), maven2 (>> 2.2.1-2)
Build-Depends-Indep: junit, ant, ant-contrib, libaxis-java,
libcommons-io-java, liblog4j1.2-java,
libgeronimo-activation-1.1-spec-java, default-jdk-doc,
libmaven-javadoc-plugin-java, libmaven-site-plugin-java,
- docbook-xsl, xsltproc
+ libxml-commons-resolver1.1-java, libxerces2-java, libjaxp1.3-java,
+ docbook-xml, docbook-xsl, xsltproc, libsaxon-java, fop
Standards-Version: 3.8.4
Homepage: http://incubator.apache.org/uima/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/uimaj/
Modified: trunk/uimaj/debian/libuima-core-java.poms
===================================================================
--- trunk/uimaj/debian/libuima-core-java.poms 2010-04-05 12:03:38 UTC (rev
11993)
+++ trunk/uimaj/debian/libuima-core-java.poms 2010-04-05 12:26:06 UTC (rev
11994)
@@ -1,5 +1,4 @@
uimaj/pom.xml
-uimaj-distr/pom.xml --no-parent
uimaj-core/pom.xml
uimaj-test-util/pom.xml
uimaj-component-test-util/pom.xml
Added: trunk/uimaj/debian/patches/disable_ecore.diff
===================================================================
--- trunk/uimaj/debian/patches/disable_ecore.diff
(rev 0)
+++ trunk/uimaj/debian/patches/disable_ecore.diff 2010-04-05 12:26:06 UTC
(rev 11994)
@@ -0,0 +1,43 @@
+Description: uima-examples: disable ecore (Eclipse EMF)
+ by using "excludes" parameter of maven-compiler-plugin
+Author: Damien Raude-Morvan <[email protected]>
+Last-Update: 2010-04-05
+Forwared: not-needed
+--- a/uimaj-examples/pom.xml
++++ b/uimaj-examples/pom.xml
+@@ -67,7 +67,8 @@
+ <artifactId>uimaj-tools</artifactId>
+ <version>${uimaj-release-version}</version>
+ <scope>compile</scope>
+- </dependency>
++ </dependency>
++<!--
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>common</artifactId>
+@@ -86,8 +87,23 @@
+ <version>2.1.0</version>
+ <scope>provided</scope>
+ </dependency>
++-->
+ </dependencies>
+ <build>
+ <finalName>uima-examples</finalName>
++
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <configuration>
++ <source>1.5</source>
++ <target>1.5</target>
++ <excludes>
++
<exclude>**/org/apache/uima/examples/xmi/**.java</exclude>
++ </excludes>
++ </configuration>
++ </plugin>
++ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
Added: trunk/uimaj/debian/patches/docbook_tool.diff
===================================================================
--- trunk/uimaj/debian/patches/docbook_tool.diff
(rev 0)
+++ trunk/uimaj/debian/patches/docbook_tool.diff 2010-04-05 12:26:06 UTC
(rev 11994)
@@ -0,0 +1,141 @@
+Description: uima-docbooks & tools: fix classpath and
+ use system wide fop / saxon / docbook-xsl
+Author: Damien Raude-Morvan <[email protected]>
+Last-Update: 2010-04-05
+Forwarded: not-needed
+--- a/uima-docbook-tool/build/build-docbook.xml
++++ b/uima-docbook-tool/build/build-docbook.xml
+@@ -91,8 +91,8 @@
+
+ <property name="docbook.tools.lib.dir"
value="${docbook.tool.project}/tools/common-lib"/>
+ <property name="docbook.ref.dir"
value="${docbook.tool.project}/tools/docbook-versions"/>
+- <property name="docbook.xsl.dir"
value="${docbook.ref.dir}/docbook-xsl-${docbook.xsl.version}"/>
+- <property name="docbook.xml.dir"
value="${docbook.ref.dir}/docbook-xml-${docbook.xml.version}"/>
++ <property name="docbook.xsl.dir"
value="/usr/share/xml/docbook/stylesheet/docbook-xsl/"/>
++ <property name="docbook.xml.dir"
value="/usr/share/xml/docbook/schema/dtd/4.5/"/>
+ <property name="saxon.dir"
+
value="${docbook.tool.project}/tools/saxon-versions/saxon-${saxon.version}"/>
+ <property name="fop.dir"
+@@ -114,17 +114,24 @@
+
+ <path id="saxon_and_fop.classpath">
+ <!-- xercesImpl.jar comes first to allow using XInclude
-->
+- <pathelement
location="${docbook.tools.lib.dir}/xercesImpl-2.7.1.jar"/>
+- <pathelement
location="${docbook.tools.lib.dir}/xml-apis-1.3.02.jar"/>
+- <fileset
dir="${docbook.tool.project}/tools/fop-versions/fop-${fop.version}"
includes="*.jar"/>
+- <fileset dir="${saxon.dir}" includes="*.jar"/>
++ <pathelement location="/usr/share/java/xercesImpl.jar"/>
++ <pathelement location="/usr/share/java/xml-apis.jar"/>
++ <pathelement
location="/usr/share/java/xml-commons-resolver-1.1.jar"/>
++ <fileset dir="/usr/share/java/" includes="fop.jar"/>
++ <fileset dir="/usr/share/java/" includes="saxon.jar"/>
++ <!--
+ <fileset dir="${docbook.tools.lib.dir}"
includes="*.jar"/>
++ -->
+
++ <!--
+ <fileset dir="${docbook.xsl.dir}/extensions">
+ <include name="${xslt-db.jar}"/>
+ </fileset>
+-
++ -->
++
++ <!--
+ <fileset dir="${jai.dir}" includes="*.jar"/>
++ -->
+
+ <!-- Needed to find CatalogManager.properties -->
+ <pathelement
+@@ -151,8 +158,7 @@
+ <!-- ==
== -->
+ <!--
=========================================================================== -->
+ <target name="prepare" depends="setup-common-properties-per-build,
setup-availables,
+- make-temp-dir, test-saxon-available, test-docbook-available,
+- test-fop-available, test-jai-available">
++ make-temp-dir">
+ </target>
+
+ <target name="make-temp-dir">
+@@ -204,4 +210,4 @@
+ </copy>
+
+ </target>
+-</project>
+\ No newline at end of file
++</project>
+--- a/uima-docbooks/src/styles/top/html-single.xsl
++++ b/uima-docbooks/src/styles/top/html-single.xsl
+@@ -28,7 +28,7 @@
+ and their href strings must be literal (no variables allowed) -->
+
+ <!-- import docbook system from the shared uima-docbook-tool project -->
+- <xsl:import
href="../../../../uima-docbook-tool/tools/docbook-versions/docbook-xsl-1.72.0/html/docbook.xsl"
/>
++ <xsl:import
href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl" />
+
+ <!-- import the standard uima-style of formatting from the shared
uima-docbook-tool project -->
+ <xsl:import
href="../../../../uima-docbook-tool/styles/uima-style/top/html-single.xsl" />
+--- a/uima-docbooks/src/styles/top/pdf.xsl
++++ b/uima-docbooks/src/styles/top/pdf.xsl
+@@ -28,7 +28,7 @@
+ and their href strings must be literal (no variables allowed) -->
+
+ <!-- import docbook system from the shared uima-docbook-tool project -->
+- <xsl:import
href="../../../../uima-docbook-tool/tools/docbook-versions/docbook-xsl-1.72.0/fo/docbook.xsl"
/>
++ <xsl:import
href="/usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl" />
+
+ <!-- import the standard uima-style of formatting from the shared
uima-docbook-tool project -->
+ <xsl:import
href="../../../../uima-docbook-tool/styles/uima-style/top/pdf.xsl" />
+--- a/uima-docbook-tool/catalog/docbook.version_4.5/xml-catalog.xml
++++ b/uima-docbook-tool/catalog/docbook.version_4.5/xml-catalog.xml
+@@ -27,18 +27,18 @@
+ <!-- Translate DocBook XML 4.5 system ids to local file names -->
+ <rewriteSystem
+ systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5/";
+- rewritePrefix="../../tools/docbook-versions/docbook-xml-4.5/"/>
++ rewritePrefix="/usr/share/xml/docbook/schema/dtd/4.5/"/>
+
+ <rewriteSystem
+ systemIdStartString="http://docbook.sourceforge.net/release/xsl/current/";
+- rewritePrefix="../../tools/docbook-versions/docbook-xsl-1.72.0/"/>
++ rewritePrefix="/usr/share/xml/docbook/stylesheet/docbook-xsl/"/>
+
+ <!-- Translate DocBook XML 4.5 public ids to local file names -->
+ <nextCatalog
+- catalog="../../tools/docbook-versions/docbook-xml-4.5/catalog.xml"/>
++ catalog="/usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+
+ <rewriteURI
+ uriStartString="http://docbook.sourceforge.net/release/xsl/current/";
+- rewritePrefix="../../tools/docbook-versions/docbook-xsl-1.72.0/"/>
++ rewritePrefix="/usr/share/xml/docbook/stylesheet/docbook-xsl/"/>
+
+ </catalog>
+--- a/uima-docbook-tool/build/process-one-book.xml
++++ b/uima-docbook-tool/build/process-one-book.xml
+@@ -125,14 +125,15 @@
+
+ <target name="fop_conditionally" description="internal - runs fop
conditionally"
+ unless="do_olinkdb_only">
+-
+- <java classname="${fop.main.class}" fork="true" maxmemory="256m"
+- dir="${target.dir.path}/${chapter_name}"
classpathref="saxon_and_fop.classpath">
++
++ <exec executable="/usr/bin/fop" dir="${target.dir.path}/${chapter_name}">
++<!--
+ <arg value="-c"/>
+ <arg value="${fop.config}"/>
++-->
+ <arg
value="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf_src.xml"/>
+ <arg value="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf"/>
+- </java>
++ </exec>
+
+ </target>
+
+@@ -235,4 +236,4 @@
+ </sequential>
+ </macrodef>
+
+-</project>
+\ No newline at end of file
++</project>
Modified: trunk/uimaj/debian/patches/modules.diff
===================================================================
--- trunk/uimaj/debian/patches/modules.diff 2010-04-05 12:03:38 UTC (rev
11993)
+++ trunk/uimaj/debian/patches/modules.diff 2010-04-05 12:26:06 UTC (rev
11994)
@@ -1,5 +1,4 @@
Description: Disable some modules:
- - uimaj-examples
- eclipse-plugin-superPom
- distr-superPom
Author: Damien Raude-Morvan <[email protected]>
@@ -7,14 +6,7 @@
Forwarded: not-needed
--- a/uimaj/pom.xml
+++ b/uimaj/pom.xml
-@@ -599,15 +599,12 @@
- <modules>
- <module>../uimaj-core</module>
- <module>../uimaj-cpe</module>
-- <module>../uimaj-examples</module>
- <module>../uimaj-tools</module>
- <module>../uimaj-adapter-vinci</module>
- <module>../uimaj-adapter-soap</module>
+@@ -606,8 +606,6 @@
<module>../uimaj-test-util</module>
<module>../uimaj-component-test-util</module>
<module>../jVinci</module>
@@ -23,7 +15,7 @@
<module>../uimaj-document-annotation</module>
<module>../PearPackagingMavenPlugin</module>
<!-- the internal tools project is not part of any release
-@@ -640,4 +637,4 @@
+@@ -640,4 +638,4 @@
</snapshots>
</repository>
</repositories>
Modified: trunk/uimaj/debian/patches/script.diff
===================================================================
--- trunk/uimaj/debian/patches/script.diff 2010-04-05 12:03:38 UTC (rev
11993)
+++ trunk/uimaj/debian/patches/script.diff 2010-04-05 12:26:06 UTC (rev
11994)
@@ -1,4 +1,4 @@
-Description: Set default UIMA_HOME=/usr/share/uima/
+Description: Set default UIMA_HOME=/usr/share/uima/ in scripts
Author: Damien Raude-Morvan <[email protected]>
Last-Update: 2010-03-21
Forwarded: not-needed
Modified: trunk/uimaj/debian/patches/series
===================================================================
--- trunk/uimaj/debian/patches/series 2010-04-05 12:03:38 UTC (rev 11993)
+++ trunk/uimaj/debian/patches/series 2010-04-05 12:26:06 UTC (rev 11994)
@@ -4,3 +4,5 @@
maven_rat_plugin_disable.diff
maven_buildnumber_plugin_disable.diff
maven_antrun_plugin_disable.diff
+disable_ecore.diff
+docbook_tool.diff
Modified: trunk/uimaj/debian/rules
===================================================================
--- trunk/uimaj/debian/rules 2010-04-05 12:03:38 UTC (rev 11993)
+++ trunk/uimaj/debian/rules 2010-04-05 12:26:06 UTC (rev 11994)
@@ -12,6 +12,7 @@
# Use uimaj/pom.xml for build
DEB_BUILDDIR := uimaj
+DEB_COMPRESS_EXCLUDE := .pdf
JAVA_HOME := /usr/lib/jvm/default-java
# Enough memory to aggregate Javadoc
JAVA_OPTS += -Xmx512m
@@ -50,6 +51,9 @@
-rm -rf debian/tmp
-rm $(UIMA_MANPAGES)
+build/uima-doc::
+ (cd uima-docbooks/; ant -f build.xml)
+
binary-install/libuima-vinci-java::
mh_installpoms -plibuima-vinci-java -e$(VERSION)
mh_installjar -plibuima-vinci-java -e$(VERSION) -l jVinci/pom.xml
jVinci/target/jVinci.jar
@@ -82,6 +86,10 @@
mh_installjar -plibuima-tools-java -e$(VERSION) -l
uimaj-bootstrap/pom.xml uimaj-bootstrap/target/uimaj-bootstrap-$(VERSION).jar
mh_installjar -plibuima-tools-java -e$(VERSION) -l
PearPackagingMavenPlugin/pom.xml
PearPackagingMavenPlugin/target/uima-pear-maven-plugin.jar
+binary-install/uima-examples::
+ mh_installpoms -puima-examples -e$(VERSION)
+ mh_installjar -puima-examples -e$(VERSION) -l uimaj-examples/pom.xml
uimaj-examples/target/uima-examples.jar
+
binary-install/uima-utils::
# Remove suffixes on binaries
mv debian/uima-utils/usr/bin/annotationViewer.sh
debian/uima-utils/usr/bin/annotationViewer
Added: trunk/uimaj/debian/uima-doc.doc-base.api
===================================================================
--- trunk/uimaj/debian/uima-doc.doc-base.api (rev 0)
+++ trunk/uimaj/debian/uima-doc.doc-base.api 2010-04-05 12:26:06 UTC (rev
11994)
@@ -0,0 +1,10 @@
+Document: uima-api
+Title: API JavaDoc for UIMA Java SDK
+Author: Apache Software Foundation
+Abstract: Javadocs programmer API of UIMA Java SDK
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/uima/api/index.html
+Files: /usr/share/doc/uima/api/*.html
+
Added: trunk/uimaj/debian/uima-doc.doc-base.overview
===================================================================
--- trunk/uimaj/debian/uima-doc.doc-base.overview
(rev 0)
+++ trunk/uimaj/debian/uima-doc.doc-base.overview 2010-04-05 12:26:06 UTC
(rev 11994)
@@ -0,0 +1,12 @@
+Document: uima-overview
+Title: Overview and Setup for UIMA Java SDK
+Author: Apache Software Foundation
+Abstract: Overview and Setup for UIMA Java SDK
+Section: Science/Data Analysis
+
+Format: HTML
+Index: /usr/share/doc/uima/manuals/overview_and_setup/overview_and_setup.html
+Files: /usr/share/doc/uima/manuals/overview_and_setup/overview_and_setup.html
+
+Format: PDF
+Files: /usr/share/doc/uima/manuals/overview_and_setup/overview_and_setup.pdf
Added: trunk/uimaj/debian/uima-doc.doc-base.ref
===================================================================
--- trunk/uimaj/debian/uima-doc.doc-base.ref (rev 0)
+++ trunk/uimaj/debian/uima-doc.doc-base.ref 2010-04-05 12:26:06 UTC (rev
11994)
@@ -0,0 +1,12 @@
+Document: uima-ref
+Title: Reference for UIMA Java SDK
+Author: Apache Software Foundation
+Abstract: Reference for UIMA Java SDK
+Section: Science/Data Analysis
+
+Format: HTML
+Index: /usr/share/doc/uima/manuals/references/references.html
+Files: /usr/share/doc/uima/manuals/references/references.html
+
+Format: PDF
+Files: /usr/share/doc/uima/manuals/references/references.pdf
Added: trunk/uimaj/debian/uima-doc.doc-base.tools
===================================================================
--- trunk/uimaj/debian/uima-doc.doc-base.tools (rev 0)
+++ trunk/uimaj/debian/uima-doc.doc-base.tools 2010-04-05 12:26:06 UTC (rev
11994)
@@ -0,0 +1,12 @@
+Document: uima-tools
+Title: Tools for UIMA Java SDK
+Author: Apache Software Foundation
+Abstract: Tools guide for UIMA Java SDK
+Section: Science/Data Analysis
+
+Format: HTML
+Index: /usr/share/doc/uima/manuals/tools/tools.html
+Files: /usr/share/doc/uima/manuals/tools/tools.html
+
+Format: PDF
+Files: /usr/share/doc/uima/manuals/tools/tools.pdf
Added: trunk/uimaj/debian/uima-doc.doc-base.tutorials
===================================================================
--- trunk/uimaj/debian/uima-doc.doc-base.tutorials
(rev 0)
+++ trunk/uimaj/debian/uima-doc.doc-base.tutorials 2010-04-05 12:26:06 UTC
(rev 11994)
@@ -0,0 +1,12 @@
+Document: uima-tutorials
+Title: Tutorials and Users Guide for UIMA Java SDK
+Author: Apache Software Foundation
+Abstract: Tutorials and Users Guide for UIMA Java SDK
+Section: Science/Data Analysis
+
+Format: HTML
+Index:
/usr/share/doc/uima/manuals/tutorials_and_users_guides/tutorials_and_users_guides.html
+Files:
/usr/share/doc/uima/manuals/tutorials_and_users_guides/tutorials_and_users_guides.html
+
+Format: PDF
+Files:
/usr/share/doc/uima/manuals/tutorials_and_users_guides/tutorials_and_users_guides.pdf
Modified: trunk/uimaj/debian/uima-doc.install
===================================================================
--- trunk/uimaj/debian/uima-doc.install 2010-04-05 12:03:38 UTC (rev 11993)
+++ trunk/uimaj/debian/uima-doc.install 2010-04-05 12:26:06 UTC (rev 11994)
@@ -1 +1,18 @@
-uimaj/target/site/apidocs/* /usr/share/doc/uima/api/
+# Install Javadoc HTML
+uimaj/target/site/apidocs/* /usr/share/doc/uima/api/
+# Copy common files
+uima-docbook-tool/styles/uima-style/css/ /usr/share/doc/uima/manuals/
+uima-docbooks/target/images /usr/share/doc/uima/manuals/
+uima-docbooks/target/index.html
/usr/share/doc/uima/manuals/
+# overview_and_setup
+uima-docbooks/target/overview_and_setup/*.html
/usr/share/doc/uima/manuals/overview_and_setup/
+uima-docbooks/target/overview_and_setup/*.pdf
/usr/share/doc/uima/manuals/overview_and_setup/
+# references
+uima-docbooks/target/references/*.html
/usr/share/doc/uima/manuals/references/
+uima-docbooks/target/references/*.pdf
/usr/share/doc/uima/manuals/references/
+# tools
+uima-docbooks/target/tools/*.html
/usr/share/doc/uima/manuals/tools/
+uima-docbooks/target/tools/*.pdf
/usr/share/doc/uima/manuals/tools/
+# tutorials_and_users_guides
+uima-docbooks/target/tutorials_and_users_guides/*.html
/usr/share/doc/uima/manuals/tutorials_and_users_guides/
+uima-docbooks/target/tutorials_and_users_guides/*.pdf
/usr/share/doc/uima/manuals/tutorials_and_users_guides/
Added: trunk/uimaj/debian/uima-doc.links
===================================================================
--- trunk/uimaj/debian/uima-doc.links (rev 0)
+++ trunk/uimaj/debian/uima-doc.links 2010-04-05 12:26:06 UTC (rev 11994)
@@ -0,0 +1,4 @@
+/usr/share/doc/uima/manuals/css
/usr/share/doc/uima/manuals/overview_and_setup/css
+/usr/share/doc/uima/manuals/css
/usr/share/doc/uima/manuals/references/css
+/usr/share/doc/uima/manuals/css
/usr/share/doc/uima/manuals/tools/css
+/usr/share/doc/uima/manuals/css
/usr/share/doc/uima/manuals/tutorials_and_users_guides/css
Added: trunk/uimaj/debian/uima-examples.poms
===================================================================
--- trunk/uimaj/debian/uima-examples.poms (rev 0)
+++ trunk/uimaj/debian/uima-examples.poms 2010-04-05 12:26:06 UTC (rev
11994)
@@ -0,0 +1 @@
+uimaj-examples/pom.xml
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
