ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r832203 - in /ant/ivy/core/trunk: ./ src/java/org/apache/ivy/core/resolve/ test/java/org/apache/ivy/core/resolve/ test/repositories/extra-attributes-forceddependencies/ test/repositories/extra-attributes-forceddependencies/filerepo-attribs/...
Date Mon, 02 Nov 2009 23:49:10 GMT
Author: maartenc
Date: Mon Nov  2 23:49:09 2009
New Revision: 832203

URL: http://svn.apache.org/viewvc?rev=832203&view=rev
Log:
FIX: ResolveEngine.getDependencies does not work using extra attributes (IVY-1115)

Added:
    ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.53.0.1/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.0.0/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.1.0/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/RTS-6.2.1.20.zip   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/SGL-6.2.34.17.zip   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/SGL-6.2.34.7.zip   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.53.0.1/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.0.0/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.1.0/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/RTS-6.2.1.20.zip   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/SGL-6.2.34.17.zip   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/SGL-6.2.34.7.zip   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-attribs.xml   (with props)
    ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-noattribs.xml   (with props)
Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java
    ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=832203&r1=832202&r2=832203&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Mon Nov  2 23:49:09 2009
@@ -98,6 +98,7 @@
 - IMPROVEMENT: Trace a message when a property file referenced from the settings doesn't exixts (IVY-1074)
 - IMPROVEMENT: use defaultconf in combination with defaultconfmapping (IVY-1135) (thanks to Jon Schneider)
 
+- FIX: ResolveEngine.getDependencies does not work using extra attributes (IVY-1115)
 - FIX: <override> ignored in dynamic resolve mode (IVY-1131)
 - FIX: IvyNodeEviction.cleanEvicted has bad comparison logic (IVY-1118)
 - FIX: ChainResolver doesn't pass the specified 'checkmodified' attribute to the cache (IVY-1133)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java?rev=832203&r1=832202&r2=832203&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java Mon Nov  2 23:49:09 2009
@@ -209,6 +209,23 @@
 
     public boolean isBlacklisted(String rootModuleConf, ModuleRevisionId mrid) {
         IvyNode node = getNode(mrid);
+        
+        if (node == null) {
+            // search again, now ignore the extra attributes
+            // TODO: maybe we should search the node that has at least the 
+            // same attributes as mrid
+            for (Iterator it = visitData.entrySet().iterator(); it.hasNext(); ) {
+                Map.Entry entry = (Entry) it.next();
+                ModuleRevisionId current = (ModuleRevisionId) entry.getKey();
+                if (current.getModuleId().equals(mrid.getModuleId())
+                        && current.getRevision().equals(mrid.getRevision())) {
+                    VisitData data = (VisitData) entry.getValue();
+                    node = data.getNode();
+                    break;
+                }
+            }
+        }
+        
         return node != null && node.isBlacklisted(rootModuleConf);
     }
 

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=832203&r1=832202&r2=832203&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 Mon Nov  2 23:49:09 2009
@@ -61,9 +61,12 @@
 import org.apache.ivy.plugins.resolver.DualResolver;
 import org.apache.ivy.plugins.resolver.FileSystemResolver;
 import org.apache.ivy.util.CacheCleaner;
+import org.apache.ivy.util.DefaultMessageLogger;
 import org.apache.ivy.util.FileUtil;
+import org.apache.ivy.util.Message;
 import org.apache.ivy.util.MockMessageLogger;
 import org.apache.ivy.util.StringUtils;
+import org.apache.tools.ant.DefaultLogger;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -4900,4 +4903,55 @@
     private ResolveOptions getResolveOptions(IvySettings settings, String[] confs) {
         return new ResolveOptions().setConfs(confs);
     }
