Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-ant/build.xml,v
retrieving revision 1.306
diff -c -r1.306 build.xml
*** build.xml	7 May 2002 11:08:33 -0000	1.306
--- build.xml	21 May 2002 23:15:42 -0000
***************
*** 283,288 ****
--- 283,291 ----
    <patternset id="needs.jmf">
      <exclude name="${optional.package}/sound/*.java" unless="jmf.present" />
    </patternset>
+   <patternset id="needs.jai">
+     <exclude name="${optional.package}/imagemanip/*.java" unless="jai.present"/>
+   </patternset>
    <patternset id="needs.jdepend">
      <exclude name="${optional.package}/jdepend/*" unless="jdepend.present" />
    </patternset>
***************
*** 362,367 ****
--- 365,373 ----
      <available property="jmf.present"
                 classname="javax.sound.sampled.Clip"
                 classpathref="classpath"/>
+     <available property="jai.present"
+                classname="javax.media.jai.JAI"
+                classpathref="classpath"/>
      <condition property="icontract.present">
          <and>
              <isset property="jdk1.2+"/>
***************
*** 553,558 ****
--- 559,565 ----
        <patternset refid="needs.vaj" />
        <patternset refid="needs.servletapi" />
        <patternset refid="needs.jmf" />
+       <patternset refid="needs.jai"/>
        <patternset refid="needs.xalan2" />
        <patternset refid="needs.jdepend" />
        <patternset refid="needs.sun.tools" />
Index: src/main/org/apache/tools/ant/taskdefs/defaults.properties
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
retrieving revision 1.128
diff -c -r1.128 defaults.properties
*** src/main/org/apache/tools/ant/taskdefs/defaults.properties	30 Apr 2002 14:33:55 -0000	1.128
--- src/main/org/apache/tools/ant/taskdefs/defaults.properties	21 May 2002 23:15:45 -0000
***************
*** 71,76 ****
--- 71,77 ----
  cvstagdiff=org.apache.tools.ant.taskdefs.cvslib.CvsTagDiff
  
  # optional tasks
+ imagemanip=org.apache.tools.ant.taskdefs.optional.imagemanip.ImageManip
  script=org.apache.tools.ant.taskdefs.optional.Script
  netrexxc=org.apache.tools.ant.taskdefs.optional.NetRexxC
  renameext=org.apache.tools.ant.taskdefs.optional.RenameExtensions
Index: src/main/org/apache/tools/ant/types/defaults.properties
===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/types/defaults.properties,v
retrieving revision 1.14
diff -c -r1.14 defaults.properties
*** src/main/org/apache/tools/ant/types/defaults.properties	30 Apr 2002 07:54:57 -0000	1.14
--- src/main/org/apache/tools/ant/types/defaults.properties	21 May 2002 23:15:45 -0000
***************
*** 14,17 ****
  xmlcatalog=org.apache.tools.ant.types.XMLCatalog
  extensionSet=org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet
  extension=org.apache.tools.ant.taskdefs.optional.extension.ExtensionAdapter
! libfileset=org.apache.tools.ant.taskdefs.optional.extension.LibFileSet
\ No newline at end of file
--- 14,25 ----
  xmlcatalog=org.apache.tools.ant.types.XMLCatalog
  extensionSet=org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet
  extension=org.apache.tools.ant.taskdefs.optional.extension.ExtensionAdapter
! libfileset=org.apache.tools.ant.taskdefs.optional.extension.LibFileSet
! #
! # ImageManip DataTypes
! rotate=org.apache.tools.ant.types.optional.imagemanip.Rotate
! rectangle=org.apache.tools.ant.types.optional.imagemanip.Rectangle
! ellipse=org.apache.tools.ant.types.optional.imagemanip.Ellipse
! arc=org.apache.tools.ant.types.optional.imagemanip.Arc
! text=org.apache.tools.ant.types.optional.imagemanip.Text
! draw=org.apache.tools.ant.types.optional.imagemanip.Draw