From 5cd87d016e947e2e2c73ea34372102b78e6a7397 Mon Sep 17 00:00:00 2001
From: Bruce Atherton <bruce@apache.org>
Date: Tue, 18 May 2010 20:12:19 +0000
Subject: [PATCH] Add JAI library through the JBoss public maven repository

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@945860 13f79535-47bb-0310-9956-ffa450edef68
---
 fetch.xml                | 10 +++++++++-
 lib/libraries.properties |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/fetch.xml b/fetch.xml
index cde04b719..d1b5774e7 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -99,6 +99,7 @@ Set -Ddest=LOCATION on the command line
     <macrodef name="f2">
       <attribute name="project" />
       <attribute name="archive" default="@{project}"/>
+      <attribute name="repository" default="${m2.repo}"/>
       <sequential>
         <fail>
         Unknown archive @{archive} -no property @{archive}.version defined.
@@ -112,6 +113,7 @@ Set -Ddest=LOCATION on the command line
           <dependency groupID="@{project}"
             artifactID="@{archive}"
             version="${@{archive}.version}"/>
+          <remoteRepository url="@{repository}" />
         </artifact:dependencies>
         <!-- now we are left with the problem of getting the files
              into our directory -->
@@ -241,9 +243,15 @@ Set -Ddest=LOCATION on the command line
     <f2 project="tomcat" archive="jasper-runtime"/>
     <f2 project="javax.servlet" archive="servlet-api"/>
   </target>
+  
+  <target name="jai" depends="init"
+          description="load java advanced imaging">
+    <f2 project="javax.media" archive="jai-core" repository="http://repository.jboss.org/maven2"/>
+    <f2 project="com.sun.media" archive="jai-codec" repository="http://repository.jboss.org/maven2"/>
+  </target>
 
   <target name="all"
     description="load all the libraries (except jython)"
-    depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc" />
+    depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai" />
 
 </project>
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 226adb0e9..135d22c07 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -26,6 +26,8 @@ m2.antlib.url=${m2.url}/org/apache/maven/${m2.artifact-name}/${m2.version}/${m2.
 #this is the sha1 checksum of the artifact
 m2.sha1.checksum=4e7ddfdb91600e9b59bb965ff8eef2f06015df50
 
+# Repository to use by default for fetching dependencies.
+m2.repo=http://repo1.maven.org/maven2/
 
 #versions of different libraries. Please keep in alphabetical order, except
 #when a specific dependency forces them to be out-of-order
@@ -37,6 +39,8 @@ bsh-core.version=${bsh.version}
 commons-net.version=1.4.1
 commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
+jai-core.version=1.1.3
+jai-codec.version=1.1.3
 jasper-compiler.version=4.1.36
 jasper-runtime.version=${jasper-compiler.version}
 jdepend.version=2.9.1