[jboss-svn-commits] JBL Code SVN: r25105 - labs/jbossesb/trunk/product.

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

Author: kevin.conner at jboss.com
Date: 2009-02-04 11:51:29 -0500 (Wed, 04 Feb 2009)
New Revision: 25105

Modified:
   labs/jbossesb/trunk/product/ivy-build.xml
   labs/jbossesb/trunk/product/ivy.xml
   labs/jbossesb/trunk/product/ivysettings.xml
Log:
Use ivy for smooks: JBESB-2335

Modified: labs/jbossesb/trunk/product/ivy-build.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy-build.xml	2009-02-04 16:06:59 UTC (rev 25104)
+++ labs/jbossesb/trunk/product/ivy-build.xml	2009-02-04 16:51:29 UTC (rev 25105)
@@ -1,4 +1,4 @@
-<project name="Dependencies" default="retrieve" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:artifact="urn:maven-artifact-ant">
+<project name="Dependencies" default="retrieve" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <property name="ivy.lib.dir" value="${basedir}/build/lib" />
     <path id="classpath.ivy">
@@ -12,10 +12,6 @@
 
     <target name="retrieve" depends="ivy.init">
         <ivy:retrieve />
-
-        <!-- We have to get the Smooks dependencies manually due to an issue with Ivy.  See ivy.xml. -->
-        <antcall target="smooks.dependencies.get" />
-
     </target>
 
     <target name="clean" depends="ivy.init">
@@ -30,48 +26,4 @@
         <ivy:report todir="${ivy.lib.dir}"/>
     </target>
 
-    <property environment="env"/>
-    <property name="smooks.version" value="1.1"/>
-    <property name="maven.ant.version" value="2.0.9"/>
-    <property name="maven.dir" value="org/apache/maven/maven-ant-tasks/${maven.ant.version}"/>
-    <property name="maven.jar" value="maven-ant-tasks-${maven.ant.version}.jar"/>
-    <pathconvert targetos="unix" property="maven.repo.dir">
-        <path>
-            <pathelement location="${user.home}/.m2/repository"/>
-        </path>
-    </pathconvert>
-    <pathconvert targetos="unix" property="maven.ant.repo.dir">
-        <path>
-            <pathelement location="${maven.repo.dir}/${maven.dir}"/>
-        </path>
-    </pathconvert>
-    <condition property="maven.exists.locally">
-        <available file="${maven.ant.repo.dir}/${maven.jar}"/>
-    </condition>
-
-    <target name="smooks.dependencies.get">
-        <mkdir dir="${maven.ant.repo.dir}"/>
-        <antcall target="maven.get"/>
-
-        <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpath="${maven.ant.repo.dir}/${maven.jar}"/>
-        <artifact:remoteRepository id="m2.repo" url="http://repo1.maven.org/maven2" />
-        <artifact:localRepository id="local.repository" path="${maven.repo.dir}"/>
-        <artifact:dependencies filesetId="dependencies">
-            <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-commons" />
-            <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-core" />
-            <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-javabean"/>
-            <localRepository refid="local.repository" />
-            <remoteRepository refid="m2.repo" />            
-        </artifact:dependencies>
-
-        <copy todir="${ivy.lib.dir}">
-            <fileset refid="dependencies"/>
-            <mapper type="flatten"/>
-        </copy>
-    </target>
-
-    <target name="maven.get" unless="maven.exists.locally">
-        <get src="http://repo1.maven.org/maven2/${maven.dir}/${maven.jar}" dest="${maven.ant.repo.dir}/${maven.jar}" usetimestamp="true"/>
-    </target>
-
 </project>

Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml	2009-02-04 16:06:59 UTC (rev 25104)
+++ labs/jbossesb/trunk/product/ivy.xml	2009-02-04 16:51:29 UTC (rev 25105)
@@ -68,7 +68,9 @@
         <dependency org="beanshell" name="bsh" rev="1.3.0"/>
 	
 		<!-- Smooks dependencies -->
-        <!-- See ivy-build.xml: We get the smooks using ant "get". Ivy has issues with parsing POMs that use variables for version numbers.  Not able to resolve them it seems :( -->
+        <dependency org="org.milyn" name="milyn-commons" rev="1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-core" rev="1.1"/>
+        <dependency org="org.milyn" name="milyn-smooks-javabean" rev="1.1"/>
 
         <dependency org="javax.jcr" name="jcr" rev="1.0"/>
 

Modified: labs/jbossesb/trunk/product/ivysettings.xml
===================================================================
--- labs/jbossesb/trunk/product/ivysettings.xml	2009-02-04 16:06:59 UTC (rev 25104)
+++ labs/jbossesb/trunk/product/ivysettings.xml	2009-02-04 16:51:29 UTC (rev 25105)
@@ -13,8 +13,12 @@
         <url name="mvel" m2compatible="true">
             <artifact pattern="http://repo1.maven.org/maven2/org/mvel/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
         </url>
+        <url name="smooks" m2compatible="true">
+            <artifact pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+        </url>
     </resolvers>
     <modules>
         <module organisation="org.codehaus.mvel" name="mvel" resolver="mvel"/>
+        <module organisation="org.milyn" name="*" resolver="smooks"/>
     </modules>
 </ivysettings>