Upgrade to latest sdocbook plugin

doc/docbook/index.xml

@@ -193,7 +193,7 @@
 
         <para><mediaobject>
             <imageobject role="html">
-              <imagedata align="center" fileref="SecurityInterception.gif"
+              <imagedata align="center" fileref="images/SecurityInterception.gif"
                          format="GIF" />
             </imageobject>
 
@@ -344,7 +344,7 @@
 
         <para><mediaobject>
             <imageobject role="html">
-              <imagedata align="center" fileref="Context.gif" format="GIF" />
+              <imagedata align="center" fileref="images/Context.gif" format="GIF" />
             </imageobject>
 
             <caption>
@@ -948,7 +948,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
 
         <para><mediaobject>
             <imageobject role="html">
-              <imagedata align="center" fileref="Authentication.gif"
+              <imagedata align="center" fileref="images/Authentication.gif"
                          format="GIF" />
             </imageobject>
 
@@ -1716,7 +1716,7 @@ public boolean supports(Class clazz);</programlisting></para>
 
         <para><mediaobject>
             <imageobject role="html">
-              <imagedata align="center" fileref="AccessDecisionVoting.gif"
+              <imagedata align="center" fileref="images/AccessDecisionVoting.gif"
                          format="GIF" />
             </imageobject>
 
@@ -2054,7 +2054,7 @@ public boolean supports(Class clazz);</programlisting></para>
 
         <para><mediaobject>
             <imageobject role="html">
-              <imagedata align="center" fileref="AfterInvocation.gif"
+              <imagedata align="center" fileref="images/AfterInvocation.gif"
                          format="GIF" />
             </imageobject>
 
@@ -3795,7 +3795,7 @@ $CATALINA_HOME/bin/startup.sh</programlisting></para>
 
         <para><mediaobject>
             <imageobject role="html">
-              <imagedata align="center" fileref="ACLSecurity.gif" format="GIF" />
+              <imagedata align="center" fileref="images/ACLSecurity.gif" format="GIF" />
             </imageobject>
 
             <caption>
