[jboss-cvs] JBossAS SVN: r110348 - in projects/jboss-jca/branches/performance: doc/perfguide and 2 other directories.

Thu Jan 13 05:03:28 EST 2011

Author: jeff.zhang
Date: 2011-01-13 05:03:27 -0500 (Thu, 13 Jan 2011)
New Revision: 110348

Added:
   projects/jboss-jca/branches/performance/doc/perfguide/en-US/
   projects/jboss-jca/branches/performance/doc/perfguide/en-US/images/logo.png
   projects/jboss-jca/branches/performance/doc/perfguide/en-US/perfguide.xml
Removed:
   projects/jboss-jca/branches/performance/doc/perfguide/en-US/master.xml
   projects/jboss-jca/branches/performance/doc/perfguide/en/
Modified:
   projects/jboss-jca/branches/performance/build.xml
   projects/jboss-jca/branches/performance/doc/perfguide/build.xml
Log:
[JBJCA-491] use docant lib instead of old docbook lib

Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================

--- projects/jboss-jca/branches/performance/build.xml	2011-01-13 09:49:33 UTC (rev 110347)
+++ projects/jboss-jca/branches/performance/build.xml	2011-01-13 10:03:27 UTC (rev 110348)
@@ -275,13 +275,12 @@
 
     <ant dir="doc/perfguide" target="pdf"/>
 
-    <move flatten="true" todir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc">
-      <fileset dir="${build.dir}">
+    <copy flatten="true" todir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc">
+      <fileset dir="${target.dir}/docs/perfguide">
         <include name="**/*.pdf"/>
       </fileset>
-    </move>
+    </copy>
 
-    <delete dir="${build.dir}/en"/>
   </target>
 
   <!-- ================================= 

Modified: projects/jboss-jca/branches/performance/doc/perfguide/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/doc/perfguide/build.xml	2011-01-13 09:49:33 UTC (rev 110347)
+++ projects/jboss-jca/branches/performance/doc/perfguide/build.xml	2011-01-13 10:03:27 UTC (rev 110348)
@@ -20,30 +20,96 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
-<project name="perfguide" default="all" basedir=".">
+<project name="PerfDocbook-Ironjacamar" default="all" basedir=".">
 
-  <property name="build.dir" value="${basedir}/../../target/docs/perfguide"/>
-  <property name="pdf.name"  value="JBossJCAPerformanceGuide.pdf"/>
-  <import file="${basedir}/../../tools/docbook/support.xml"/>
+  <property name="docant.dir" value="${basedir}/../../tools/docant"/>
+  <property name="target.dir" value="${basedir}/../../target" />
+  <property name="docant.target.dir" value="${basedir}/../../build" />
 
-  <target name="all" depends="clean">
-    <mkdir dir="en/images" />
-    <antcall target="lang.all"><param name="lang" value="en"/></antcall>
+  <import file="${docant.dir}/support.xml"/>
+
+  <property name="srcDir" value="." />
+  <property name="srcDocName" value="perfguide" />
+  <property name="srcDocNameFile" value="${srcDocName}.xml" />
+  <property name="pdfName" value="IronJacamarPerformanceGuide.pdf" />
+
+  <target name="docant-init" >
+    <available file="${docant.target.dir}/docbook/staging" type="dir" property="docant.support" value="true"/>
   </target>
 
-  <target name="pdf">
-    <mkdir dir="en/images" />
-    <antcall target="lang.docpdf"><param name="lang" value="en"/></antcall>
+  <target name="docant-support" unless="docant.support">
+    <ant antfile="${docant.dir}/build.xml" inheritRefs="false" inheritAll="false">
+      <property name="docant.dir" value="${docant.dir}"/>
+      <property name="docant.target.dir" value="${docant.target.dir}"/>
+    </ant>
   </target>
 
+  <target name="docant-prepare" depends="docant-init, docant-support">
+    <copy todir="${docant.target.dir}/docbook/staging/images/images">
+        <fileset dir="${basedir}/${srcDir}/en-US/images/"/>
+    </copy>
+  </target>
+
+  <target name="docant-post">
+    <mkdir dir="${target.dir}/docs/${srcDocName}"/>
+    <move file="${docant.target.dir}/docbook/publish" tofile="${target.dir}/docs/${srcDocName}" failonerror="false"/>
+    <delete includeemptydirs="true">
+      <fileset dir="${docant.target.dir}/docbook/staging/images/images/" excludes="community/**"/>
+    </delete>
+  </target>
+
   <target name="html">
-    <mkdir dir="en/images" />
-    <antcall target="lang.dochtml"><param name="lang" value="en"/></antcall>
+    <antcall target="docant-prepare"/>
+    <docant sourceDirectory="${srcDir}" 
+            sourceDocumentName="${srcDocNameFile}"
+            baseOutputDirectory="${docant.target.dir}">
+      <format name="html" 
+	      stylesheetResource="classpath:/ironjacamar-style/xhtml.xsl"
+	      targetFinalName="index.html"/>
+    </docant>
+    <antcall target="docant-post"/>
   </target>
 