+
+    public void testExtraAttributesForcedDependencies() throws Exception {
+        Ivy ivy = new Ivy();
+        ivy.configure(new File("test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-attribs.xml"));
+        ivy.getSettings().setDefaultCache(cache);
+        
+        Message.setDefaultLogger(new DefaultMessageLogger(Message.MSG_DEBUG));
+
+        ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-extra-attrib-forced-dependencies.xml"),
+            getResolveOptions(ivy.getSettings(), new String[] {"*"}).setValidate(false));
+        assertFalse(report.hasError());
+        
+        ivy.deliver("1.0.0", "build/test/extra-attributes-forceddependencies/ivy-1.0.0.xml", new DeliverOptions().setResolveId(report.getResolveId()).setValidate(false).setPubdate(new Date()));
+        
+        File deliveredIvyFile = new File("build/test/extra-attributes-forceddependencies/ivy-1.0.0.xml");
+        assertTrue(deliveredIvyFile.exists());
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
+            ivy.getSettings(), deliveredIvyFile.toURL(), false);
+        DependencyDescriptor[] dds = md.getDependencies();
+        assertEquals(2, dds.length);
+        assertEquals(ModuleRevisionId.newInstance("CAE-Visualization-Components",
+            "SGL", "MAIN", "6.2.34.7"), dds[1]
+                .getDependencyRevisionId());
+        
+
+    }
+    public void testNoAttributesForcedDependencies() throws Exception {
+        Ivy ivy = new Ivy();
+        ivy.configure(new File("test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-noattribs.xml"));
+        ivy.getSettings().setDefaultCache(cache);
+        
+        Message.setDefaultLogger(new DefaultMessageLogger(Message.MSG_DEBUG));
+
+        ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-extra-attrib-forced-dependencies.xml"),
+            getResolveOptions(ivy.getSettings(), new String[] {"*"}).setValidate(false));
+        assertFalse(report.hasError());
+        
+        ivy.deliver("1.0.0", "build/test/extra-attributes-forceddependencies/ivy-1.0.0.xml", new DeliverOptions().setResolveId(report.getResolveId()).setValidate(false).setPubdate(new Date()));
+        
+        File deliveredIvyFile = new File("build/test/extra-attributes-forceddependencies/ivy-1.0.0.xml");
+        assertTrue(deliveredIvyFile.exists());
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
+            ivy.getSettings(), deliveredIvyFile.toURL(), false);
+        DependencyDescriptor[] dds = md.getDependencies();
+        assertEquals(2, dds.length);
+        assertEquals(ModuleRevisionId.newInstance("CAE-Visualization-Components",
+            "SGL", "MAIN", "6.2.34.7"), dds[1]
+                .getDependencyRevisionId());
+        
+
+    }
 }