@@ -3856,7 +3856,7 @@ public AclEntry[] getAcls(java.lang.Object domainInstance, Authentication authen
 
         <para><mediaobject>
             <imageobject role="html">
-              <imagedata align="center" fileref="BasicAclProvider.gif"
+              <imagedata align="center" fileref="images/BasicAclProvider.gif"
                          format="GIF" />
             </imageobject>
 

doc/docbook/styles/fo/acegi.xsl

@@ -16,7 +16,7 @@
 
 <!DOCTYPE xsl:stylesheet [
     <!ENTITY db_xsl             "docbook.xsl">
-    <!ENTITY admon_gfx_path     "../images/admons/">
+    <!ENTITY admon_gfx_path     "images/admons/">
 ]>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

doc/docbook/styles/html/acegi-chunk.xsl

@@ -15,8 +15,8 @@
 
 <!DOCTYPE xsl:stylesheet [
     <!ENTITY db_xsl             "chunk.xsl">
-    <!ENTITY callout_gfx_path   "../images/callouts/">
-    <!ENTITY admon_gfx_path     "../images/admons/">
+    <!ENTITY callout_gfx_path   "images/callouts/">
+    <!ENTITY admon_gfx_path     "images/admons/">
 ]>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -32,7 +32,7 @@
 
     <xsl:param name="chunk.section.depth">'5'</xsl:param>
     <xsl:param name="use.id.as.filename">'1'</xsl:param>
-    <xsl:param name="html.stylesheet">acegi.css</xsl:param>
+    <xsl:param name="html.stylesheet">styles/html/acegi.css</xsl:param>
 
     <!-- These extensions are required for table printing and other stuff -->
     <xsl:param name="use.extensions">1</xsl:param>

doc/docbook/styles/html/acegi.xsl

@@ -15,8 +15,8 @@
 
 <!DOCTYPE xsl:stylesheet [
     <!ENTITY db_xsl             "docbook.xsl">
-    <!ENTITY callout_gfx_path   "../images/callouts/">
-    <!ENTITY admon_gfx_path     "../images/admons/">
+    <!ENTITY callout_gfx_path   "images/callouts/">
+    <!ENTITY admon_gfx_path     "images/admons/">
 ]>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -30,7 +30,7 @@
                      HTML Settings
     ################################################### -->   
 
-    <xsl:param name="html.stylesheet">acegi.css</xsl:param>
+    <xsl:param name="html.stylesheet">styles/html/acegi.css</xsl:param>
 
     <!-- These extensions are required for table printing and other stuff -->
     <xsl:param name="use.extensions">1</xsl:param>

doc/maven.xml

@@ -103,40 +103,13 @@ Maven throws an OutOfMemoryError. :-(
             plugin="maven-sdocbook-plugin"
             property="maven.sdocbook.stylesheets.dir"/>
 
-        <!-- use a custom fo stylesheet -->
-        <copy todir="${maven.sdocbook.stylesheets.dir}/fo">
-            <fileset dir="${maven.sdocbook.src.dir}/styles/fo"/>
-        </copy>
-
-        <!-- use a custom html stylesheet -->
-        <copy todir="${maven.sdocbook.stylesheets.dir}/html">
-            <fileset dir="${maven.sdocbook.src.dir}/styles/html"/>
-        </copy>
-
-        <!-- copy images -->
-        <copy todir="${maven.sdocbook.stylesheets.dir}/images">
-            <fileset dir="${maven.sdocbook.src.dir}/images"/>
+        <!-- use custom stylesheets -->
+        <copy todir="${maven.sdocbook.stylesheets.dir}">
+            <fileset dir="${maven.sdocbook.src.dir}/styles"/>
         </copy>
 
     </postGoal>
 
-    <postGoal name="sdocbook:generate-html">
-        <j:if test="${chunk != true}">
-            <move file="${maven.sdocbook.target.dir}/index.html"
-                  tofile="${maven.sdocbook.target.dir}/index-all.html"/>
-        </j:if>
-    </postGoal>
-    <goal name="sdocbook:generate-htmlchunk">
-        <j:set var="maven.sdocbook.html.xsl" value="${maven.sdocbook.stylesheets.dir}/html/acegi-chunk.xsl"/>
-        <j:set var="maven.sdocbook.generated.html" value="${maven.build.dir}/generated-docbooks/html-chunk"/>
-        <j:set var="chunk" value="true"/>
-        <attainGoal name="sdocbook:generate-html"/>
-        <j:set var="chunk" value="false"/>
-    </goal>
-    <postGoal name="sdocbook">
-        <attainGoal name="sdocbook:generate-htmlchunk"/>
-    </postGoal>
-    
     <preGoal name="site">
         <attainGoal name="sdocbook"/>
     </preGoal>

doc/project.properties

@@ -1,9 +1,8 @@
 # sdocbook
-maven.sdocbook.fo.params=-PARAM paper.type A4 -PARAM use.extensions 1 -PARAM tablecolumns.extension 0 -PARAM callout.extensions 1 -PARAM fop.extensions 1
 maven.sdocbook.src.dir=${basedir}/docbook
-maven.sdocbook.resources.include=**/*.gif,**/*.svg,**/*.jpg,**/*.css
 maven.sdocbook.html.xsl=${maven.sdocbook.stylesheets.dir}/html/acegi.xsl
 maven.sdocbook.fo.xsl=${maven.sdocbook.stylesheets.dir}/fo/acegi.xsl
+maven.sdocbook.htmlchunk.xsl=${maven.sdocbook.stylesheets.dir}/html/acegi-chunk.xsl
 
 # statcvs, if you want a full, accurate history
 # (this downloads the *entire* CVS into target/statcvs, so it can take some time)

doc/project.xml

@@ -14,7 +14,7 @@
     <dependency>
       <groupId>maven-plugins</groupId>
       <artifactId>maven-sdocbook-plugin</artifactId>
-      <version>1.4</version>
+      <version>1.4.1</version>
       <type>plugin</type>
       <url>http://maven-plugins.sourceforge.net/sdocbook</url>
     </dependency>