ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r662776 - in /ant/ivy/core/trunk: ./ src/java/org/apache/ivy/plugins/parser/xml/ test/java/org/apache/ivy/core/resolve/ test/java/org/apache/ivy/plugins/parser/xml/ test/repositories/branches/bar/bar1/trunk/5/ test/repositories/branches/bar...
Date Tue, 03 Jun 2008 12:42:22 GMT
Author: xavier
Date: Tue Jun  3 05:42:21 2008
New Revision: 662776

URL: http://svn.apache.org/viewvc?rev=662776&view=rev
Log:
FIX: dynamic resolveMode not being dynamic on branch (IVY-825)

Added:
    ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/
    ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/bar1.jar   (with props)
    ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/ivy.xml   (with props)
    ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/
    ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/bar1.jar   (with props)
    ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/ivy.xml   (with props)
Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/ivy.xsd
    ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
    ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java
    ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
    ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
    ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml
    ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml
    ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test.xml
    ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Tue Jun  3 05:42:21 2008
@@ -81,6 +81,7 @@
 - IMPROVEMENT: Change allownomd and skipbuildwithoutivy into a more semantically correct
name (IVY-297)
 - IMPROVEMENT: Smarter determination if an expression is exact or not for RegexpPatternMatcher
and GlobPatternMatcher
 
+- FIX: dynamic resolveMode not being dynamic on branch (IVY-825)
 - FIX: Filesystem repositories can not have () in the path (IVY-797)
 - FIX: Type tag in poms not supported (IVY-762)
 - FIX: An empty exclusion tag results in an IllegalArgumentException (IVY-821)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
Tue Jun  3 05:42:21 2008
@@ -70,7 +70,7 @@
  */
 public final class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser {
     static final String[] DEPENDENCY_REGULAR_ATTRIBUTES = new String[] {"org", "name", "branch",
-            "rev", "revConstraint", "force", "transitive", "changing", "conf"};
+            "branchConstraint", "rev", "revConstraint", "force", "transitive", "changing",
"conf"};
 
     private static final XmlModuleDescriptorParser INSTANCE = new XmlModuleDescriptorParser();
 
@@ -507,6 +507,7 @@
 
             String name = ivy.substitute(attributes.getValue("name"));
             String branch = ivy.substitute(attributes.getValue("branch"));
+            String branchConstraint = ivy.substitute(attributes.getValue("branchConstraint"));
             String rev = ivy.substitute(attributes.getValue("rev"));
             String revConstraint = ivy.substitute(attributes.getValue("revConstraint"));
             revConstraint = revConstraint == null ? rev : revConstraint;
@@ -515,7 +516,8 @@
             dd = new DefaultDependencyDescriptor(
                 getMd(), 
                 ModuleRevisionId.newInstance(org, name, branch, rev, extraAttributes), 
-                ModuleRevisionId.newInstance(org, name, branch, revConstraint, extraAttributes),

+                ModuleRevisionId.newInstance(
+                    org, name, branchConstraint, revConstraint, extraAttributes), 
                 force, changing, transitive);
             getMd().addDependency(dd);
             String confs = ivy.substitute(attributes.getValue("conf"));

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
Tue Jun  3 05:42:21 2008
@@ -349,6 +349,8 @@
             org = org == null ? organisation : org;
             String module = substitute(settings, attributes.getValue("name"));
             String branch = substitute(settings, attributes.getValue("branch"));
+            String branchConstraint = substitute(settings, attributes.getValue("branchConstraint"));
+            branchConstraint = branchConstraint == null ? branch : branchConstraint;
             
             // look for the branch used in resolved revisions
             if (branch == null) {
@@ -371,12 +373,8 @@
                 XmlModuleDescriptorParser.DEPENDENCY_REGULAR_ATTRIBUTES);
             ModuleRevisionId localMrid = ModuleRevisionId.newInstance(org, module, branch,
                 revision, extraAttributes);
-            ModuleRevisionId localConstraintMrid = ModuleRevisionId.newInstance(org, module,
branch,
-                revisionConstraint, extraAttributes);
             ModuleRevisionId systemMrid = ns == null ? localMrid : ns.getToSystemTransformer()
                     .transform(localMrid);