-  <target name="htmlsingle">
-    <mkdir dir="en/images" />
-    <antcall target="lang.dochtmlsingle"><param name="lang" value="en"/></antcall>
+  <target name="html-single">
+    <antcall target="docant-prepare"/>
+    <docant sourceDirectory="${srcDir}" 
+            sourceDocumentName="${srcDocNameFile}"
+            baseOutputDirectory="${docant.target.dir}">
+      <format name="html_single" 
+	      stylesheetResource="classpath:/ironjacamar-style/xhtml-single.xsl"
+	      targetFinalName="index.html"/>
+    </docant>
+    <antcall target="docant-post"/>
   </target>
 
+  <target name="pdf">
+    <antcall target="docant-prepare"/>
+    <docant sourceDirectory="${srcDir}" 
+            sourceDocumentName="${srcDocNameFile}"
+            baseOutputDirectory="${docant.target.dir}">
+      <format name="pdf" 
+	      stylesheetResource="classpath:/ironjacamar-style/pdf.xsl"
+	      targetFinalName="${pdfName}"/>
+    </docant>
+    <antcall target="docant-post"/>
+  </target>
+
+  <target name="all">
+    <antcall target="docant-prepare"/>
+    <docant sourceDirectory="${srcDir}" 
+            sourceDocumentName="${srcDocNameFile}"
+            baseOutputDirectory="${docant.target.dir}">
+      <format name="html" 
+	      stylesheetResource="classpath:/ironjacamar-style/xhtml.xsl"
+	      targetFinalName="index.html"/>
+      <format name="html_single" 
+	      stylesheetResource="classpath:/ironjacamar-style/xhtml-single.xsl"
+	      targetFinalName="index.html"/>
+      <format name="pdf" 
+	      stylesheetResource="classpath:/ironjacamar-style/pdf.xsl"
+	      targetFinalName="${pdfName}"/>
+    </docant>
+    <antcall target="docant-post"/>
+  </target>
+
 </project>

Copied: projects/jboss-jca/branches/performance/doc/perfguide/en-US (from rev 110346, projects/jboss-jca/branches/performance/doc/perfguide/en)

Added: projects/jboss-jca/branches/performance/doc/perfguide/en-US/images/logo.png
===================================================================
(Binary files differ)


Property changes on: projects/jboss-jca/branches/performance/doc/perfguide/en-US/images/logo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: projects/jboss-jca/branches/performance/doc/perfguide/en-US/master.xml
===================================================================
--- projects/jboss-jca/branches/performance/doc/perfguide/en/master.xml	2011-01-13 08:28:35 UTC (rev 110346)
+++ projects/jboss-jca/branches/performance/doc/perfguide/en-US/master.xml	2011-01-13 10:03:27 UTC (rev 110348)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
-        "../../../tools/docbook/support/docbook-dtd/docbookx.dtd" [
-        <!ENTITY about SYSTEM "modules/about.xml">
-        <!ENTITY introduction SYSTEM "modules/introduction.xml">
-        <!ENTITY profiler SYSTEM "modules/profiler.xml">
-        <!ENTITY benchmark SYSTEM "modules/benchmark.xml">
-        ]>
-<book lang="en">
-   <bookinfo>
-      <title>JBoss JCA 1.0 Performance's Guide</title>
-
-      <subtitle>Connecting your Enterprise Information Systems</subtitle>
-
-   </bookinfo>
-
-   <toc></toc>
-
-   &about;
-
-   &introduction;
-
-   &profiler;
-
-   &benchmark;
-</book>

Copied: projects/jboss-jca/branches/performance/doc/perfguide/en-US/perfguide.xml (from rev 110346, projects/jboss-jca/branches/performance/doc/perfguide/en/master.xml)
===================================================================
--- projects/jboss-jca/branches/performance/doc/perfguide/en-US/perfguide.xml	                        (rev 0)
+++ projects/jboss-jca/branches/performance/doc/perfguide/en-US/perfguide.xml	2011-01-13 10:03:27 UTC (rev 110348)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+              "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+        <!ENTITY about SYSTEM "modules/about.xml">
+        <!ENTITY introduction SYSTEM "modules/introduction.xml">
+        <!ENTITY profiler SYSTEM "modules/profiler.xml">
+        <!ENTITY benchmark SYSTEM "modules/benchmark.xml">
+        ]>
+<book lang="en">
+   <bookinfo>
+      <title>JBoss JCA 1.0 Performance's Guide</title>
+
+      <subtitle>Connecting your Enterprise Information Systems</subtitle>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/logo.png" align="center" valign="middle"/>
+        </imageobject>
+      </mediaobject>
+
+   </bookinfo>
+
+   <toc></toc>
+
+   &about;
+
+   &introduction;
+
+   &profiler;
+
+   &benchmark;
+</book>

