You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2010/05/24 14:52:55 UTC
svn commit: r947628 - in /uima/build/trunk:
parent-poms/parent-pom-docbook/pom.xml
uima-docbook-olink/src/main/docbook-olink/html/site.xml
uima-docbook-olink/src/main/docbook-olink/htmlsingle/site.xml
uima-docbook-olink/src/main/docbook-olink/pdf/site.xml
Author: schor
Date: Mon May 24 12:52:55 2010
New Revision: 947628
URL: http://svn.apache.org/viewvc?rev=947628&view=rev
Log:
[UIMA-1790] update olink site info for docbook output in to target/site/d
Modified:
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml
uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/htmlsingle/site.xml
uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/pdf/site.xml
Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=947628&r1=947627&r2=947628&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Mon May 24 12:52:55 2010
@@ -300,7 +300,6 @@
<version>2.0.10</version>
<configuration> <!-- general configuration for both html and pdf -->
<sourceDirectory>${basedir}/src/docbook</sourceDirectory>
- <targetDirectory>${project.build.directory}/site/d</targetDirectory>
<includes>${bookNameRoot}.xml</includes>
<highlightSource>1</highlightSource>
<xincludeSupported>true</xincludeSupported>
@@ -315,6 +314,7 @@
</goals>
<phase>package</phase>
<configuration>
+ <targetDirectory>${project.build.directory}/site/d</targetDirectory>
<htmlCustomization>${project.build.directory}/docbook-shared/top/html-single.xsl</htmlCustomization>
<!-- olink -->
<targetDatabaseDocument>file:///${dolUnzipped}/htmlsingle/site.xml</targetDatabaseDocument>
@@ -326,6 +326,10 @@
<goals><goal>generate-pdf</goal></goals>
<phase>package</phase>
<configuration>
+ <!-- pdf: generate first in docbkx, then move.
+ because pdf generates an extra temp file xxx.fo
+ which we want to keep a bit in target in case of debug need -->
+
<foCustomization>${project.build.directory}/docbook-shared/top/pdf.xsl</foCustomization>
<!-- olink -->
<targetDatabaseDocument>file:///${dolUnzipped}/pdf/site.xml</targetDatabaseDocument>
@@ -427,7 +431,7 @@
<goals><goal>copy-resources</goal></goals>
<phase>package</phase>
<configuration>
- <outputDirectory>${project.build.directory}/docbkx/html/images</outputDirectory>
+ <outputDirectory>${project.build.directory}/site/d/images</outputDirectory>
<resources>
<resource><directory>src/docbook/images</directory></resource>
</resources>
@@ -439,13 +443,27 @@
<goals><goal>copy-resources</goal></goals>
<phase>package</phase>
<configuration>
- <outputDirectory>${project.build.directory}/docbkx/html/css</outputDirectory>
+ <outputDirectory>${project.build.directory}/site/d/css</outputDirectory>
<resources>
<resource><directory>${project.build.directory}/docbook-shared/css</directory></resource>
</resources>
</configuration>
</execution>
-
+ <!-- move the pdf from the docbkx to the site/d/ -->
+ <execution>
+ <id>docbook-move-pdf</id>
+ <goals><goal>copy-resources</goal></goals> <!-- no "move" goal, use copy -->
+ <phase>package</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/site/d</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/docbkx/pdf</directory>
+ <excludes><exclude>**.fo</exclude></excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Modified: uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml?rev=947628&r1=947627&r2=947628&view=diff
==============================================================================
--- uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml (original)
+++ uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/html/site.xml Mon May 24 12:52:55 2010
@@ -29,27 +29,42 @@ under the License.
<targetsetinfo>UIMA books olinks</targetsetinfo>
<!-- Site map for generating relative paths between documents -->
+ <!--
+ base-url
+ artifactId
+ d
+ xxx.html
+ xxx.pdf
+ -->
<sitemap>
- <dir name="target">
- <dir name="overview_and_setup">
- <document targetdoc="&uima_docs_overview;">
- &otarget_overview;
- </document>
+ <dir name="commonTop_ValueIgnored">
+ <dir name="uima-docbook-overview-and-setup">
+ <dir name="d">
+ <document targetdoc="&uima_docs_overview;">
+ &otarget_overview;
+ </document>
+ </dir>
</dir>
- <dir name="tutorials_and_users_guides">
- <document targetdoc="&uima_docs_tutorial_guides;">
- &otarget_tug;
- </document>
+ <dir name="uima-docbook-tutorials-and-users-guides">
+ <dir name="d">
+ <document targetdoc="&uima_docs_tutorial_guides;">
+ &otarget_tug;
+ </document>
+ </dir>
</dir>
- <dir name="tools">
- <document targetdoc="&uima_docs_tools;">
- &otarget_tools;
- </document>
+ <dir name="uima-docbook-tools">
+ <dir name="d">
+ <document targetdoc="&uima_docs_tools;">
+ &otarget_tools;
+ </document>
+ </dir>
</dir>
- <dir name="references">
- <document targetdoc="&uima_docs_ref;">
- &otarget_refs;
- </document>
+ <dir name="uima-docbook-references">
+ <dir name="d">
+ <document targetdoc="&uima_docs_ref;">
+ &otarget_refs;
+ </document>
+ </dir>
</dir>
</dir>
</sitemap>
Modified: uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/htmlsingle/site.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/htmlsingle/site.xml?rev=947628&r1=947627&r2=947628&view=diff
==============================================================================
--- uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/htmlsingle/site.xml (original)
+++ uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/htmlsingle/site.xml Mon May 24 12:52:55 2010
@@ -29,31 +29,49 @@ under the License.
<targetsetinfo>UIMA books olinks</targetsetinfo>
<!-- Site map for generating relative paths between documents -->
+ <!--
+ base-url
+ bookname
+ d
+ xxx.html
+ xxx.pdf
+
+
+
+ -->
<sitemap>
- <dir name="target">
- <dir name="overview_and_setup">
- <document targetdoc="&uima_docs_overview;"
- baseuri="overview_and_setup.html">
- &otarget_overview;
- </document>
+ <dir name="commonTop_ValueIgnored">
+ <dir name="uima-docbook-overview-and-setup">
+ <dir name="d">
+ <document targetdoc="&uima_docs_overview;"
+ baseuri="overview_and_setup.html">
+ &otarget_overview;
+ </document>
+ </dir>
</dir>
- <dir name="tutorials_and_users_guides">
- <document targetdoc="&uima_docs_tutorial_guides;"
- baseuri="tutorials_and_users_guides.html">
- &otarget_tug;
- </document>
+ <dir name="uima-docbook-tutorials-and-users-guides">
+ <dir name="d">
+ <document targetdoc="&uima_docs_tutorial_guides;"
+ baseuri="tutorials_and_users_guides.html">
+ &otarget_tug;
+ </document>
+ </dir>
</dir>
- <dir name="tools">
- <document targetdoc="&uima_docs_tools;"
- baseuri="tools.html">
- &otarget_tools;
- </document>
+ <dir name="uima-docbook-tools">
+ <dir name="d">
+ <document targetdoc="&uima_docs_tools;"
+ baseuri="tools.html">
+ &otarget_tools;
+ </document>
+ </dir>
</dir>
- <dir name="references">
- <document targetdoc="&uima_docs_ref;"
- baseuri="references.html">
- &otarget_refs;
- </document>
+ <dir name="uima-docbook-references">
+ <dir name="d">
+ <document targetdoc="&uima_docs_ref;"
+ baseuri="references.html">
+ &otarget_refs;
+ </document>
+ </dir>
</dir>
</dir>
</sitemap>
Modified: uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/pdf/site.xml
URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/pdf/site.xml?rev=947628&r1=947627&r2=947628&view=diff
==============================================================================
--- uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/pdf/site.xml (original)
+++ uima/build/trunk/uima-docbook-olink/src/main/docbook-olink/pdf/site.xml Mon May 24 12:52:55 2010
@@ -31,29 +31,37 @@ under the License.
<!-- Site map for generating relative paths between documents -->
<sitemap>
<dir name="target">
- <dir name="overview_and_setup">
- <document targetdoc="&uima_docs_overview;"
- baseuri="overview_and_setup.pdf">
- &otarget_overview;
- </document>
+ <dir name="uima-docbook-overview-and-setup">
+ <dir name="d">
+ <document targetdoc="&uima_docs_overview;"
+ baseuri="overview_and_setup.pdf">
+ &otarget_overview;
+ </document>
+ </dir>
</dir>
- <dir name="tutorials_and_users_guides">
- <document targetdoc="&uima_docs_tutorial_guides;"
- baseuri="tutorials_and_users_guides.pdf">
- &otarget_tug;
- </document>
+ <dir name="uima-docbook-tutorials-and-users-guides">
+ <dir name="d">
+ <document targetdoc="&uima_docs_tutorial_guides;"
+ baseuri="tutorials_and_users_guides.pdf">
+ &otarget_tug;
+ </document>
+ </dir>
</dir>
- <dir name="tools">
- <document targetdoc="&uima_docs_tools;"
- baseuri="tools.pdf">
- &otarget_tools;
- </document>
+ <dir name="uima-docbook-tools">
+ <dir name="d">
+ <document targetdoc="&uima_docs_tools;"
+ baseuri="tools.pdf">
+ &otarget_tools;
+ </document>
+ </dir>
</dir>
- <dir name="references">
- <document targetdoc="&uima_docs_ref;"
- baseuri="references.pdf">
- &otarget_refs;
- </document>
+ <dir name="uima-docbook-references">
+ <dir name="d">
+ <document targetdoc="&uima_docs_ref;"
+ baseuri="references.pdf">
+ &otarget_refs;
+ </document>
+ </dir>
</dir>
</dir>
</sitemap>