-            ModuleRevisionId systemConstraintMrid = ns == null ? localConstraintMrid 
-                    : ns.getToSystemTransformer().transform(localConstraintMrid);
 
             for (int i = 0; i < attributes.getLength(); i++) {
                 String attName = attributes.getQName(i);
@@ -384,6 +382,10 @@
                     String rev = (String) resolvedRevisions.get(systemMrid);
                     if (rev != null) {
                         write(" rev=\"" + rev + "\"");
+                        if (attributes.getIndex("branchConstraint") == -1 
+                                && branchConstraint != null) {
+                            write(" branchConstraint=\"" + branchConstraint + "\"");
+                        }
                         if (attributes.getIndex("revConstraint") == -1 
                                 && !rev.equals(systemMrid.getRevision())) {
                             write(" revConstraint=\"" + systemMrid.getRevision() + "\"");
@@ -399,6 +401,8 @@
                     write(" name=\"" + systemMrid.getName() + "\"");
                 } else if ("branch".equals(attName)) {
                     write(" branch=\"" + systemMrid.getBranch() + "\"");
+                } else if ("branchConstraint".equals(attName)) {
+                    write(" branchConstraint=\"" + branchConstraint + "\"");
                 } else if ("conf".equals(attName)) {
                     String oldMapping = substitute(settings, attributes.getValue("conf"));
                     if (oldMapping.length() > 0) {

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
Tue Jun  3 05:42:21 2008
@@ -97,10 +97,18 @@
                     + XMLHelper.escape(dds[i].getDependencyRevisionId().getOrganisation())
+ "\"");
                 out.print(" name=\"" 
                     + XMLHelper.escape(dds[i].getDependencyRevisionId().getName()) + "\"");
+                if (dds[i].getDependencyRevisionId().getBranch() != null) {
+                    out.print(" branch=\"" 
+                        + XMLHelper.escape(dds[i].getDependencyRevisionId().getBranch())
+ "\"");
+                }
                 out.print(" rev=\"" 
                     + XMLHelper.escape(dds[i].getDependencyRevisionId().getRevision()) +
"\"");
                 if (!dds[i].getDynamicConstraintDependencyRevisionId()
                         .equals(dds[i].getDependencyRevisionId())) {
+                    if (dds[i].getDynamicConstraintDependencyRevisionId().getBranch() !=
null) {
+                        out.print(" branchConstraint=\"" + XMLHelper.escape(
+                             dds[i].getDynamicConstraintDependencyRevisionId().getBranch())
+ "\"");
+                    }
                     out.print(" revConstraint=\"" + XMLHelper.escape(
                         dds[i].getDynamicConstraintDependencyRevisionId().getRevision())
+ "\"");
                 }

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/ivy.xsd
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/ivy.xsd?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/ivy.xsd (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/ivy.xsd Tue Jun  3 05:42:21
2008
@@ -219,6 +219,7 @@
 						            <xs:attribute name="org" type="xs:string"/>
 						            <xs:attribute name="name" type="xs:string" use="required"/>
 						            <xs:attribute name="branch" type="xs:string"/>
+						            <xs:attribute name="branchConstraint" type="xs:string"/>
 						            <xs:attribute name="rev" type="xs:string" use="required"/>
 						            <xs:attribute name="revConstraint" type="xs:string"/>
 						            <xs:attribute name="force" type="xs:boolean"/>

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java Tue Jun  3 05:42:21
2008
@@ -2630,6 +2630,34 @@
         assertTrue(getArchiveFileInCache("org1", "mod1.2", "2.2", "mod1.2", "jar", "jar").exists());
     }
 
+    public void testResolveModeDynamicWithBranch1() throws Exception {
+        // bar1;5 -> foo1#branch1|;2|[0,4]
+        Ivy ivy = new Ivy();
+        ivy.configure(new File("test/repositories/branches/ivysettings.xml"));
+
+        ResolveReport report = ivy.resolve(new File(
+                "test/repositories/branches/bar/bar1/trunk/5/ivy.xml").toURL(), 
+                getResolveOptions(new String[] {"*"})
+                .setResolveMode(ResolveOptions.RESOLVEMODE_DYNAMIC));
+        assertFalse(report.hasError());
+
+        assertTrue(getArchiveFileInCache(ivy, "foo#foo1#trunk;3", "foo1", "jar", "jar").exists());
+    }
+
+    public void testResolveModeDynamicWithBranch2() throws Exception {
+        // bar1;5 -> foo1#trunk|branch1;3|[0,4]
+        Ivy ivy = new Ivy();
+        ivy.configure(new File("test/repositories/branches/ivysettings.xml"));
+
+        ResolveReport report = ivy.resolve(new File(
+                "test/repositories/branches/bar/bar1/trunk/6/ivy.xml").toURL(), 
+                getResolveOptions(new String[] {"*"})
+                .setResolveMode(ResolveOptions.RESOLVEMODE_DYNAMIC));
+        assertFalse(report.hasError());
+
+        assertTrue(getArchiveFileInCache(ivy, "foo#foo1#branch1;4", "foo1", "jar", "jar").exists());
+    }
+
     public void testResolveModeDefaultOverrideSettings() throws Exception {
         // same as ResolveModeDynamic2, but resolve mode is set in settings, and overriden
when calling resolve
         Map attributes = new HashMap();

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java
Tue Jun  3 05:42:21 2008
@@ -264,9 +264,11 @@
         dd = getDependency(dependencies, "yourmodule1");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
+        assertEquals("trunk", dd.getDependencyRevisionId().getBranch());
         assertEquals("1.1", dd.getDependencyRevisionId().getRevision());
+        assertEquals("branch1", dd.getDynamicConstraintDependencyRevisionId().getBranch());
         assertEquals("1+", dd.getDynamicConstraintDependencyRevisionId().getRevision());
-        assertEquals("yourorg#yourmodule1;1+", dd.getDynamicConstraintDependencyRevisionId().toString());
+        assertEquals("yourorg#yourmodule1#branch1;1+", dd.getDynamicConstraintDependencyRevisionId().toString());
         
         assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd
                 .getModuleConfigurations()));

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
Tue Jun  3 05:42:21 2008
@@ -56,8 +56,9 @@
         File dest = new File("build/updated-test.xml");
         dest.deleteOnExit();
         Map resolvedRevisions = new HashMap();
-        resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg", "yourmodule2", "2+"),
"2.5");
-        resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg", "yourmodule6",
+        resolvedRevisions.put(ModuleRevisionId.newInstance(
+            "yourorg", "yourmodule2", "branch1", "2+"), "2.5");
+        resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg", "yourmodule6", 
             "latest.integration"), "6.3");
 
         GregorianCalendar cal = new GregorianCalendar();
