[Jpackage-commits] dist/ant/devel .cvsignore, 1.1, 1.2 ant.spec, NONE, 1.1 apache-ant-1.7.ant.conf, NONE, 1.1 apache-ant-bz163689.patch, NONE, 1.1 apache-ant-jars.patch, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Tue May 27 00:40:09 CEST 2008


Update of /home/projects/jpackage/cvs/dist/ant/devel
In directory ryu.zarb.org:/tmp/cvs-serv32187/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ant.spec apache-ant-1.7.ant.conf apache-ant-bz163689.patch 
	apache-ant-jars.patch 
Log Message:
Import from JPP 1.7

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ant/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	26 May 2008 22:37:06 -0000	1.1
--- .cvsignore	26 May 2008 22:40:06 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ apache-ant-1.7.0-src.tar.gz

--- NEW FILE: apache-ant-jars.patch ---
--- apache-ant-1.7.0/build.xml.orig	2007-06-20 14:17:16.000000000 -0400
+++ apache-ant-1.7.0/build.xml	2007-06-20 14:17:39.000000000 -0400
@@ -769,6 +769,7 @@
             <selector refid="needs.jdk1.5+"/>
             <selector refid="needs.javamail"/>
             <selector refid="ant.launcher"/>
+            <selector refid="needs.apache-resolver"/>
           </or>
         </selector>
       </not>
@@ -848,6 +849,7 @@
             <selector refid="needs.jdepend"/>
             <selector refid="needs.swing"/>
             <selector refid="needs.jsch"/>
+            <selector refid="ant.launcher"/>
           </or>
         </not>
       </and>

--- NEW FILE: apache-ant-bz163689.patch ---
--- apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java~	2004-07-16 08:57:36.000000000 +0100
+++ apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java	2005-07-21 17:05:18.000000000 +0100
@@ -119,39 +119,12 @@
     }
 
     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);
-            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.
-            try {
-                if (fis != null) {
-                    fis.close();
-                }
-            } catch (IOException ignored) {
-                // ignore
-            }
-            try {
-                if (fos != null) {
-                    fos.close();
-                }
-            } catch (IOException ignored) {
-                // ignore
-            }
+        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.6.2/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java~	2004-07-16 08:57:36.000000000 +0100
+++ apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java	2005-07-21 17:37:23.000000000 +0100
@@ -272,35 +272,8 @@
                 "Specify at least one source - " + "a file or a fileset.");
         }
 
-        initValidator();
-
-        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++;
-            }
-        }
-        log(fileProcessed + " file(s) have been successfully validated.");
+        log("The xmlvalidate task is disabled on this platform");
+        log("http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689");
     }
 
     /**

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ant/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	26 May 2008 22:37:06 -0000	1.1
--- sources	26 May 2008 22:40:06 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 769e022280e6bb1c9615adf336366e9f  apache-ant-1.7.0-src.tar.gz

--- NEW FILE: ant.spec ---
# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
[...1580 lines suppressed...]
- changed name to ant
- changed javadir to /usr/share/java
- dropped jdk and jre requirement
- corrected require to jaxp
- added Jikes support
- used our own bash script
- dropped perl script
- dropped ant home directory

* Sun Jan 14 2001 Guillaume Rousse <g.rousse at linux-mandrake.com> 1.2-3mdk
- changed name to jakarta-ant
- changed group to Development/Java

* Wed Jan 04 2001 Guillaume Rousse <g.rousse at linux-mandrake.com> 1.2-2mdk
- new spec file
- discarded ugly non-free Sun jaxp library from sources, and used pretty open-source xerces instead

* Wed Dec 20 2000 Guillaume Rousse <g.rousse at linux-mandrake.com> 1.2-1mdk
- first Mandrake release
- used SRPMS from Henri Gomez <hgomez at users.sourceforge.net>

--- NEW FILE: apache-ant-1.7.ant.conf ---
#
# ant.conf (Ant 1.6.x)
# JPackage Project <http://www.jpackage.org/>
#

# Validate --noconfig setting in case being invoked
# from pre Ant 1.6.x environment
if [ -z "$no_config" ] ; then
  no_config=true
fi

# Setup ant configuration
if $no_config ; then
  # Disable RPM layout
  rpm_mode=false
else
  # Use RPM layout
  rpm_mode=true

  # ANT_HOME for rpm layout
  ANT_HOME=/usr/share/ant
fi




More information about the JPackage-commits mailing list