dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 106
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-02-25 17:56:13 +0200
message:
  Test commit for Lars. Modified pom.xml
modified:
  pom.xml


--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs

Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription.

=== modified file 'pom.xml'
--- pom.xml	2010-02-24 09:58:17 +0000
+++ pom.xml	2010-02-25 15:56:13 +0000
@@ -15,7 +15,7 @@
     <plugins>
       <plugin>
         <groupId>com.agilejava.docbkx</groupId>
-        <!-- <version>2.0.10-SNAPSHOT</version> -->
+        <version>2.0.10-SNAPSHOT</version>
         <artifactId>docbkx-maven-plugin</artifactId>
         <configuration>
           <includes>dhis2_user_manual_en.xml</includes>
@@ -67,6 +67,80 @@
             <configuration>
               <htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
               <glossaryCollection>resources/glossary_en.xml</glossaryCollection>
+<<<<<<< TREE
+               <sectionAutolabel>1</sectionAutolabel>
+               <sectionLabelIncludesComponentLabel>1</sectionLabelIncludesComponentLabel>
+               <chunkedOutput>false</chunkedOutput>
+          <postProcess>
+              <move
+                 file="target/docbkx/html/dhis2_user_manual_en.html"
+                 tofile="target/docbkx/html/dhis2_user_manual_full.html"/>
+            <copy todir="${docbook.target}/en/">
+              <fileset dir="target/docbkx/">
+                <include name="**/dhis2_user_manual_full.html" />
+              </fileset>
+            </copy>
+          </postProcess>
+        </configuration>
+       </execution>
+	 <execution>
+            <id>xhtml-docs</id>
+             <phase>package</phase>
+               <goals>
+                <goal>generate-xhtml</goal>
+               </goals>
+            <configuration>
+             <htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
+              <glossaryCollection>resources/glossary_en.xml</glossaryCollection>
+               <sectionAutolabel>1</sectionAutolabel>
+               <sectionLabelIncludesComponentLabel>1</sectionLabelIncludesComponentLabel>
+               <chunkedOutput>false</chunkedOutput>
+          <postProcess>
+              <move
+                 file="target/docbkx/xhtml/dhis2_user_manual_en.xhtml"
+                 tofile="target/docbkx/xhtml/dhis2_user_manual_full.xhtml"/>
+            <copy todir="${docbook.target}/en/">
+              <fileset dir="target/docbkx/">
+                <include name="**/dhis2_user_manual_full.xhtml" />
+              </fileset>
+            </copy>
+          </postProcess>
+        </configuration>
+       </execution>
+
+        <execution>
+          <id>pdf-docs</id>
+             <phase>package</phase>
+              <goals>
+                <goal>generate-pdf</goal>
+               </goals>
+                <configuration>
+                 <argLine>-Xmx1024m</argLine>
+                  <foCustomization>${docbook.source}/en/resources/xsl/fop-cust.xsl</foCustomization> 
+                  <doubleSided>1</doubleSided>
+                  <includes>*.xml</includes>
+                  <sourceDirectory>${docbook.source}/en/</sourceDirectory>
+
+           	  <postProcess>
+            		<copy todir="target/site/en">
+              		<fileset dir="target/docbkx/">
+                	<include name="**/*.pdf" />
+              		</fileset>
+            		</copy> 
+            	 </postProcess> 
+                 </configuration> 
+           </execution>
+         </executions>
+         <dependencies>
+           <dependency>
+             <groupId>org.docbook</groupId>
+               <artifactId>docbook-xml</artifactId>
+                 <version>4.4</version>
+                 <scope>runtime</scope>
+            </dependency>
+         </dependencies>
+     </plugin>
+=======
               <sectionAutolabel>1</sectionAutolabel>
               <sectionLabelIncludesComponentLabel>1</sectionLabelIncludesComponentLabel>
               <chunkedOutput>false</chunkedOutput>
@@ -111,6 +185,7 @@
           </dependency>
         </dependencies>
       </plugin>
+>>>>>>> MERGE-SOURCE
     </plugins>
   </build>
 </project>