@@ -87,7 +88,8 @@
         File dest = new File("build/updated-test2.xml");
         dest.deleteOnExit();
         Map resolvedRevisions = new HashMap();
-        resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg", "yourmodule2", "2+"),
"2.5");
+        resolvedRevisions.put(ModuleRevisionId.newInstance(
+            "yourorg", "yourmodule2", "branch1", "2+"), "2.5");
         resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg", "yourmodule6",
             "latest.integration"), "6.3");
 

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
(original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
Tue Jun  3 05:42:21 2008
@@ -60,8 +60,8 @@
 	<dependencies>
 		<dependency name="${mymodule2}" rev="${mymodule2rev}"/>
 		<dependency name="mymodule3" rev="2.0" changing="${changing}" transitive="${transitive}"/>
-		<dependency org="yourorg" name="yourmodule1" rev="1.1" revConstraint="1+" conf="${myvar}"/>
-		<dependency org="yourorg" name="yourmodule2" rev="2+" conf="myconf1->yourconf1"/>
+		<dependency org="yourorg" name="yourmodule1" branch="trunk" rev="1.1" branchConstraint="branch1"
revConstraint="1+" conf="${myvar}"/>
+		<dependency org="yourorg" name="yourmodule2" branch="branch1" rev="2+" conf="myconf1->yourconf1"/>
 		<dependency org="yourorg" name="yourmodule3" rev="3.1" conf="myconf1->yourconf1,
yourconf2"/>
 		<dependency org="yourorg" name="yourmodule4" rev="4.1" conf="myconf1, myconf2->yourconf1,
yourconf2"/>
 		<dependency org="yourorg" name="yourmodule5" rev="5.1" conf="myconf1->yourconf1;myconf2->yourconf1,
yourconf2"/>

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml Tue Jun
 3 05:42:21 2008
@@ -60,8 +60,8 @@
 	<dependencies>
 		<dependency name="mymodule2" rev="2.0"/>
 		<dependency name="mymodule3" rev="2.0" changing="true" transitive="false"/>
-		<dependency org="yourorg" name="yourmodule1" rev="1.1" revConstraint="1+" conf="myconf1"/>
-		<dependency org="yourorg" name="yourmodule2" rev="2+" conf="myconf1->yourconf1"/>
+		<dependency org="yourorg" name="yourmodule1" branch="trunk" rev="1.1" branchConstraint="branch1"
revConstraint="1+" conf="myconf1"/>
+		<dependency org="yourorg" name="yourmodule2" branch="branch1" rev="2+" conf="myconf1->yourconf1"/>
 		<dependency org="yourorg" name="yourmodule3" rev="3.1" conf="myconf1->yourconf1,
yourconf2"/>
 		<dependency org="yourorg" name="yourmodule4" rev="4.1" conf="myconf1, myconf2->yourconf1,
yourconf2"/>
 		<dependency org="yourorg" name="yourmodule5" rev="5.1" conf="myconf1->yourconf1;myconf2->yourconf1,
yourconf2"/>

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml Tue
Jun  3 05:42:21 2008
@@ -43,7 +43,7 @@
 	<dependencies>
 		<dependency org="myorg" name="mymodule2" rev="2.0" conf="*->*" e:attr4="value4"/>
 		<dependency org="myorg" name="mymodule3" rev="2.0" changing="true" transitive="false"
conf="*->*"/>
-		<dependency org="yourorg" name="yourmodule1" rev="1.1" revConstraint="1+" conf="myconf1->myconf1"/>
+		<dependency org="yourorg" name="yourmodule1" branch="trunk" rev="1.1" branchConstraint="branch1"
revConstraint="1+" conf="myconf1->myconf1"/>
 		<dependency org="yourorg" name="yourmodule2" rev="2+" conf="myconf1->yourconf1"/>
 		<dependency org="yourorg" name="yourmodule3" rev="3.1" conf="myconf1->yourconf1,yourconf2"/>
 		<dependency org="yourorg" name="yourmodule4" rev="4.1" conf="myconf1->yourconf1,yourconf2;myconf2->yourconf1,yourconf2"/>

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test.xml?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test.xml Tue Jun  3 05:42:21
2008
@@ -58,7 +58,7 @@
 	<dependencies>
 		<dependency name="mymodule2" rev="2.0" e:attr4="value4"/>
 		<dependency name="mymodule3" rev="2.0" changing="true" transitive="false"/>
-		<dependency org="yourorg" name="yourmodule1" rev="1.1" revConstraint="1+" conf="myconf1"/>
+		<dependency org="yourorg" name="yourmodule1" branch="trunk" rev="1.1" branchConstraint="branch1"
revConstraint="1+" conf="myconf1"/>
 		<dependency org="yourorg" name="yourmodule2" rev="2+" conf="myconf1->yourconf1"/>
 		<dependency org="yourorg" name="yourmodule3" rev="3.1" conf="myconf1->yourconf1,
yourconf2"/>
 		<dependency org="yourorg" name="yourmodule4" rev="4.1" conf="myconf1, myconf2->yourconf1,
yourconf2"/>

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml?rev=662776&r1=662775&r2=662776&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml Tue Jun  3
05:42:21 2008
@@ -56,8 +56,8 @@
 	<dependencies defaultconfmapping="*->@">
 		<dependency name="mymodule2" rev="2.0"/>
 		<dependency name="mymodule3" rev="2.0" changing="true" transitive="false"/>
-		<dependency org="yourorg" name="yourmodule1" rev="1.1" revConstraint="1+" conf="myconf1"/>
-		<dependency org="yourorg" name="yourmodule2" rev="2.5" revConstraint="2+" conf="myconf1->yourconf1"/>
+		<dependency org="yourorg" name="yourmodule1" branch="trunk" rev="1.1" branchConstraint="branch1"
revConstraint="1+" conf="myconf1"/>
+		<dependency org="yourorg" name="yourmodule2" branch="branch1" rev="2.5" branchConstraint="branch1"
revConstraint="2+" conf="myconf1->yourconf1"/>
 		<dependency org="yourorg" name="yourmodule3" rev="3.1" conf="myconf1->yourconf1,
yourconf2"/>
 		<dependency org="yourorg" name="yourmodule4" rev="4.1" conf="myconf1, myconf2->yourconf1,
yourconf2"/>
 		<dependency org="yourorg" name="yourmodule5" rev="5.1" conf="myconf1->yourconf1;myconf2->yourconf1,
yourconf2"/>

Added: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/bar1.jar
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/bar1.jar?rev=662776&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/bar1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/ivy.xml?rev=662776&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/ivy.xml (added)
+++ ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/ivy.xml Tue Jun  3 05:42:21
2008
@@ -0,0 +1,25 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="1.4">
+	<info organisation="bar" module="bar1" revision="5"/>
+	<dependencies>
+		<dependency org="foo" name="foo1" branch="branch1" rev="2" 
+		                                  revConstraint="[0,4]" />
+	</dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/5/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/bar1.jar
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/bar1.jar?rev=662776&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/bar1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/ivy.xml?rev=662776&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/ivy.xml (added)
+++ ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/ivy.xml Tue Jun  3 05:42:21
2008
@@ -0,0 +1,25 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="1.4">
+	<info organisation="bar" module="bar1" revision="6"/>
+	<dependencies>
+		<dependency org="foo" name="foo1" branch="trunk" rev="3" 
+		                                  branchConstraint="branch1" revConstraint="[0,4]" />
+	</dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/repositories/branches/bar/bar1/trunk/6/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message