From: Eric L. <ele...@us...> - 2005-10-02 20:32:37
|
elegoubin 05/10/02 13:32:30 Modified: macker plugin.jelly Log: Now the Macker report works under JDK 1.5 (thanks to Allan Lima) Revision Changes Path 1.2 +15 -2 maven-plugins/macker/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/macker/plugin.jelly,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plugin.jelly 1 Oct 2004 22:04:21 -0000 1.1 +++ plugin.jelly 2 Oct 2005 20:32:30 -0000 1.2 @@ -103,8 +103,21 @@ <mkdir dir="${macker.report.dir}"/> - - ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')} + <echo message="Full Java Version: [${java.version}]"/> + <j:set var="javaVersionFull" value="${java.version}"/> + <j:set var="len" value="${javaVersionFull.length()-5}"/> + <j:set var="javaVersion" value="${javaVersionFull.substring(0,3)}"/> + <echo message="Short Java Version: [${javaVersion}]"/> + <!-- Java 1.4 --> + <j:if test="${context.getVariable('javaVersion') == '1.4'}"> + <echo message="Setting TransformerFactory to Java ${javaVersion}"/> + ${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')} + </j:if> + <!-- Java 1.5 --> + <j:if test="${context.getVariable('javaVersion') == '1.5'}"> + <echo message="Setting TransformerFactory to Java ${javaVersion}"/> + ${systemScope.setProperty('javax.xml.transform.TransformerFactory','com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl')} + </j:if> <macker xmlReportFile="${macker.report.xml}" verbose="${maven.macker.verbose}" failonerror="false" |