[jboss-cvs] JBossAS SVN: r103323 - in projects/ejb3/trunk/ivy: src/main/ant and 1 other directory.

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

Author: wolfc
Date: 2010-03-31 09:01:50 -0400 (Wed, 31 Mar 2010)
New Revision: 103323

Added:
   projects/ejb3/trunk/ivy/bootstrap-ivy.xml
Modified:
   projects/ejb3/trunk/ivy/find-rev.xml
   projects/ejb3/trunk/ivy/src/main/ant/maven-ant-tasks.xml
Log:
EJBTHREE-1744: improved the bootstrap

Added: projects/ejb3/trunk/ivy/bootstrap-ivy.xml
===================================================================
--- projects/ejb3/trunk/ivy/bootstrap-ivy.xml	                        (rev 0)
+++ projects/ejb3/trunk/ivy/bootstrap-ivy.xml	2010-03-31 13:01:50 UTC (rev 103323)
@@ -0,0 +1,38 @@
+<!--
+   vi:ts=3:sw=3:expandtab:
+-->
+<project name="jboss-ivy-bootstrap" 
+   xmlns:ivy="antlib:org.apache.ivy.ant"
+   xmlns:ivyboot="antlib:org.apache.ivy.ant.bootstrap"
+   default="find-revision">
+
+   <!-- Bootstrap Ivy -->
+   <property name="ivy.version" value="2.0.0"/>
+   <property name="jboss-ejb3-ivy.version" value="1.0-SNAPSHOT"/>
+   <property name="ivy.dir" value="${user.home}/.ivy2/cache/org.apache.ivy/jars"/>
+   <property name="ivy.jar.name" value="ivy-${ivy.version}.jar"/>
+   <mkdir dir="${ivy.dir}"/>
+   <!-- skipexisting needs ant 1.8 -->
+   <get usetimestamp="true" src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/${ivy.jar.name}" dest="${ivy.dir}/${ivy.jar.name}"/>
+   <taskdef
+      classpath="${ivy.dir}/${ivy.jar.name}"
+      uri="antlib:org.apache.ivy.ant.bootstrap"
+      resource="org/apache/ivy/ant/antlib.xml"/>
+   <!-- make sure we can get to snapshots.jboss.org and repository.jboss.org -->
+   <!-- TODO: download ivysettings.xml (and other bits referenced) from somewhere -->
+   <ivyboot:settings
+      id="ivy.bootstrap.settings"
+      file="src/main/ivy/ivysettings.xml"/>
+   <ivyboot:cachepath
+      pathid="jboss-ejb3-ivy.classpath"
+      organisation="org.jboss.ejb3"
+      module="jboss-ejb3-ivy"
+      revision="${jboss-ejb3-ivy.version}"
+      inline="true"
+      settingsRef="ivy.bootstrap.settings"
+      log="download-only"/>
+   <taskdef
+      classpathref="jboss-ejb3-ivy.classpath"
+      uri="antlib:org.apache.ivy.ant"
+      resource="org/apache/ivy/ant/antlib.xml"/>
+</project>


Property changes on: projects/ejb3/trunk/ivy/bootstrap-ivy.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: projects/ejb3/trunk/ivy/find-rev.xml
===================================================================
--- projects/ejb3/trunk/ivy/find-rev.xml	2010-03-31 13:01:03 UTC (rev 103322)
+++ projects/ejb3/trunk/ivy/find-rev.xml	2010-03-31 13:01:50 UTC (rev 103323)
@@ -6,24 +6,12 @@
    xmlns:maven="urn:maven-artifact-ant"
    default="find-revision">
 
-   <!-- Bootstrap Ivy -->
-   <property name="ivy.version" value="2.0.0"/>
-   <property name="ivy.dir" value="${user.home}/.ivy2/cache/org.apache.ivy/jars"/>
-   <property name="ivy.jar.name" value="ivy-${ivy.version}.jar"/>
-   <mkdir dir="${ivy.dir}"/>
-   <!-- skipexisting needs ant 1.8 -->
-   <get usetimestamp="true" src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/${ivy.jar.name}" 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};target/classes"/>
+   <import file="bootstrap-ivy.xml"/>
 
    <!-- Setup Ivy -->
    <!-- Load settings -->
    <ivy:settings file="src/test/resources/ivysettings.xml"/>
 
-   <!--
-   <import file="src/main/ant/maven-ant-tasks.xml"/>
-   <import file="src/main/ant/xpath-task.xml"/>
-   -->
-
    <target name="find-revision" description="Find the latest revision of a module matching a given version constraint.">
       <ivy:findrevision organisation="${organisation}" module="${module}" revision="${revision}"/>
       <echo message="${ivy.revision}"/>

Modified: projects/ejb3/trunk/ivy/src/main/ant/maven-ant-tasks.xml
===================================================================
--- projects/ejb3/trunk/ivy/src/main/ant/maven-ant-tasks.xml	2010-03-31 13:01:03 UTC (rev 103322)
+++ projects/ejb3/trunk/ivy/src/main/ant/maven-ant-tasks.xml	2010-03-31 13:01:50 UTC (rev 103323)
@@ -9,14 +9,16 @@
       module="maven-ant-tasks"
       revision="2.0.9"
       inline="true"
-      conf="default"/>
+      conf="default"
+      log="download-only"/>
    <ivy:cachepath
       pathid="maven-wagon-webdav.classpath"
       organisation="org.apache.maven.wagon"
       module="wagon-webdav"
       revision="1.0-beta-2"
       inline="true"
-      conf="default"/>
+      conf="default"
+      log="download-only"/>
    <path id="maven-ant-full.classpath">
       <path refid="maven-ant-tasks.classpath"/>
       <path refid="maven-wagon-webdav.classpath"/>