MPPDF-38 : Use the ant task for the xsl transformation and remove xerces and xalan dependencies.

merge release 2.2.2 to 2.3

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@179164 13f79535-47bb-0310-9956-ffa450edef68

pdf/plugin.jelly

@@ -121,94 +121,26 @@ internal_pdf_workingDir         = [${internal_pdf_workingDir}]
       message="PDF generation cannot complete as ${maven.pdf.navigationFilePath}/${maven.pdf.navigationFile} is missing" 
       unless="maven.fo.navigation.available"/>
 
-    <j:scope>
-      <j:new className="java.io.File" var="styleFile">
-        <j:arg value="${plugin.resources}/project2fo.xslt" />
-      </j:new>
-      <j:new className="javax.xml.transform.stream.StreamSource" var="style">
-        <j:arg value="${styleFile}" />
-      </j:new>
-    
-      <j:new className="org.apache.xalan.processor.TransformerFactoryImpl" var="transformerFactory" />
-      <j:invoke on="${transformerFactory}" method="newTransformer" var="transformer" >
-        <j:arg value="${style}" />
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="basePath" />
-        <j:arg value="${internal_pdf_workingDir}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="confidential" />
-        <j:arg value="${maven.pdf.confidential}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="paperType" />
-        <j:arg value="${maven.pdf.paperType}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="companyIncName" />
-        <j:arg value="${maven.pdf.companyIncName}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="publicationYear" />
-        <j:arg value="${maven.pdf.copyrightYear}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="coverProjectCompany" />
-        <j:arg value="${maven.pdf.cover.projectCompany}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="coverProjectName" />
-        <j:arg value="${maven.pdf.cover.projectName}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="coverType" />
-        <j:arg value="${maven.pdf.cover.type}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="coverVersion" />
-        <j:arg value="${maven.pdf.cover.version}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="coverDate" />
-        <j:arg value="${maven.pdf.cover.date}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="companyLogo" />
-        <j:arg value="${maven.pdf.companyLogo}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="projectLogo" />
-        <j:arg value="${maven.pdf.projectLogo}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="imageDpi" />
-        <j:arg value="${maven.pdf.imageDpi}"/>
-      </j:invoke>
-      <j:invoke on="${transformer}" method="setParameter">
-        <j:arg value="debug" />
-        <j:arg value="${maven.pdf.debug}"/>
-      </j:invoke>
-    
-      <j:new className="java.io.File" var="sourceFile">
-        <j:arg value="${maven.pdf.navigationFilePath}/${maven.pdf.navigationFile}" />
-      </j:new>
-      <j:new className="javax.xml.transform.stream.StreamSource" var="source">
-        <j:arg value="${sourceFile}" />
-      </j:new>
-      
-      <j:new className="java.io.File" var="resultFile">
-        <j:arg value="${internal_pdf_workingDir}/project.fo" />
-      </j:new>
-      <j:new className="javax.xml.transform.stream.StreamResult" var="result">
-        <j:arg value="${resultFile}" />
-      </j:new>
-    
-      <j:invoke on="${transformer}" method="transform">
-        <j:arg value="${source}" />
-        <j:arg value="${result}" />
-      </j:invoke>
-    </j:scope>
+    <xslt 
+      in="${maven.pdf.navigationFilePath}/${maven.pdf.navigationFile}" 
+      out="${internal_pdf_workingDir}/project.fo" 
+      style="${plugin.resources}/project2fo.xslt" 
+      force="true">
+      <param name="basePath" expression="${internal_pdf_workingDir}"/>
+      <param name="confidential" expression="${maven.pdf.confidential}"/>
+      <param name="paperType" expression="${maven.pdf.paperType}"/>
+      <param name="companyIncName" expression="${maven.pdf.companyIncName}"/>
+      <param name="publicationYear" expression="${maven.pdf.copyrightYear}"/>
+      <param name="coverProjectCompany" expression="${maven.pdf.cover.projectCompany}"/>
+      <param name="coverProjectName" expression="${maven.pdf.cover.projectName}"/>
+      <param name="coverType" expression="${maven.pdf.cover.type}"/>
+      <param name="coverVersion" expression="${maven.pdf.cover.version}"/>
+      <param name="coverDate" expression="${maven.pdf.cover.date}"/>
+      <param name="companyLogo" expression="${maven.pdf.companyLogo}"/>
+      <param name="projectLogo" expression="${maven.pdf.projectLogo}"/>
+      <param name="imageDpi" expression="${maven.pdf.imageDpi}"/>
+      <param name="debug" expression="${maven.pdf.debug}"/>
+    </xslt>
 
   </goal>
 

pdf/project.xml

@@ -20,7 +20,7 @@
   <extend>${basedir}/../plugin-parent/project.xml</extend>
   <artifactId>maven-pdf-plugin</artifactId>
   <name>Maven PDF Plug-in</name>
-  <currentVersion>2.2.2-SNAPSHOT</currentVersion>
+  <currentVersion>2.3-SNAPSHOT</currentVersion>
   <description>PDF Documentation generator</description>
   <shortDescription>Generator of project documentation in PDF Format.</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pdf/</url>
@@ -221,32 +221,5 @@
       <version>4.1.5</version>
       <url>http://avalon.apache.org/framework/</url>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
-      <url>http://xml.apache.org/xerces-j/</url>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
-      <url>http://xml.apache.org/commons/</url>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.4.1</version>
-      <url>http://xml.apache.org/xalan-j/</url>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
-    </dependency>
   </dependencies>
 </project>

pdf/xdocs/changes.xml

@@ -20,9 +20,11 @@
   <properties>
     <title>Changes</title>
     <author email="dion@apache.org">dIon Gillard</author>
+    <author email="aheritier@apache.org">Arnaud Heritier</author>
   </properties>
   <body>
-    <release version="2.2.2" date="In SVN">
+    <release version="2.3" date="In SVN">
+      <action dev="aheritier" type="update" issue="MPPDF-38">Use the ant task for the xsl transformation and remove xerces and xalan dependencies. People using java 5 will have to use this release with maven 1.1 or maven 1.0 with at the most the PDF plugin 2.2.X.</action>
       <action dev="aheritier" type="fix" issue="MPPDF-30" due-to="Lukas Theussl">The first row of table is not rendered.</action>
     </release>
     <release version="2.2.1" date="2004-10-30">