[jboss-cvs] JBossAS SVN: r104685 - in projects/jboss-jca/trunk: doc/developerguide/en/modules and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2010-05-11 10:53:23 -0400 (Tue, 11 May 2010)
New Revision: 104685

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml
Log:
[JBJCA-327] [JBJCA-328] Automatically download and install Ivy

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2010-05-11 14:37:55 UTC (rev 104684)
+++ projects/jboss-jca/trunk/build.xml	2010-05-11 14:53:23 UTC (rev 104685)
@@ -37,6 +37,13 @@
   <property name="type" value="Alpha12"/>
 
   <!-- ================================= 
+       Ivy              
+       ================================= -->
+  <property name="ivy.version" value="2.1.0"/>
+  <property name="ivy.dir" value="${user.home}/.ivy2/cache/org.apache.ivy/jars"/>
+  <property name="ivy.jar.name" value="ivy-${ivy.version}.jar"/>
+
+  <!-- ================================= 
        Repositories              
        ================================= -->
   <property name="central.repo" value="http://repo1.maven.org/maven2"/>
@@ -75,7 +82,7 @@
        Versions              
        ================================= -->
   <property name="version.activation" value="1.1.1"/>
-  <property name="version.ant" value="1.7.1"/>
+  <property name="version.ant" value="1.8.1"/>
   <property name="version.apache-log4j" value="1.2.16"/>
   <property name="version.apache-logging" value="1.1.0.jboss"/>
   <property name="version.apache-xerces" value="2.9.1"/>
@@ -182,6 +189,13 @@
        Target: init              
        ================================= -->
   <target name="init">
+    <!-- Bootstrap Ivy -->
+    <mkdir dir="${ivy.dir}"/>
+    <get usetimestamp="true" src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/${ivy.jar.name}" 
+         skipexisting="true"
+         dest="${ivy.dir}/${ivy.jar.name}"/>
+    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.dir}/${ivy.jar.name}"/>
+
     <ivy:settings file="${basedir}/ivy.settings.xml"/>
 
     <fail message="JBoss JCA requires JDK6+" unless="HAVE_JDK_1.6"/>

Modified: projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml	2010-05-11 14:37:55 UTC (rev 104684)
+++ projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml	2010-05-11 14:53:23 UTC (rev 104685)
@@ -32,7 +32,7 @@
 
     <section id="ant">
       <title>Apache Ant</title>
-      <para>You must have Apache Ant 1.7.1+ installed on your system.</para>
+      <para>You must have Apache Ant 1.8.1+ installed on your system.</para>
       <para>Remember to ensure that "ant" are in your path (or symlinked).</para>
 
       <programlisting>
@@ -47,20 +47,11 @@
 
     <section id="ivy">
       <title>Apache Ivy</title>
-      <para>You must have Apache Ivy 2.1.0-RC2+ installed in your Apache Ant installation.</para>
+      <para>The JBoss JCA project uses Apache Ivy for dependency management.</para>
 
-      <programlisting>
-cp ivy.jar $ANT_HOME/lib
-      </programlisting>
+      <para>Apache Ivy is automatically downloaded and included in the development
+        environment, so no additional setup is required.</para>
 
-      <para>If you have problems in building the JBoss JCA project checkout the Apache Ivy source code 
-        from trunk and build it yourself.</para>
-
-      <programlisting>
-svn co http://svn.apache.org/repos/asf/ant/ivy/core/trunk ivy
-ant jar
-      </programlisting>
-
     </section>
 
     <section id="subversion">