From: Geoffrey De S. <ge0...@us...> - 2005-05-24 17:12:44
|
ge0ffrey 05/05/24 10:12:32 Modified: xmlresume/xdocs properties.xml xmlresume plugin.jelly plugin.properties project.xml Log: added fop dependencies Revision Changes Path 1.2 +2 -8 maven-plugins/xmlresume/xdocs/properties.xml Index: properties.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/xmlresume/xdocs/properties.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- properties.xml 13 Feb 2004 06:54:54 -0000 1.1 +++ properties.xml 24 May 2005 17:12:31 -0000 1.2 @@ -44,7 +44,7 @@ <td>resume.html.filter</td> <td>yes</td> <td>the filter to use for the HTML version</td> - <td>html</td> + <td>html</td> </tr> <tr> <td>resume.txt.filter</td> @@ -81,19 +81,13 @@ <th>Default</th> </tr> <tr> - <td>resume.pdf.home</td> - <td>yes</td> - <td>the location of the FOP installation for conversion to PDF</td> - <td></td> - </tr> - <tr> <td>resume.rtf.home</td> <td>yes</td> <td> the location of the XMLMind FO Converter installation for conversion to RTF </td> - <td></td> + <td></td> </tr> </table> </section> 1.2 +107 -69 maven-plugins/xmlresume/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/xmlresume/plugin.jelly,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plugin.jelly 13 Feb 2004 06:54:53 -0000 1.1 +++ plugin.jelly 24 May 2005 17:12:31 -0000 1.2 @@ -1,10 +1,43 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project> +<project + xmlns:j="jelly:core" + xmlns:util="jelly:util" + xmlns:x="jelly:xml" + xmlns:ant="jelly:ant" + xmlns:maven="jelly:maven"> <goal name="resume"> <attainGoal name="resume:all"/> </goal> - - <goal name="resume:init"/> + + <goal name="resume:init"> + ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')} + <ant:mkdir dir="${resume.build.dir}"/> + <ant:path id="maven.xmlresume.fop.classpath"> + <ant:pathelement location="${plugin.getDependencyPath('fop')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-awt-util')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-bridge')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-css')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-dom')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-ext')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-extension')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-gui-util')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-gvt')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-parser')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-rasterizer')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-script')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-svg-dom')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-svggen')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-swing')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-transcoder')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-util')}"/> + <ant:pathelement location="${plugin.getDependencyPath('batik:batik-xml')}"/> + <ant:pathelement location="${plugin.getDependencyPath('logkit')}"/> + <ant:pathelement location="${plugin.getDependencyPath('avalon-framework')}"/> + <ant:pathelement location="${plugin.getDependencyPath('xerces')}"/> + <ant:pathelement location="${plugin.getDependencyPath('xml-apis')}"/> + </ant:path> + </goal> <goal name="resume:all"> <attainGoal name="resume:txt"/> @@ -13,94 +46,99 @@ <attainGoal name="resume:pdf"/> <attainGoal name="resume:rtf"/> </goal> - - <goal name="resume:txt"> - ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')} - <java classname="${resume.filter.processor}" + + <goal name="resume:txt" prereqs="resume:init"> + <ant:java classname="${resume.filter.processor}" fork="yes" classpath="${resume.filter.classpath}"> - <arg value="-in"/> - <arg value="${resume.file}"/> - <arg value="-out"/> - <arg value="${resume.build.dir}/resume.txt.xml"/> - <arg value="${resume.txt.filter}"/> - </java> - <xslt in="${resume.build.dir}/resume.txt.xml" + <ant:arg value="-in"/> + <ant:arg value="${resume.file}"/> + <ant:arg value="-out"/> + <ant:arg value="${resume.build.dir}/resume.txt.xml"/> + <ant:arg value="${resume.txt.filter}"/> + </ant:java> + <ant:xslt in="${resume.build.dir}/resume.txt.xml" out="${resume.build.dir}/resume.txt" style="${resume.styleBase}/output/us-text.xsl"/> </goal> - - <goal name="resume:html"> - ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')} - <java classname="${resume.filter.processor}" + + <goal name="resume:html" prereqs="resume:init"> + <ant:java classname="${resume.filter.processor}" fork="yes" classpath="${resume.filter.classpath}"> - <arg value="-in"/> - <arg value="${resume.file}"/> - <arg value="-out"/> - <arg value="${resume.build.dir}/resume.html.xml"/> - <arg value="${resume.html.filter}"/> - </java> - <xslt in="${resume.build.dir}/resume.html.xml" + <ant:arg value="-in"/> + <ant:arg value="${resume.file}"/> + <ant:arg value="-out"/> + <ant:arg value="${resume.build.dir}/resume.html.xml"/> + <ant:arg value="${resume.html.filter}"/> + </ant:java> + <ant:xslt in="${resume.build.dir}/resume.html.xml" out="${resume.build.dir}/resume.html" style="${resume.styleBase}/output/us-html.xsl"/> </goal> - <goal name="resume:xml"> - <java classname="${resume.filter.processor}" + <goal name="resume:xml" prereqs="resume:init"> + <ant:java classname="${resume.filter.processor}" fork="yes" classpath="${resume.filter.classpath}"> - <arg value="-in"/> - <arg value="${resume.file}"/> - <arg value="-out"/> - <arg value="${resume.build.dir}/resume.xml"/> - <arg value="${resume.xml.filter}"/> - </java> + <ant:arg value="-in"/> + <ant:arg value="${resume.file}"/> + <ant:arg value="-out"/> + <ant:arg value="${resume.build.dir}/resume.xml"/> + <ant:arg value="${resume.xml.filter}"/> + </ant:java> </goal> - <goal name="resume:pdf"> - ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')} - <java classname="${resume.filter.processor}" - fork="yes" - classpath="${resume.filter.classpath}"> - <arg value="-in"/> - <arg value="${resume.file}"/> - <arg value="-out"/> - <arg value="${resume.build.dir}/resume.pdf.xml"/> - <arg value="${resume.pdf.filter}"/> - </java> - <xslt in="${resume.build.dir}/resume.pdf.xml" + <goal name="resume:pdf" prereqs="resume:init"> + <ant:java classname="${resume.filter.processor}" + fork="yes"> + <ant:classpath> + <ant:pathelement path="${resume.filter.classpath}"/> + <ant:path refid="maven.xmlresume.fop.classpath"/> + </ant:classpath> + <ant:arg value="-in"/> + <ant:arg value="${resume.file}"/> + <ant:arg value="-out"/> + <ant:arg value="${resume.build.dir}/resume.pdf.xml"/> + <ant:arg value="${resume.pdf.filter}"/> + </ant:java> + <ant:xslt in="${resume.build.dir}/resume.pdf.xml" out="${resume.build.dir}/resume.pdf.fo" style="${resume.styleBase}/output/us-letter.xsl"/> - <java classname="${resume.pdf.processor}" - fork="yes" - classpath="${resume.pdf.classpath}"> - <arg value="-fo"/> - <arg value="${resume.build.dir}/resume.pdf.fo"/> - <arg value="-pdf"/> - <arg value="${resume.build.dir}/resume.pdf"/> - </java> + <ant:java classname="${resume.pdf.processor}" + fork="yes"> + <ant:classpath> + <ant:pathelement path="${resume.filter.classpath}"/> + <ant:path refid="maven.xmlresume.fop.classpath"/> + </ant:classpath> + <ant:arg value="-fo"/> + <ant:arg value="${resume.build.dir}/resume.pdf.fo"/> + <ant:arg value="-pdf"/> + <ant:arg value="${resume.build.dir}/resume.pdf"/> + </ant:java> </goal> - <goal name="resume:rtf"> - ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')} - <java classname="${resume.filter.processor}" - fork="yes" - classpath="${resume.filter.classpath}"> - <arg value="-in"/> - <arg value="${resume.file}"/> - <arg value="-out"/> - <arg value="${resume.build.dir}/resume.rtf.xml"/> - <arg value="${resume.rtf.filter}"/> - </java> - <xslt in="${resume.build.dir}/resume.rtf.xml" + <goal name="resume:rtf" prereqs="resume:init"> + <ant:java classname="${resume.filter.processor}" + fork="yes"> + <ant:classpath> + <ant:pathelement path="${resume.filter.classpath}"/> + <ant:path refid="maven.xmlresume.fop.classpath"/> + </ant:classpath> + <ant:arg value="-in"/> + <ant:arg value="${resume.file}"/> + <ant:arg value="-out"/> + <ant:arg value="${resume.build.dir}/resume.rtf.xml"/> + <ant:arg value="${resume.rtf.filter}"/> + </ant:java> + <ant:xslt in="${resume.build.dir}/resume.rtf.xml" out="${resume.build.dir}/resume.rtf.fo" style="${resume.styleBase}/output/us-letter.xsl"/> - <java classname="${resume.rtf.processor}" + <ant:java classname="${resume.rtf.processor}" fork="yes" classpath="${resume.rtf.classpath}"> - <arg value="${resume.build.dir}/resume.rtf.fo"/> - <arg value="${resume.build.dir}/resume.rtf"/> - </java> + <ant:arg value="${resume.build.dir}/resume.rtf.fo"/> + <ant:arg value="${resume.build.dir}/resume.rtf"/> + </ant:java> </goal> </project> \ No newline at end of file 1.2 +0 -1 maven-plugins/xmlresume/plugin.properties Index: plugin.properties =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/xmlresume/plugin.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plugin.properties 13 Feb 2004 06:54:53 -0000 1.1 +++ plugin.properties 24 May 2005 17:12:31 -0000 1.2 @@ -12,7 +12,6 @@ resume.styleBase=${resume.home}/xsl resume.filter.classpath=${resume.home}/java/xmlresume-filter.jar -resume.pdf.classpath=${resume.pdf.home}/build/fop.jar:${resume.pdf.home}/lib/avalon-framework-cvs-20020806.jar:${resume.pdf.home}/lib/batik.jar resume.rtf.classpath=${resume.rtf.home}/xfc.jar resume.filter.processor=net.sourceforge.xmlresume.filter.Filter 1.4 +166 -2 maven-plugins/xmlresume/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/xmlresume/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 15 Oct 2004 11:17:38 -0000 1.3 +++ project.xml 24 May 2005 17:12:31 -0000 1.4 @@ -5,7 +5,7 @@ <id>maven-xmlresume-plugin</id> <name>XML Resume Plugin</name> <!-- groupId is in parent --> - <currentVersion>0.2</currentVersion> + <currentVersion>0.2.1</currentVersion> <!-- organization is in parent --> <inceptionYear>2004</inceptionYear> <shortDescription> @@ -34,6 +34,170 @@ <url>http://david.carr.name</url> <timezone>-5</timezone> </developer> + <developer> + <name>Geoffrey De Smet</name> + <id>ge0ffrey</id> + <email>ge0ffrey_AT_users_DOT_sourceforge_DOT_net</email> + <roles> + <role>Java Developer</role> + </roles> + <url>http://users.pandora.be/geoffrey</url> + <timezone>+1</timezone> + </developer> </developers> - + <dependencies> + <dependency> + <groupId>fop</groupId> + <artifactId>fop</artifactId> + <version>0.20.5</version> + <url>http://xml.apache.org/fop/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-awt-util</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-bridge</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-css</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-dom</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-ext</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-extension</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-gui-util</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-gvt</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-parser</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-rasterizer</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-script</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-svg-dom</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-svggen</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-swing</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-transcoder</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-util</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>batik</groupId> + <artifactId>batik-xml</artifactId> + <version>1.5</version> + <url>http://xml.apache.org/batik/</url> + </dependency> + <dependency> + <groupId>logkit</groupId> + <artifactId>logkit</artifactId> + <version>1.2.2</version> + <url>http://avalon.apache.org/logkit/</url> + </dependency> + <dependency> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + <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> |