Added: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml (added)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0">
+ <info organisation="CAE-Visualization-Products" module="IG-6_2" revision="6.2.1.4" status="Development" publication="20090429165200">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="CAE Image Generator - CAE Visualization Products" url="http://www.cae.com"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true"/>
+  <description homepage="http://www.cae.com"/>
+ </info>
+ <publications/>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE-Visualization-Components" name="RTS" rev="6.2.1.20" conf="BuildTimeDependencies->*" force="true" branch="MAIN">
+  </dependency>
+  <dependency org="CAE-Visualization-Components" name="SGL" rev="[6.2.0,6.2.999]" conf="BuildTimeDependencies->*" force="true" branch="MAIN">
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-VSK" module="VSK-FC" revision="0.53.0.1" status="Development" publication="20081008191838" buddies="" approver="Sebastien Bolduc">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="FC - Runway - FC" url="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true" homepage="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <description>VSK-FC -- This is the Fc SDK Package. - 
+   <a href="http://coretech.caecorp.cae.com/clearspace/tags/vsk-fc_releasenotes">Release Notes</a>
+  </description>
+ </info>
+ <publications>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE" name="ACS" rev="2.25.2" force="true" conf="BuildTimeDependencies-&gt;*" branch="MAIN">
+   <artifact name="ACS2Suite" type="msi"/>
+   <artifact name="ACS2Suite" type="xml" hidden="true"/>
+   <artifact name="scd" type="xml" hidden="true"/>
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-VSK" module="VSK-FC" revision="0.54.0.0" status="Development" publication="20081016173017" buddies="" approver="Mathieu Boisvert">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="FC - Runway - FC" url="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true" homepage="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <description>VSK-FC -- This is the Fc SDK Package. - 
+   <a href="http://coretech.caecorp.cae.com/clearspace/tags/vsk-fc_releasenotes">Release Notes</a>
+  </description>
+ </info>
+ <publications>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE" name="ACS" rev="2.25.2" force="true" conf="BuildTimeDependencies-&gt;*" branch="MAIN">
+   <artifact name="ACS2Suite" type="msi"/>
+   <artifact name="ACS2Suite" type="xml" hidden="true"/>
+   <artifact name="scd" type="xml" hidden="true"/>
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-VSK" module="VSK-FC" revision="0.54.1.0" status="Development" publication="20081022154820" buddies="" approver="Mathieu Boisvert">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="FC - Runway - FC" url="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true" homepage="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <description>VSK-FC -- This is the Fc SDK Package. - 
+   <a href="http://coretech.caecorp.cae.com/clearspace/tags/vsk-fc_releasenotes">Release Notes</a>
+  </description>
+ </info>
+ <publications>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE" name="ACS" rev="2.25.2" force="true" conf="BuildTimeDependencies-&gt;*" branch="MAIN">
+   <artifact name="ACS2Suite" type="msi"/>
+   <artifact name="ACS2Suite" type="xml" hidden="true"/>
+   <artifact name="scd" type="xml" hidden="true"/>
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/RTS-6.2.1.20.zip
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/RTS-6.2.1.20.zip?rev=832203&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/RTS-6.2.1.20.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-Visualization-Components" module="RTS" revision="6.2.1.20" status="Development" publication="20090427220236" buddies="" approver="Mathieu Benoit">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="RTS - CAE Visualization Products" url="http://www.cae.com"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true"/>
+  <description homepage="http://www.cae.com"><a href='http://coretech.caecorp.cae.com/releasenotes/view/RTS6.2.1.20'> RTS 6.2.1.20 Release Notes</a></description>
+ </info>
+ <publications>
+  <artifact name="RTS" type="zip"/>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE-Visualization-Components" name="SGL" rev="6.2.34.7" force="true" conf="BuildTimeDependencies->*" branch="MAIN">
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/SGL-6.2.34.17.zip
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/SGL-6.2.34.17.zip?rev=832203&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/SGL-6.2.34.17.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-Visualization-Components" module="SGL" branch="MAIN" revision="6.2.34.17" status="Development" publication="20090513223453" buddies="" approver="Marc De Sales Laterriere">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="SGL - CAE Visualization Products" url="http://www.cae.com"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true"/>
+  <description homepage="http://www.cae.com"><a href='http://coretech.caecorp.cae.com/releasenotes/view/SGL6.2.34.17'> SGL 6.2.34.17 Release Notes</a></description>
+ </info>
+ <publications>
+  <artifact name="SGL" type="zip"/>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/SGL-6.2.34.7.zip
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/SGL-6.2.34.7.zip?rev=832203&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/SGL-6.2.34.7.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-Visualization-Components" module="SGL" revision="6.2.34.7" status="Development" publication="20090424220207" buddies="" approver="Marc De Sales Laterriere">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="SGL - CAE Visualization Products" url="http://www.cae.com"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true"/>
+  <description homepage="http://www.cae.com"><a href='http://coretech.caecorp.cae.com/releasenotes/view/SGL6.2.34.7'> SGL 6.2.34.7 Release Notes</a></description>
+ </info>
+ <publications>
+  <artifact name="SGL" type="zip"/>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-attribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-VSK" module="VSK-FC" revision="0.53.0.1" status="Development" publication="20081008191838" buddies="" approver="Sebastien Bolduc">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="FC - Runway - FC" url="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true" homepage="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <description>VSK-FC -- This is the Fc SDK Package. - 
+   <a href="http://coretech.caecorp.cae.com/clearspace/tags/vsk-fc_releasenotes">Release Notes</a>
+  </description>
+ </info>
+ <publications>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE" name="ACS" rev="2.25.2" force="true" conf="BuildTimeDependencies-&gt;*" branch="MAIN">
+   <artifact name="ACS2Suite" type="msi"/>
+   <artifact name="ACS2Suite" type="xml" hidden="true"/>
+   <artifact name="scd" type="xml" hidden="true"/>
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.53.0.1/ivy-0.53.0.1.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-VSK" module="VSK-FC" revision="0.54.0.0" status="Development" publication="20081016173017" buddies="" approver="Mathieu Boisvert">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="FC - Runway - FC" url="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true" homepage="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <description>VSK-FC -- This is the Fc SDK Package. - 
+   <a href="http://coretech.caecorp.cae.com/clearspace/tags/vsk-fc_releasenotes">Release Notes</a>
+  </description>
+ </info>
+ <publications>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE" name="ACS" rev="2.25.2" force="true" conf="BuildTimeDependencies-&gt;*" branch="MAIN">
+   <artifact name="ACS2Suite" type="msi"/>
+   <artifact name="ACS2Suite" type="xml" hidden="true"/>
+   <artifact name="scd" type="xml" hidden="true"/>
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.0.0/ivy-0.54.0.0.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-VSK" module="VSK-FC" revision="0.54.1.0" status="Development" publication="20081022154820" buddies="" approver="Mathieu Boisvert">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="FC - Runway - FC" url="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true" homepage="http://coretech.caecorp.cae.com/jira/browse/VSKFLIGHTCONTROLS"/>
+  <description>VSK-FC -- This is the Fc SDK Package. - 
+   <a href="http://coretech.caecorp.cae.com/clearspace/tags/vsk-fc_releasenotes">Release Notes</a>
+  </description>
+ </info>
+ <publications>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE" name="ACS" rev="2.25.2" force="true" conf="BuildTimeDependencies-&gt;*" branch="MAIN">
+   <artifact name="ACS2Suite" type="msi"/>
+   <artifact name="ACS2Suite" type="xml" hidden="true"/>
+   <artifact name="scd" type="xml" hidden="true"/>
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-VSK/VSK-FC/0.54.1.0/ivy-0.54.1.0.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/RTS-6.2.1.20.zip
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/RTS-6.2.1.20.zip?rev=832203&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/RTS-6.2.1.20.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-Visualization-Components" module="RTS" revision="6.2.1.20" status="Development" publication="20090427220236">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="RTS - CAE Visualization Products" url="http://www.cae.com"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true"/>
+  <description homepage="http://www.cae.com"><a href='http://coretech.caecorp.cae.com/releasenotes/view/RTS6.2.1.20'> RTS 6.2.1.20 Release Notes</a></description>
+ </info>
+ <publications>
+  <artifact name="RTS" type="zip"/>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE-Visualization-Components" name="SGL" rev="6.2.34.7" force="true" conf="BuildTimeDependencies->*" branch="MAIN">
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/RTS/6.2.1.20/ivy-6.2.1.20.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/SGL-6.2.34.17.zip
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/SGL-6.2.34.17.zip?rev=832203&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/SGL-6.2.34.17.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-Visualization-Components" module="SGL" branch="MAIN" revision="6.2.34.17" status="Development" publication="20090513223453">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="SGL - CAE Visualization Products" url="http://www.cae.com"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true"/>
+  <description homepage="http://www.cae.com"><a href='http://coretech.caecorp.cae.com/releasenotes/view/SGL6.2.34.17'> SGL 6.2.34.17 Release Notes</a></description>
+ </info>
+ <publications>
+  <artifact name="SGL" type="zip"/>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.17/ivy-6.2.34.17.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/SGL-6.2.34.7.zip
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/SGL-6.2.34.7.zip?rev=832203&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/SGL-6.2.34.7.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   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="2.0">
+ <info organisation="CAE-Visualization-Components" module="SGL" revision="6.2.34.7" status="Development" publication="20090424220207">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="SGL - CAE Visualization Products" url="http://www.cae.com"/>
+  <repository name="packagerep-ivy" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/ivy-[revision].xml" ivys="true" artifacts="false"/>
+  <repository name="packagerep-artifacts" url="http://coretech.caecorp.cae.com/packagerep" pattern="[organisation]/[module]/[revision]/[artifact]-[revision].[type]" ivys="false" artifacts="true"/>
+  <description homepage="http://www.cae.com"><a href='http://coretech.caecorp.cae.com/releasenotes/view/SGL6.2.34.7'> SGL 6.2.34.7 Release Notes</a></description>
+ </info>
+ <publications>
+  <artifact name="SGL" type="zip"/>
+ </publications>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/filerepo-noattribs/CAE-Visualization-Components/SGL/6.2.34.7/ivy-6.2.34.7.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-attribs.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-attribs.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-attribs.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-attribs.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,34 @@
+<!--
+   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.    
+-->
+<ivysettings>
+    <settings defaultBranch="MAIN" defaultResolver="attribs" defaultConflictManager="latest-compatible" defaultResolveMode="default"/>
+  
+	<resolvers>
+		<filesystem name="attribs"  checkconsistency="false">
+			<ivy pattern="${ivy.settings.dir}/filerepo-attribs/[organisation]/[module]/[revision]/ivy-[revision].xml"/>
+			<artifact pattern="${ivy.settings.dir}/filerepo-attribs/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+		</filesystem>	
+	</resolvers>
+	
+	<statuses default="Development">
+	  <status name="Development" integration="false"/>
+	  <status name="Integration" integration="true"/>
+	  <status name="integration" integration="true"/>
+	</statuses> 	
+</ivysettings>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-attribs.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-noattribs.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-noattribs.xml?rev=832203&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-noattribs.xml (added)
+++ ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-noattribs.xml Mon Nov  2 23:49:09 2009
@@ -0,0 +1,34 @@
+<!--
+   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.    
+-->
+<ivysettings>
+    <settings defaultBranch="MAIN" defaultResolver="attribs" defaultConflictManager="latest-compatible" defaultResolveMode="default"/>
+  
+	<resolvers>
+		<filesystem name="attribs"  checkconsistency="false">
+			<ivy pattern="${ivy.settings.dir}/filerepo-noattribs/[organisation]/[module]/[revision]/ivy-[revision].xml"/>
+			<artifact pattern="${ivy.settings.dir}/filerepo-noattribs/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+		</filesystem>	
+	</resolvers>
+	
+	<statuses default="Development">
+	  <status name="Development" integration="false"/>
+	  <status name="Integration" integration="true"/>
+	  <status name="integration" integration="true"/>
+	</statuses> 	
+</ivysettings>
\ No newline at end of file

Propchange: ant/ivy/core/trunk/test/repositories/extra-attributes-forceddependencies/ivysettings-filerepo-noattribs.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message