[jboss-svn-commits] JBL Code SVN: r22689 - in labs/jbossesb/workspace/maeste: product and 1 other directory.

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

Author: maeste
Date: 2008-09-11 16:52:19 -0400 (Thu, 11 Sep 2008)
New Revision: 22689

Modified:
   labs/jbossesb/workspace/maeste/
   labs/jbossesb/workspace/maeste/product/ivy.xml
   labs/jbossesb/workspace/maeste/product/ivysettings.xml
Log:
Merged revisions 22642-22688 via svnmerge from 
https://svn.jboss.org/repos/labs/labs/jbossesb/trunk

........
  r22684 | kevin.conner at jboss.com | 2008-09-11 16:09:02 +0200 (Thu, 11 Sep 2008) | 1 line
  
  Fix mvel/dependencies in ivy: JBESB-2029
........



Property changes on: labs/jbossesb/workspace/maeste
___________________________________________________________________
Name: svnmerge-integrated
   - /labs/jbossesb/trunk:1-22641
   + /labs/jbossesb/trunk:1-22688

Modified: labs/jbossesb/workspace/maeste/product/ivy.xml
===================================================================
--- labs/jbossesb/workspace/maeste/product/ivy.xml	2008-09-11 16:04:27 UTC (rev 22688)
+++ labs/jbossesb/workspace/maeste/product/ivy.xml	2008-09-11 20:52:19 UTC (rev 22689)
@@ -44,7 +44,7 @@
         </dependency>
         <dependency org="org.apache.juddi" name="juddi-client" rev="2.0rc5"/>
         <dependency org="log4j" name="log4j" rev="1.2.14"/>
-        <dependency org="org.mvel" name="mvel" rev="1.3.3-java1.5"/>
+        <dependency org="org.codehaus.mvel" name="mvel" rev="1.3.3-java1.5"/>
 
         <dependency org="ognl" name="ognl" rev="2.6.9"/>
         <dependency org="quartz" name="quartz" rev="1.5.2">

Modified: labs/jbossesb/workspace/maeste/product/ivysettings.xml
===================================================================
--- labs/jbossesb/workspace/maeste/product/ivysettings.xml	2008-09-11 16:04:27 UTC (rev 22688)
+++ labs/jbossesb/workspace/maeste/product/ivysettings.xml	2008-09-11 20:52:19 UTC (rev 22689)
@@ -5,7 +5,16 @@
             <url name="jboss" m2compatible="true">
                 <artifact pattern="http://repository.jboss.org/maven2/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
             </url>
-            <ibiblio name="ibiblio" m2compatible="true" usepoms="false"/>
+            <ibiblio name="ibiblio" m2compatible="true"/> 
+            <url name="milyn" m2compatible="true">
+                <artifact pattern="http://dist.codehaus.org/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+            </url>
         </chain>
+        <url name="mvel" m2compatible="true">
+            <artifact pattern="http://repo1.maven.org/maven2/org/mvel/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+        </url>
     </resolvers>
+    <modules>
+        <module organisation="org.codehaus.mvel" name="mvel" resolver="mvel"/>
+    </modules>
 </ivysettings>