SEC-540,SEC-541. Reorganized to get docbook to generate prior to the site with images correct for both pdf and html. Borrowed nuxeo project stylesheets.

This commit is contained in:
Luke Taylor 2007-09-04 23:59:25 +00:00
parent 0ee0084969
commit 6988be2ef2
13 changed files with 75 additions and 27 deletions

86
pom.xml
View File

@ -136,11 +136,6 @@
</organization>
<timezone>+10</timezone>
</developer>
<developer>
<name>Francois Beausoleil</name>
<id>fbos</id>
<email>fbos at users.sourceforge.net</email>
</developer>
<developer>
<name>Colin Sampaleanu</name>
<id>colins</id>
@ -155,7 +150,7 @@
<developer>
<name>Luke Taylor</name>
<id>luke_t</id>
<email>luke at monkeymachine.ltd.uk</email>
<email>luke_t at users.sourceforge.net</email>
<organization>
Monkey Machine Ltd. (http://monkeymachine.ltd.uk)
</organization>
@ -177,13 +172,9 @@
<email>markstg at users.sourceforge.net</email>
</developer>
<developer>
<name>Vishal Puri</name>
<id>vishalpuri</id>
<email>vishalpuri at users.sourceforge.net</email>
<organization>
Interface21 Pty Limited (http://www.interface21.com)
</organization>
<timezone>+10</timezone>
<name>John A. Lewis</name>
<id>johnalewis</id>
<email>johnalewis at users.sourceforge.net</email>
</developer>
</developers>
@ -197,6 +188,9 @@
<contributor>
<name>Patrick Burleson</name>
</contributor>
<contributor>
<name>Francois Beausoleil</name>
</contributor>
<contributor>
<name>Wesley Hall</name>
</contributor>
@ -236,6 +230,15 @@
<contributor>
<name>Robin Bramley</name>
</contributor>
<contributor>
<name>Robert Sanders</name>
</contributor>
<contributor>
<name>Vishal Puri</name>
</contributor>
<contributor>
<name>Martin Algesten</name>
</contributor>
</contributors>
<dependencies>
@ -386,6 +389,52 @@
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
<version>2.0.6</version>
<executions>
<execution>
<id>build-singlehtml-doc</id>
<phase>pre-site</phase>
<goals>
<goal>generate-html</goal>
</goals>
<configuration>
<sourceDirectory>${docbook.source}</sourceDirectory>
<targetDirectory>${docbook.target}</targetDirectory>
<inputs>springsecurity.xml</inputs>
<chunkedOutput>false</chunkedOutput>
<!--
<htmlStylesheet>css/spring-security-docbook.css</htmlStylesheet>
<htmlCustomization>
${docbook.source}/resources/xsl/spring-security-docbook-html.xsl
</htmlCustomization>
-->
<postProcess>
<copy todir="${docbook.target}/images">
<fileset dir="${docbook.source}/images">
<include name="*.png"/>
<include name="*.gif"/>
<include name="*.jpg"/>
</fileset>
</copy>
</postProcess>
</configuration>
</execution>
<execution>
<id>build-pdf-doc</id>
<phase>pre-site</phase>
<goals>
<goal>generate-pdf</goal>
</goals>
<configuration>
<sourceDirectory>${docbook.source}</sourceDirectory>
<targetDirectory>${docbook.target}</targetDirectory>
<inputs>springsecurity.xml</inputs>
<imgSrcPath>${docbook.source}/</imgSrcPath>
<admonGraphicsPath>${docbook.source}/resources/images/admons/</admonGraphicsPath>
<foCustomization>${docbook.source}/resources/xsl/spring-security-docbook-fopdf.xsl
</foCustomization>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.docbook</groupId>
@ -394,9 +443,6 @@
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
<targetDirectory>${basedir}/target/site/guide</targetDirectory>
</configuration>
</plugin>
</plugins>
</build>
@ -422,12 +468,6 @@
</configLocation>
</configuration>
</plugin>
-->
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@ -528,6 +568,8 @@
</dependencyManagement>
<properties>
<spring.version>1.2.9</spring.version>
<docbook.source>${basedir}/src/docbkx</docbook.source>
<docbook.target>${basedir}/target/site/guide</docbook.target>
</properties>
</project>

View File

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

View File

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

View File

@ -812,8 +812,14 @@ if (obj instanceof UserDetails) {
<imagedata align="center"
fileref="images/SecurityInterception.gif"
format="GIF" />
</imageobject>
</imageobject>
<imageobject role="fo">
<imagedata align="center"
fileref="images/SecurityInterception.gif"
format="GIF" />
</imageobject>
<caption>
<para>Figure 1: The key "secure object" model</para>
</caption>
@ -4671,7 +4677,7 @@ public boolean supports(Class clazz);</programlisting></para>
implementations.</para>
<para><mediaobject>
<imageobject role="html">
<imageobject>
<imagedata align="center" fileref="images/AfterInvocation.gif"
format="GIF" />
</imageobject>

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB