e48b18a268
* performance improvements in directory scanning
* XSLT task honors classpath again (bugrep 49271)
* distinction between core tasks and optional tasks is abolished
* new task augment allows to add attributes or nested elements to previously
defined references
* Lexically scoped local properties, i.e. properties that are only defined
inside a target, sequential block or similar environment. This is very
useful inside of <macrodef>s where a macro can now define a temporary
property that will disappear once the task has finished.
* <import> can now import from any file- or URL-providing resource - this
includes <javaresource>. This means <import> can read build file snippets
from JARs or fixed server URLs. There are several other improvements in the
area of import.
* Various improvements to the directory scanning code that help with symbolic
link cycles (as can be found on MacOS X Java installations for example) and
improve scanning performance. For big directory trees the improvement is
dramatic.
* The way developers can extend Ant's property expansion algorithm has been
rewritten (breaking the older API) to be easier to use and be more
powerful. The whole local properties mechanism is implemented using that
API and could be implemented in a separate library without changes in Ant's
core. Things like the yet-to-be-released props Antlib can now provide often
required "scripty" fuctions without touching Ant itself. At the same time
the if and unless attributes have been rewritten to do the expected thing
if applied to a property expansion (i.e. if="${foo}" will mean "yes, do it"
if ${foo} expands to true, in Ant 1.7.1 it would mean "no" unless a
property named "true" existed). This adds "testing conditions" as a new
use-case to property expansion.
* A new top-level element <extension-point> assists in writing re-usable
build files that are meant to be imported. <extension-point> has a name and
a dependency-list like <target> and can be used like a <target> from the
command line or a dependency-list but the importing build file can add
targets to the <extension-point>'s depends list.
* Ant now requires Java 1.4 or later new task include provides an alternative
to <import> that should be preferred when you don't want to override any
targets
* numerous bug fixes and improvements as documented in
Bugzilla and in WHATSNEW
- merge the nodeps and trax packages to main one
- build ant-antlr.spec using openjdk
- add ant-apache-xalan2 and ant-testutil
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=16
92 lines
3.6 KiB
Diff
92 lines
3.6 KiB
Diff
--- apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java.sav1 2010-02-01 19:37:34.000000000 -0500
|
|
+++ apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java 2010-03-12 12:31:19.002865860 -0500
|
|
@@ -173,32 +173,12 @@
|
|
* @throws Exception on error
|
|
*/
|
|
public void transform(File infile, File outfile) throws Exception {
|
|
- if (transformer == null) {
|
|
- createTransformer();
|
|
- }
|
|
-
|
|
- InputStream fis = null;
|
|
- OutputStream fos = null;
|
|
- try {
|
|
- fis = new BufferedInputStream(new FileInputStream(infile));
|
|
- fos = new BufferedOutputStream(new FileOutputStream(outfile));
|
|
- StreamResult res = new StreamResult(fos);
|
|
- // not sure what could be the need of this...
|
|
- res.setSystemId(JAXPUtils.getSystemId(outfile));
|
|
- Source src = getSource(fis, infile);
|
|
-
|
|
- // set parameters on each transformation, maybe something has changed
|
|
- //(e.g. value of file name parameter)
|
|
- setTransformationParameters();
|
|
-
|
|
- transformer.transform(src, res);
|
|
- } finally {
|
|
- // make sure to close all handles, otherwise the garbage
|
|
- // collector will close them...whenever possible and
|
|
- // Windows may complain about not being able to delete files.
|
|
- FileUtils.close(fis);
|
|
- FileUtils.close(fos);
|
|
- }
|
|
+ if (logger != null) {
|
|
+ logger.log("The style task is disabled on this platform");
|
|
+ logger.log(
|
|
+ "http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
|
|
+ }
|
|
+ new FileOutputStream(outfile).close();
|
|
}
|
|
|
|
/**
|
|
--- apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java.sav1 2010-02-01 19:37:34.000000000 -0500
|
|
+++ apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java 2010-03-12 12:32:28.812991662 -0500
|
|
@@ -287,45 +287,8 @@
|
|
* @throws BuildException if <code>failonerror</code> is true and an error happens
|
|
*/
|
|
public void execute() throws BuildException {
|
|
- try {
|
|
- int fileProcessed = 0;
|
|
- if (file == null && (filesets.size() == 0)) {
|
|
- throw new BuildException(
|
|
- "Specify at least one source - " + "a file or a fileset.");
|
|
- }
|
|
-
|
|
-
|
|
-
|
|
- if (file != null) {
|
|
- if (file.exists() && file.canRead() && file.isFile()) {
|
|
- doValidate(file);
|
|
- fileProcessed++;
|
|
- } else {
|
|
- String errorMsg = "File " + file + " cannot be read";
|
|
- if (failOnError) {
|
|
- throw new BuildException(errorMsg);
|
|
- } else {
|
|
- log(errorMsg, Project.MSG_ERR);
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
- for (int i = 0; i < filesets.size(); i++) {
|
|
-
|
|
- FileSet fs = (FileSet) filesets.elementAt(i);
|
|
- DirectoryScanner ds = fs.getDirectoryScanner(getProject());
|
|
- String[] files = ds.getIncludedFiles();
|
|
-
|
|
- for (int j = 0; j < files.length; j++) {
|
|
- File srcFile = new File(fs.getDir(getProject()), files[j]);
|
|
- doValidate(srcFile);
|
|
- fileProcessed++;
|
|
- }
|
|
- }
|
|
- onSuccessfulValidation(fileProcessed);
|
|
- } finally {
|
|
- cleanup();
|
|
- }
|
|
+ log("The xmlvalidate task is disabled on this platform");
|
|
+ log("http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
|
|
}
|
|
|
|
/**
|