@@ -15,7 +15,6 @@
* limitations under the License. * limitations under the License.
* *
*/ */
package org.apache.tools.ant.taskdefs; package org.apache.tools.ant.taskdefs;
import java.io.File; import java.io.File;
@@ -205,8 +204,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
*/ */
public void addMapper(Mapper mapper) { public void addMapper(Mapper mapper) {
if (mapperElement != null) { if (mapperElement != null) {
throw new BuildException("Cannot define more than one mapper",
getLocation());
throw new BuildException("Cannot define more than one mapper", getLocation());
} }
mapperElement = mapper; mapperElement = mapper;
} }
@@ -229,8 +227,8 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
*/ */
public void addConfiguredStyle(Resources rc) { public void addConfiguredStyle(Resources rc) {
if (rc.size() != 1) { if (rc.size() != 1) {
throw new BuildException("The style element must be specified"
+ " with exactly one nested resource.");
throw new BuildException(
"The style element must be specified with exactly one nested resource.");
} }
setXslResource((Resource) rc.iterator().next()); setXslResource((Resource) rc.iterator().next());
} }
@@ -267,43 +265,34 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
log("Warning: the task name <style> is deprecated. Use <xslt> instead.", log("Warning: the task name <style> is deprecated. Use <xslt> instead.",
Project.MSG_WARN); Project.MSG_WARN);
} }
File savedBaseDir = baseDir; File savedBaseDir = baseDir;
DirectoryScanner scanner; DirectoryScanner scanner;
String[] list; String[] list;
String[] dirs; String[] dirs;
if (xslResource == null && xslFile == null) {
throw new BuildException("specify the "
+ "stylesheet either as a filename in style "
+ "attribute or as a nested resource", getLocation());
String baseMessage =
"specify the stylesheet either as a filename in style attribute or as a nested resource";
if (xslResource == null && xslFile == null) {
throw new BuildException(baseMessage, getLocation());
} }
if (xslResource != null && xslFile != null) { if (xslResource != null && xslFile != null) {
throw new BuildException("specify the "
+ "stylesheet either as a filename in style "
+ "attribute or as a nested resource but not "
+ "as both", getLocation());
throw new BuildException(baseMessage + " but not as both", getLocation());
} }
if (inFile != null && !inFile.exists()) { if (inFile != null && !inFile.exists()) {
throw new BuildException(
"input file " + inFile.toString() + " does not exist", getLocation());
throw new BuildException("input file " + inFile + " does not exist", getLocation());
} }
try { try {
if (baseDir == null) { if (baseDir == null) {
baseDir = getProject().resolveFile("."); baseDir = getProject().resolveFile(".");
} }
liaison = getLiaison(); liaison = getLiaison();
// check if liaison wants to log errors using us as logger // check if liaison wants to log errors using us as logger
if (liaison instanceof XSLTLoggerAware) { if (liaison instanceof XSLTLoggerAware) {
((XSLTLoggerAware) liaison).setLogger(this); ((XSLTLoggerAware) liaison).setLogger(this);
} }
log("Using " + liaison.getClass().toString(), Project.MSG_VERBOSE); log("Using " + liaison.getClass().toString(), Project.MSG_VERBOSE);
if (xslFile != null) { if (xslFile != null) {
@@ -317,8 +306,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* the wrong version has been used. * the wrong version has been used.
*/ */
if (stylesheet.exists()) { if (stylesheet.exists()) {
log("DEPRECATED - the 'style' attribute should be relative "
+ "to the project's");
log("DEPRECATED - the 'style' attribute should be relative to the project's");
log(" basedir, not the tasks's basedir."); log(" basedir, not the tasks's basedir.");
} }
} }
@@ -327,13 +315,11 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
fr.setFile(stylesheet); fr.setFile(stylesheet);
xslResource = fr; xslResource = fr;
} }
// if we have an in file and out then process them // if we have an in file and out then process them
if (inFile != null && outFile != null) { if (inFile != null && outFile != null) {
process(inFile, outFile, xslResource); process(inFile, outFile, xslResource);
return; return;
} }
/* /*
* if we get here, in and out have not been specified, we are * if we get here, in and out have not been specified, we are
* in batch processing mode. * in batch processing mode.
@@ -357,8 +343,8 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
for (int j = 0; j < dirs.length; ++j) { for (int j = 0; j < dirs.length; ++j) {
list = new File(baseDir, dirs[j]).list(); list = new File(baseDir, dirs[j]).list();
for (int i = 0; i < list.length; ++i) { for (int i = 0; i < list.length; ++i) {
process(baseDir, dirs[j] + File.separator + list[i],
destDir, xslResource);
process(baseDir, dirs[j] + File.separator + list[i], destDir,
xslResource);
} }
} }
} }
@@ -546,12 +532,10 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
private Class loadClass(String classname) throws Exception { private Class loadClass(String classname) throws Exception {
if (classpath == null) { if (classpath == null) {
return Class.forName(classname); return Class.forName(classname);
} else {
loader = getProject().createClassLoader(classpath);
loader.setThreadContextLoader();
Class c = Class.forName(classname, true, loader);
return c;
} }
loader = getProject().createClassLoader(classpath);
loader.setThreadContextLoader();
return Class.forName(classname, true, loader);
} }
/** /**
@@ -621,9 +605,8 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @param stylesheet the stylesheet to use. * @param stylesheet the stylesheet to use.
* @exception BuildException if the processing fails. * @exception BuildException if the processing fails.
*/ */
private void process(File baseDir, String xmlFile, File destDir,
Resource stylesheet)
throws BuildException {
private void process(File baseDir, String xmlFile, File destDir, Resource stylesheet)
throws BuildException {
File outF = null; File outF = null;
File inF = null; File inF = null;
@@ -633,11 +616,9 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
inF = new File(baseDir, xmlFile); inF = new File(baseDir, xmlFile);
if (inF.isDirectory()) { if (inF.isDirectory()) {
log("Skipping " + inF + " it is a directory.",
Project.MSG_VERBOSE);
log("Skipping " + inF + " it is a directory.", Project.MSG_VERBOSE);
return; return;
} }
FileNameMapper mapper = null; FileNameMapper mapper = null;
if (mapperElement != null) { if (mapperElement != null) {
mapper = mapperElement.getImplementation(); mapper = mapperElement.getImplementation();
@@ -647,23 +628,18 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
String[] outFileName = mapper.mapFileName(xmlFile); String[] outFileName = mapper.mapFileName(xmlFile);
if (outFileName == null || outFileName.length == 0) { if (outFileName == null || outFileName.length == 0) {
log("Skipping " + inFile + " it cannot get mapped to output.",
Project.MSG_VERBOSE);
log("Skipping " + inFile + " it cannot get mapped to output.", Project.MSG_VERBOSE);
return; return;
} else if (outFileName == null || outFileName.length > 1) { } else if (outFileName == null || outFileName.length > 1) {
log("Skipping " + inFile + " its mapping is ambiguos.",
Project.MSG_VERBOSE);
log("Skipping " + inFile + " its mapping is ambiguos.", Project.MSG_VERBOSE);
return; return;
} }
outF = new File(destDir, outFileName[0]); outF = new File(destDir, outFileName[0]);
if (force
|| inF.lastModified() > outF.lastModified()
|| styleSheetLastModified > outF.lastModified()) {
if (force || inF.lastModified() > outF.lastModified()
|| styleSheetLastModified > outF.lastModified()) {
ensureDirectoryFor(outF); ensureDirectoryFor(outF);
log("Processing " + inF + " to " + outF); log("Processing " + inF + " to " + outF);
configureLiaison(stylesheet); configureLiaison(stylesheet);
setLiaisonDynamicFileParameters(liaison, inF); setLiaisonDynamicFileParameters(liaison, inF);
liaison.transform(inF, outF); liaison.transform(inF, outF);
@@ -689,28 +665,22 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @param stylesheet the stylesheet to use. * @param stylesheet the stylesheet to use.
* @exception BuildException if the processing fails. * @exception BuildException if the processing fails.
*/ */
private void process(File inFile, File outFile, Resource stylesheet)
throws BuildException {
private void process(File inFile, File outFile, Resource stylesheet) throws BuildException {
try { try {
long styleSheetLastModified = stylesheet.getLastModified(); long styleSheetLastModified = stylesheet.getLastModified();
log("In file " + inFile + " time: " + inFile.lastModified(),
Project.MSG_DEBUG);
log("Out file " + outFile + " time: " + outFile.lastModified(),
Project.MSG_DEBUG);
log("Style file " + xslFile + " time: " + styleSheetLastModified,
Project.MSG_DEBUG);
log("In file " + inFile + " time: " + inFile.lastModified(), Project.MSG_DEBUG);
log("Out file " + outFile + " time: " + outFile.lastModified(), Project.MSG_DEBUG);
log("Style file " + xslFile + " time: " + styleSheetLastModified, Project.MSG_DEBUG);
if (force || inFile.lastModified() >= outFile.lastModified() if (force || inFile.lastModified() >= outFile.lastModified()
|| styleSheetLastModified >= outFile.lastModified()) {
|| styleSheetLastModified >= outFile.lastModified()) {
ensureDirectoryFor(outFile); ensureDirectoryFor(outFile);
log("Processing " + inFile + " to " + outFile,
Project.MSG_INFO);
log("Processing " + inFile + " to " + outFile, Project.MSG_INFO);
configureLiaison(stylesheet); configureLiaison(stylesheet);
setLiaisonDynamicFileParameters(liaison, inFile); setLiaisonDynamicFileParameters(liaison, inFile);
liaison.transform(inFile, outFile); liaison.transform(inFile, outFile);
} else { } else {
log("Skipping input file " + inFile
+ " because it is older than output file " + outFile
+ " and so is the stylesheet " + stylesheet, Project.MSG_DEBUG);
log("Skipping input file " + inFile + " because it is older than output file "
+ outFile + " and so is the stylesheet " + stylesheet, Project.MSG_DEBUG);
} }
} catch (Exception ex) { } catch (Exception ex) {
log("Failed to process " + inFile, Project.MSG_INFO); log("Failed to process " + inFile, Project.MSG_INFO);
@@ -727,13 +697,12 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @param targetFile the file for which the directories are required. * @param targetFile the file for which the directories are required.
* @exception BuildException if the directories cannot be created. * @exception BuildException if the directories cannot be created.
*/ */
private void ensureDirectoryFor(File targetFile)
throws BuildException {
private void ensureDirectoryFor(File targetFile) throws BuildException {
File directory = targetFile.getParentFile(); File directory = targetFile.getParentFile();
if (!directory.exists()) { if (!directory.exists()) {
if (!directory.mkdirs()) { if (!directory.mkdirs()) {
throw new BuildException("Unable to create directory: " throw new BuildException("Unable to create directory: "
+ directory.getAbsolutePath());
+ directory.getAbsolutePath());
} }
} }
} }
@@ -888,6 +857,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
public void setUnless(String unlessProperty) { public void setUnless(String unlessProperty) {
this.unlessProperty = unlessProperty; this.unlessProperty = unlessProperty;
} }
/** /**
* Ensures that the param passes the conditions placed * Ensures that the param passes the conditions placed
* on it with <code>if</code> and <code>unless</code> properties. * on it with <code>if</code> and <code>unless</code> properties.
@@ -896,16 +866,14 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
public boolean shouldUse() { public boolean shouldUse() {
if (ifProperty != null && project.getProperty(ifProperty) == null) { if (ifProperty != null && project.getProperty(ifProperty) == null) {
return false; return false;
} else if (unlessProperty != null
&& project.getProperty(unlessProperty) != null) {
}
if (unlessProperty != null && project.getProperty(unlessProperty) != null) {
return false; return false;
} }
return true; return true;
} }
} // Param } // Param
/** /**
* Create an instance of an output property to be configured. * Create an instance of an output property to be configured.
* @return the newly created output property. * @return the newly created output property.
@@ -917,7 +885,6 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
return p; return p;
} }
/** /**
* Specify how the result tree should be output as specified * Specify how the result tree should be output as specified
* in the <a href="http://www.w3.org/TR/xslt#output"> * in the <a href="http://www.w3.org/TR/xslt#output">
@@ -985,6 +952,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
fr.setFile(stylesheet); fr.setFile(stylesheet);
configureLiaison(fr); configureLiaison(fr);
} }
/** /**
* Loads the stylesheet and set xsl:param parameters. * Loads the stylesheet and set xsl:param parameters.
* *
@@ -1005,7 +973,6 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
if (liaison instanceof XSLTLiaison2) { if (liaison instanceof XSLTLiaison2) {
((XSLTLiaison2) liaison).configure(this); ((XSLTLiaison2) liaison).configure(this);
} }
if (liaison instanceof XSLTLiaison3) { if (liaison instanceof XSLTLiaison3) {
// If we are here we can set the stylesheet as a // If we are here we can set the stylesheet as a
// resource // resource
@@ -1015,12 +982,10 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
// a resource, but we can set it as a file. So, // a resource, but we can set it as a file. So,
// we make an attempt to get it as a file // we make an attempt to get it as a file
if (stylesheet instanceof FileResource) { if (stylesheet instanceof FileResource) {
liaison.setStylesheet(
((FileResource) stylesheet).getFile());
liaison.setStylesheet(((FileResource) stylesheet).getFile());
} else { } else {
throw new BuildException(liaison.getClass().toString() throw new BuildException(liaison.getClass().toString()
+ " accepts the stylesheet only as a file",
getLocation());
+ " accepts the stylesheet only as a file", getLocation());
} }
} }
for (Enumeration e = params.elements(); e.hasMoreElements();) { for (Enumeration e = params.elements(); e.hasMoreElements();) {
@@ -1030,8 +995,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
} }
} }
} catch (Exception ex) { } catch (Exception ex) {
log("Failed to transform using stylesheet " + stylesheet,
Project.MSG_INFO);
log("Failed to transform using stylesheet " + stylesheet, Project.MSG_INFO);
throw new BuildException(ex); throw new BuildException(ex);
} }
} }
@@ -1046,10 +1010,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* *
* @since Ant 1.7 * @since Ant 1.7
*/ */
private void setLiaisonDynamicFileParameters(
XSLTLiaison liaison,
File inFile
) throws Exception {
private void setLiaisonDynamicFileParameters(XSLTLiaison liaison, File inFile) throws Exception {
if (fileNameParameter != null) { if (fileNameParameter != null) {
liaison.addParam(fileNameParameter, inFile.getName()); liaison.addParam(fileNameParameter, inFile.getName());
} }
@@ -1058,10 +1019,8 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
File file = new File(fileName); File file = new File(fileName);
// Give always a slash as file separator, so the stylesheet could be sure about that // Give always a slash as file separator, so the stylesheet could be sure about that
// Use '.' so a dir+"/"+name would not result in an absolute path // Use '.' so a dir+"/"+name would not result in an absolute path
liaison.addParam(
fileDirParameter,
(file.getParent() != null)
? file.getParent().replace('\\', '/') : ".");
liaison.addParam(fileDirParameter, file.getParent() != null ? file.getParent().replace(
'\\', '/') : ".");
} }
} }
@@ -1170,8 +1129,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
* @param value the value of the attribute * @param value the value of the attribute
* @throws BuildException on error * @throws BuildException on error
*/ */
public void setDynamicAttribute(String name, String value)
throws BuildException {
public void setDynamicAttribute(String name, String value) throws BuildException {
// only 'name' and 'value' exist. // only 'name' and 'value' exist.
if ("name".equalsIgnoreCase(name)) { if ("name".equalsIgnoreCase(name)) {
this.name = value; this.name = value;
@@ -1194,7 +1152,6 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
} }
} }
} // -- class Attribute } // -- class Attribute
} // -- class Factory } // -- class Factory
/** /**
Matthew Jason Benson