ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1049146 [9/19] - in /ant/ivy/core/trunk: ./ src/etc/checkstyle/ src/etc/license/ src/example/build-a-ivy-repository/ src/example/build-a-ivy-repository/settings/ src/example/chained-resolvers/ src/example/chained-resolvers/chainedresolvers...
Date Tue, 14 Dec 2010 16:28:36 GMT
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleIdTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/PublishEngineTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/PublishEngineTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/PublishEngineTest.java Tue Dec 14 16:28:01 2010
@@ -1,143 +1,143 @@
-/*
- *  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.
- *
- */
-package org.apache.ivy.core.publish;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.apache.ivy.core.event.EventManager;
-import org.apache.ivy.core.module.descriptor.Artifact;
-import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
-import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.apache.ivy.core.resolve.ResolveData;
-import org.apache.ivy.core.resolve.ResolveEngine;
-import org.apache.ivy.core.resolve.ResolveOptions;
-import org.apache.ivy.core.resolve.ResolvedModuleRevision;
-import org.apache.ivy.core.settings.IvySettings;
-import org.apache.ivy.core.sort.SortEngine;
-import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
-import org.apache.ivy.plugins.resolver.FileSystemResolver;
-import org.apache.ivy.util.FileUtil;
-
-public class PublishEngineTest extends TestCase {
-    protected void setUp() throws Exception {
-        System.setProperty("ivy.cache.dir", new File("build/test/publish/cache").getAbsolutePath());
-        FileUtil.forceDelete(new File("build/test/publish"));
-    }
-    protected void tearDown() throws Exception {
-        FileUtil.forceDelete(new File("build/test/publish"));
-    }
-
-    public void testAtomicity() throws Exception {
-        IvySettings settings = new IvySettings();
-        final PublishEngine engine = new PublishEngine(settings, new EventManager());
-        final int[] counter = new int[] {0};
-        
-        final DefaultModuleDescriptor md = DefaultModuleDescriptor
-            .newDefaultInstance(ModuleRevisionId.parse("#A;1.0"));
-        final FileSystemResolver resolver = new FileSystemResolver() {
-            public void publish(Artifact artifact, File src, boolean overwrite) throws IOException {
-                super.publish(artifact, src, overwrite);
-                synchronized (PublishEngineTest.this) {
-                    counter[0] ++;
-                }
-                sleepSilently(50);
-                synchronized (PublishEngineTest.this) {
-                    counter[0] ++;
-                }
-            }
-        };
-        resolver.setName("test");
-        resolver.setSettings(settings);
-        String publishRepoDir = new File("build/test/publish/repo").getAbsolutePath();
-        resolver.addIvyPattern(publishRepoDir + "/[module]/[revision]/[artifact].[ext]");
-        resolver.addArtifactPattern(publishRepoDir + "/[module]/[revision]/[artifact].[ext]");
-        
-        FileUtil.copy(
-            new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), 
-            new File("build/test/publish/module/A.jar"), null);
-        XmlModuleDescriptorWriter.write(md, new File("build/test/publish/module/ivy.xml"));
-
-        resolveAndAssertNotFound(settings, resolver, "#A;latest.integration", "before publishing");
-
-        // run publish asynchronously
-        new Thread() {
-            public void run() {
-                try {
-                    engine.publish(
-                        md, 
-                        Arrays.asList(new String[] {"build/test/publish/module/[artifact].[ext]"}), 
-                        resolver, 
-                        new PublishOptions().setSrcIvyPattern("build/test/publish/module/[artifact].[ext]"));
-                    synchronized (PublishEngineTest.this) {
-                        counter[0] ++;
-                    }
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }.start();
-
-        while(true) {
-            sleepSilently(5);
-            synchronized (this) {
-                if (counter[0] == 5) {
-                    break;
-                } else if (counter[0] < 4) {
-                    resolveAndAssertNotFound(settings, resolver, 
-                        "#A;latest.integration", "after "+(counter[0] / 2)+" artifacts published");
-                }
-            }
-        }
-        resolveAndAssertFound(settings, resolver, "#A;1.0");
-    }
-    private void resolveAndAssertNotFound(
-            IvySettings settings, FileSystemResolver resolver, String module, String context)
-            throws ParseException {
-        ResolvedModuleRevision rmr = resolveModule(settings, resolver, module);
-        assertNull("module found " + context + ". module="+rmr, rmr);
-    }
-
-    private void resolveAndAssertFound(
-            IvySettings settings, FileSystemResolver resolver, String module)
-            throws ParseException {
-        ResolvedModuleRevision rmr = resolveModule(settings, resolver, module);
-        assertNotNull(rmr);
-        assertEquals(module, rmr.getId().toString());
-    }
-    private ResolvedModuleRevision resolveModule(
-            IvySettings settings, FileSystemResolver resolver, String module)
-            throws ParseException {
-        return resolver.getDependency(
-            new DefaultDependencyDescriptor(ModuleRevisionId.parse(module), false), 
-            new ResolveData(
-                new ResolveEngine(settings, new EventManager(), new SortEngine(settings)), 
-                new ResolveOptions()));
-    }
-    private void sleepSilently(int timeout) {
-        try {
-            Thread.sleep(timeout);
-        } catch (InterruptedException e) {
-        }
-    }
-}
+/*
+ *  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.
+ *
+ */
+package org.apache.ivy.core.publish;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+import org.apache.ivy.core.event.EventManager;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
+import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.resolve.ResolveData;
+import org.apache.ivy.core.resolve.ResolveEngine;
+import org.apache.ivy.core.resolve.ResolveOptions;
+import org.apache.ivy.core.resolve.ResolvedModuleRevision;
+import org.apache.ivy.core.settings.IvySettings;
+import org.apache.ivy.core.sort.SortEngine;
+import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
+import org.apache.ivy.plugins.resolver.FileSystemResolver;
+import org.apache.ivy.util.FileUtil;
+
+public class PublishEngineTest extends TestCase {
+    protected void setUp() throws Exception {
+        System.setProperty("ivy.cache.dir", new File("build/test/publish/cache").getAbsolutePath());
+        FileUtil.forceDelete(new File("build/test/publish"));
+    }
+    protected void tearDown() throws Exception {
+        FileUtil.forceDelete(new File("build/test/publish"));
+    }
+
+    public void testAtomicity() throws Exception {
+        IvySettings settings = new IvySettings();
+        final PublishEngine engine = new PublishEngine(settings, new EventManager());
+        final int[] counter = new int[] {0};
+        
+        final DefaultModuleDescriptor md = DefaultModuleDescriptor
+            .newDefaultInstance(ModuleRevisionId.parse("#A;1.0"));
+        final FileSystemResolver resolver = new FileSystemResolver() {
+            public void publish(Artifact artifact, File src, boolean overwrite) throws IOException {
+                super.publish(artifact, src, overwrite);
+                synchronized (PublishEngineTest.this) {
+                    counter[0] ++;
+                }
+                sleepSilently(50);
+                synchronized (PublishEngineTest.this) {
+                    counter[0] ++;
+                }
+            }
+        };
+        resolver.setName("test");
+        resolver.setSettings(settings);
+        String publishRepoDir = new File("build/test/publish/repo").getAbsolutePath();
+        resolver.addIvyPattern(publishRepoDir + "/[module]/[revision]/[artifact].[ext]");
+        resolver.addArtifactPattern(publishRepoDir + "/[module]/[revision]/[artifact].[ext]");
+        
+        FileUtil.copy(
+            new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"), 
+            new File("build/test/publish/module/A.jar"), null);
+        XmlModuleDescriptorWriter.write(md, new File("build/test/publish/module/ivy.xml"));
+
+        resolveAndAssertNotFound(settings, resolver, "#A;latest.integration", "before publishing");
+
+        // run publish asynchronously
+        new Thread() {
+            public void run() {
+                try {
+                    engine.publish(
+                        md, 
+                        Arrays.asList(new String[] {"build/test/publish/module/[artifact].[ext]"}), 
+                        resolver, 
+                        new PublishOptions().setSrcIvyPattern("build/test/publish/module/[artifact].[ext]"));
+                    synchronized (PublishEngineTest.this) {
+                        counter[0] ++;
+                    }
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }.start();
+
+        while(true) {
+            sleepSilently(5);
+            synchronized (this) {
+                if (counter[0] == 5) {
+                    break;
+                } else if (counter[0] < 4) {
+                    resolveAndAssertNotFound(settings, resolver, 
+                        "#A;latest.integration", "after "+(counter[0] / 2)+" artifacts published");
+                }
+            }
+        }
+        resolveAndAssertFound(settings, resolver, "#A;1.0");
+    }
+    private void resolveAndAssertNotFound(
+            IvySettings settings, FileSystemResolver resolver, String module, String context)
+            throws ParseException {
+        ResolvedModuleRevision rmr = resolveModule(settings, resolver, module);
+        assertNull("module found " + context + ". module="+rmr, rmr);
+    }
+
+    private void resolveAndAssertFound(
+            IvySettings settings, FileSystemResolver resolver, String module)
+            throws ParseException {
+        ResolvedModuleRevision rmr = resolveModule(settings, resolver, module);
+        assertNotNull(rmr);
+        assertEquals(module, rmr.getId().toString());
+    }
+    private ResolvedModuleRevision resolveModule(
+            IvySettings settings, FileSystemResolver resolver, String module)
+            throws ParseException {
+        return resolver.getDependency(
+            new DefaultDependencyDescriptor(ModuleRevisionId.parse(module), false), 
+            new ResolveData(
+                new ResolveEngine(settings, new EventManager(), new SortEngine(settings)), 
+                new ResolveOptions()));
+    }
+    private void sleepSilently(int timeout) {
+        try {
+            Thread.sleep(timeout);
+        } catch (InterruptedException e) {
+        }
+    }
+}

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/ivy-1.0-dev.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/ivy-1.0-dev.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/ivysettings-publisheventstest.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/publish/ivysettings-publisheventstest.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java Tue Dec 14 16:28:01 2010
@@ -1,68 +1,68 @@
-/*
- *  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.
- *
- */
-package org.apache.ivy.core.repository;
-
-import junit.framework.TestCase;
-
-import org.apache.ivy.TestFixture;
-import org.apache.ivy.TestHelper;
-import org.apache.ivy.core.event.EventManager;
-import org.apache.ivy.core.resolve.ResolveEngine;
-import org.apache.ivy.core.search.SearchEngine;
-import org.apache.ivy.core.settings.IvySettings;
-import org.apache.ivy.core.sort.SortEngine;
-
-public class RepositoryManagementEngineTest extends TestCase {
-    private RepositoryManagementEngine repository;
-    private TestFixture fixture;
-    
-    protected void setUp() throws Exception {
-        fixture = new TestFixture();
-        IvySettings settings = fixture.getSettings();
-        repository = new RepositoryManagementEngine(settings, new SearchEngine(settings),
-                new ResolveEngine(settings, new EventManager(), new SortEngine(settings)));
-    }
-    
-    protected void tearDown() throws Exception {
-        fixture.clean();
-    }
-    
-    public void testLoad() throws Exception {
-        fixture
-            .addMD("o1#A;1").addMD("o1#A;2").addMD("o1#A;3")
-            .addMD("o1#B;1").addMD("o1#B;2->o1#A;2")
-            .addMD("o2#C;1->{o1#B;1 o1#A;1}")
-            .init();
-        
-        repository.load();
-        assertEquals(3, repository.getModuleIdsNumber());
-        assertEquals(6, repository.getRevisionsNumber());
-    }
-    
-    public void testOrphans() throws Exception {
-        fixture
-            .addMD("o1#A;1").addMD("o1#A;2").addMD("o1#A;3")
-            .addMD("o1#B;1").addMD("o1#B;2->o1#A;2")
-            .addMD("o2#C;1->{o1#B;1 o1#A;1}")
-            .init();
-        
-        repository.load();
-        repository.analyze();
-        TestHelper.assertModuleRevisionIds("o1#A;3 o1#B;2 o2#C;1", repository.getOrphans());
-    }
-}
+/*
+ *  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.
+ *
+ */
+package org.apache.ivy.core.repository;
+
+import junit.framework.TestCase;
+
+import org.apache.ivy.TestFixture;
+import org.apache.ivy.TestHelper;
+import org.apache.ivy.core.event.EventManager;
+import org.apache.ivy.core.resolve.ResolveEngine;
+import org.apache.ivy.core.search.SearchEngine;
+import org.apache.ivy.core.settings.IvySettings;
+import org.apache.ivy.core.sort.SortEngine;
+
+public class RepositoryManagementEngineTest extends TestCase {
+    private RepositoryManagementEngine repository;
+    private TestFixture fixture;
+    
+    protected void setUp() throws Exception {
+        fixture = new TestFixture();
+        IvySettings settings = fixture.getSettings();
+        repository = new RepositoryManagementEngine(settings, new SearchEngine(settings),
+                new ResolveEngine(settings, new EventManager(), new SortEngine(settings)));
+    }
+    
+    protected void tearDown() throws Exception {
+        fixture.clean();
+    }
+    
+    public void testLoad() throws Exception {
+        fixture
+            .addMD("o1#A;1").addMD("o1#A;2").addMD("o1#A;3")
+            .addMD("o1#B;1").addMD("o1#B;2->o1#A;2")
+            .addMD("o2#C;1->{o1#B;1 o1#A;1}")
+            .init();
+        
+        repository.load();
+        assertEquals(3, repository.getModuleIdsNumber());
+        assertEquals(6, repository.getRevisionsNumber());
+    }
+    
+    public void testOrphans() throws Exception {
+        fixture
+            .addMD("o1#A;1").addMD("o1#A;2").addMD("o1#A;3")
+            .addMD("o1#B;1").addMD("o1#B;2->o1#A;2")
+            .addMD("o2#C;1->{o1#B;1 o1#A;1}")
+            .init();
+        
+        repository.load();
+        repository.analyze();
+        TestHelper.assertModuleRevisionIds("o1#A;3 o1#B;2 o2#C;1", repository.getOrphans());
+    }
+}

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/repository/RepositoryManagementEngineTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java Tue Dec 14 16:28:01 2010
@@ -1,100 +1,100 @@
-/*
- *  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.
- *
- */
-package org.apache.ivy.core.resolve;
-
-import java.io.File;
-import java.util.Date;
-
-import junit.framework.TestCase;
-
-import org.apache.ivy.Ivy;
-import org.apache.ivy.core.cache.ArtifactOrigin;
-import org.apache.ivy.core.module.descriptor.Artifact;
-import org.apache.ivy.core.module.descriptor.DefaultArtifact;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.apache.ivy.core.report.ArtifactDownloadReport;
-import org.apache.ivy.core.report.DownloadStatus;
-import org.apache.ivy.core.report.ResolveReport;
-import org.apache.ivy.util.CacheCleaner;
-
-public class ResolveEngineTest extends TestCase {
-
-    private Ivy ivy;
-
-    private File cache;
-
-    protected void setUp() throws Exception {
-        cache = new File("build/cache");
-        System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
-        createCache();
-
-        ivy = Ivy.newInstance();
-        ivy.configure(new File("test/repositories/ivysettings.xml"));
-    }
-
-    protected void tearDown() throws Exception {
-        CacheCleaner.deleteDir(cache);
-    }
-
-    public void testInlineResolveWithNonExistingModule() throws Exception {
-        ResolveEngine engine = new ResolveEngine(ivy.getSettings(), 
-            ivy.getEventManager(), ivy.getSortEngine());
-        
-        ResolveOptions options = new ResolveOptions();
-        options.setConfs(new String[] {"*"});
-        
-        ModuleRevisionId mRevId = ModuleRevisionId.newInstance("org1XX", "mod1.0XX", "1.0XX");
-        ResolveReport report = engine.resolve(mRevId, options, true);
-        
-        assertNotNull("The ResolveReport may never be null", report);
-        assertTrue(report.hasError());
-    }
-    
-    public void testLocateThenDownload() throws Exception {
-        ResolveEngine engine = new ResolveEngine(ivy.getSettings(), 
-            ivy.getEventManager(), ivy.getSortEngine());
-        
-        testLocateThenDownload(
-            engine, 
-            DefaultArtifact.newIvyArtifact(ModuleRevisionId.parse("org1#mod1.1;1.0"), new Date()), 
-            new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml"));
-        testLocateThenDownload(
-            engine, 
-            new DefaultArtifact(ModuleRevisionId.parse("org1#mod1.1;1.0"), new Date(), "mod1.1", "jar", "jar"), 
-            new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"));
-    }
-
-    private void testLocateThenDownload(ResolveEngine engine, Artifact artifact, File artifactFile) {
-        ArtifactOrigin origin = engine.locate(artifact);
-        assertNotNull(origin);
-        assertTrue(origin.isLocal());
-        assertEquals(
-            artifactFile.getAbsolutePath(), 
-            new File(origin.getLocation()).getAbsolutePath());
-        
-        ArtifactDownloadReport r = engine.download(origin, new DownloadOptions());
-        assertNotNull(r);
-        assertEquals(DownloadStatus.SUCCESSFUL, r.getDownloadStatus());
-        assertNotNull(r.getLocalFile());
-        assertTrue(r.getLocalFile().exists());
-    }
-
-    private void createCache() {
-        cache.mkdirs();
-    }
-}
+/*
+ *  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.
+ *
+ */
+package org.apache.ivy.core.resolve;
+
+import java.io.File;
+import java.util.Date;
+
+import junit.framework.TestCase;
+
+import org.apache.ivy.Ivy;
+import org.apache.ivy.core.cache.ArtifactOrigin;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.core.module.descriptor.DefaultArtifact;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.report.ArtifactDownloadReport;
+import org.apache.ivy.core.report.DownloadStatus;
+import org.apache.ivy.core.report.ResolveReport;
+import org.apache.ivy.util.CacheCleaner;
+
+public class ResolveEngineTest extends TestCase {
+
+    private Ivy ivy;
+
+    private File cache;
+
+    protected void setUp() throws Exception {
+        cache = new File("build/cache");
+        System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
+        createCache();
+
+        ivy = Ivy.newInstance();
+        ivy.configure(new File("test/repositories/ivysettings.xml"));
+    }
+
+    protected void tearDown() throws Exception {
+        CacheCleaner.deleteDir(cache);
+    }
+
+    public void testInlineResolveWithNonExistingModule() throws Exception {
+        ResolveEngine engine = new ResolveEngine(ivy.getSettings(), 
+            ivy.getEventManager(), ivy.getSortEngine());
+        
+        ResolveOptions options = new ResolveOptions();
+        options.setConfs(new String[] {"*"});
+        
+        ModuleRevisionId mRevId = ModuleRevisionId.newInstance("org1XX", "mod1.0XX", "1.0XX");
+        ResolveReport report = engine.resolve(mRevId, options, true);
+        
+        assertNotNull("The ResolveReport may never be null", report);
+        assertTrue(report.hasError());
+    }
+    
+    public void testLocateThenDownload() throws Exception {
+        ResolveEngine engine = new ResolveEngine(ivy.getSettings(), 
+            ivy.getEventManager(), ivy.getSortEngine());
+        
+        testLocateThenDownload(
+            engine, 
+            DefaultArtifact.newIvyArtifact(ModuleRevisionId.parse("org1#mod1.1;1.0"), new Date()), 
+            new File("test/repositories/1/org1/mod1.1/ivys/ivy-1.0.xml"));
+        testLocateThenDownload(
+            engine, 
+            new DefaultArtifact(ModuleRevisionId.parse("org1#mod1.1;1.0"), new Date(), "mod1.1", "jar", "jar"), 
+            new File("test/repositories/1/org1/mod1.1/jars/mod1.1-1.0.jar"));
+    }
+
+    private void testLocateThenDownload(ResolveEngine engine, Artifact artifact, File artifactFile) {
+        ArtifactOrigin origin = engine.locate(artifact);
+        assertNotNull(origin);
+        assertTrue(origin.isLocal());
+        assertEquals(
+            artifactFile.getAbsolutePath(), 
+            new File(origin.getLocation()).getAbsolutePath());
+        
+        ArtifactDownloadReport r = engine.download(origin, new DownloadOptions());
+        assertNotNull(r);
+        assertEquals(DownloadStatus.SUCCESSFUL, r.getDownloadStatus());
+        assertNotNull(r.getLocalFile());
+        assertTrue(r.getLocalFile().exists());
+    }
+
+    private void createCache() {
+        cache.mkdirs();
+    }
+}

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveEngineTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/badcacheconf.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/badcacheconf.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/dualchainresolverconf.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/dualchainresolverconf.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml Tue Dec 14 16:28:01 2010
@@ -1,28 +1,28 @@
-<!--
-   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.0">
-    <info organisation="org.apache" module="ivy-test" />
-    <configurations>
-        <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
-    </configurations>
-    <dependencies>
-        <dependency org="myorg" name="modC" rev="1.0" />
-        <dependency org="myorg" name="modA" rev="1.0" />
-    </dependencies>
-</ivy-module>
+<!--
+   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.0">
+    <info organisation="org.apache" module="ivy-test" />
+    <configurations>
+        <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf"/>
+    </configurations>
+    <dependencies>
+        <dependency org="myorg" name="modC" rev="1.0" />
+        <dependency org="myorg" name="modA" rev="1.0" />
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-1178.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-148.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-148.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-148b.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-148b.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-182.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-182.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-198.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-198.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-214.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-214.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-218.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-218.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-225.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-225.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-56.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-56.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-590.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-590.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-590.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-590.xml Tue Dec 14 16:28:01 2010
@@ -1,29 +1,29 @@
-<!--
-   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.0">
-    <info organisation="apache" module="IVY-590" revision="1.0"/>
-    <configurations>
-	    <conf name="default" transitive="true"/>
-		<conf name="compile" extends="default" />
-	</configurations>
-    <dependencies>
-		<dependency org="org1" name="mod1.1" rev="1.0" conf="default->default"/>
-		<dependency org="org16" name="mod16.1" rev="1.0" conf="compile->default"/>
-    </dependencies>
-</ivy-module>
+<!--
+   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.0">
+    <info organisation="apache" module="IVY-590" revision="1.0"/>
+    <configurations>
+	    <conf name="default" transitive="true"/>
+		<conf name="compile" extends="default" />
+	</configurations>
+    <dependencies>
+		<dependency org="org1" name="mod1.1" rev="1.0" conf="default->default"/>
+		<dependency org="org16" name="mod16.1" rev="1.0" conf="compile->default"/>
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-590.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-590.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-590.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-874.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-874.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-874.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-874.xml Tue Dec 14 16:28:01 2010
@@ -1,36 +1,36 @@
-<!--
-   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.0">
-    <info organisation="apache" module="IVY-874" revision="1.0"/>
-    <configurations>
-		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
-		<conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
-		<conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
-		<conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-		<conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
-		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
-		<conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
-		<conf name="optional" visibility="public" description="contains all optional dependencies" />
-	</configurations>
-	
-	<dependencies>
-		<dependency org="org.apache" name="test" rev="1.2" conf="default" />
-		<dependency org="org.apache" name="test3" rev="1.1" conf="runtime->runtime,master" />
-	</dependencies>
-</ivy-module>
+<!--
+   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.0">
+    <info organisation="apache" module="IVY-874" revision="1.0"/>
+    <configurations>
+		<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
+		<conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
+		<conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
+		<conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
+		<conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
+		<conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases."/>
+		<conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
+		<conf name="optional" visibility="public" description="contains all optional dependencies" />
+	</configurations>
+	
+	<dependencies>
+		<dependency org="org.apache" name="test" rev="1.2" conf="default" />
+		<dependency org="org.apache" name="test3" rev="1.1" conf="runtime->runtime,master" />
+	</dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-874.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-874.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-874.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml Tue Dec 14 16:28:01 2010
@@ -1,25 +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.0">
-    <info organisation="apache" module="ivy-956" />
-    <dependencies>
-    	<dependency org="org1" name="mod1.4" rev="1.0.2" />
-    	<dependency org="org1" name="mod1.2" rev="[0.9,1.0[" extra="yes"/>
-    </dependencies>
-</ivy-module>
+<!--
+   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.0">
+    <info organisation="apache" module="ivy-956" />
+    <dependencies>
+    	<dependency org="org1" name="mod1.4" rev="1.0.2" />
+    	<dependency org="org1" name="mod1.2" rev="[0.9,1.0[" extra="yes"/>
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-956.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-999.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-999.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-999.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-999.xml Tue Dec 14 16:28:01 2010
@@ -1,26 +1,26 @@
-<!--
-   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.0">
-    <info organisation="apache" module="IVY-999" revision="1.0"/>
-	<dependencies>
-        <dependency org="test" name="a" rev="latest.integration"/>
-        <dependency org="test" name="b" rev="latest.integration"/>
-        <dependency org="junit" name="junit" rev="latest.integration"/>
-	</dependencies>
-</ivy-module>
+<!--
+   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.0">
+    <info organisation="apache" module="IVY-999" revision="1.0"/>
+	<dependencies>
+        <dependency org="test" name="a" rev="latest.integration"/>
+        <dependency org="test" name="b" rev="latest.integration"/>
+        <dependency org="junit" name="junit" rev="latest.integration"/>
+	</dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-999.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-999.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-999.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-dualchainresolver.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-dualchainresolver.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies.xml Tue Dec 14 16:28:01 2010
@@ -1,40 +1,40 @@
-<?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" module="TESTA" publication="20041101110000" status="Integration">
-  <license name="CAE Proprietary"/>
-  <ivyauthor name="TESTA - TESTA" 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" homepage="http://www.cae.com"/>
-  <description>TESTA -- Hello World Library - &lt;a href='http://coretech.caecorp.cae.com/clearspace/tags/testa_releasenotes'&gt;Release Notes&lt;/a&gt;</description>
- </info>
- <publications/>
- <configurations>
-  <conf name="BuildTimeDependencies"/>
-  <conf name="RunTimeDependencies"/>
-  <conf name="TestingDependencies"/>
- </configurations>
- <dependencies>
-  <dependency org="CAE-VSK" name="VSK-FC" rev="0.53.0.1" transitive="false" force="true" conf="BuildTimeDependencies-&gt;*" policydependency="true">
-  </dependency>
-  <dependency org="CAE-VSK" name="VSK-FC" rev="[0.50.0.0,0.55.0.0]" transitive="false" force="true" conf="BuildTimeDependencies-&gt;*">
-  </dependency>
- </dependencies>
-</ivy-module>
+<?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" module="TESTA" publication="20041101110000" status="Integration">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="TESTA - TESTA" 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" homepage="http://www.cae.com"/>
+  <description>TESTA -- Hello World Library - &lt;a href='http://coretech.caecorp.cae.com/clearspace/tags/testa_releasenotes'&gt;Release Notes&lt;/a&gt;</description>
+ </info>
+ <publications/>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE-VSK" name="VSK-FC" rev="0.53.0.1" transitive="false" force="true" conf="BuildTimeDependencies-&gt;*" policydependency="true">
+  </dependency>
+  <dependency org="CAE-VSK" name="VSK-FC" rev="[0.50.0.0,0.55.0.0]" transitive="false" force="true" conf="BuildTimeDependencies-&gt;*">
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies2.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies2.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies2.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies2.xml Tue Dec 14 16:28:01 2010
@@ -1,40 +1,40 @@
-<?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" module="TESTA" publication="20041101110000" status="Integration">
-  <license name="CAE Proprietary"/>
-  <ivyauthor name="TESTA - TESTA" 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" homepage="http://www.cae.com"/>
-  <description>TESTA -- Hello World Library - &lt;a href='http://coretech.caecorp.cae.com/clearspace/tags/testa_releasenotes'&gt;Release Notes&lt;/a&gt;</description>
- </info>
- <publications/>
- <configurations>
-  <conf name="BuildTimeDependencies"/>
-  <conf name="RunTimeDependencies"/>
-  <conf name="TestingDependencies"/>
- </configurations>
- <dependencies>
-  <dependency org="CAE-VSK" name="VSK-FC" rev="[0.50.0.0,0.55.0.0]" transitive="false" force="true" conf="BuildTimeDependencies-&gt;*">
-  </dependency>
-  <dependency org="CAE-VSK" name="VSK-FC" rev="0.53.0.1" transitive="false" force="true" conf="BuildTimeDependencies-&gt;*" policydependency="true">
-  </dependency>
- </dependencies>
-</ivy-module>
+<?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" module="TESTA" publication="20041101110000" status="Integration">
+  <license name="CAE Proprietary"/>
+  <ivyauthor name="TESTA - TESTA" 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" homepage="http://www.cae.com"/>
+  <description>TESTA -- Hello World Library - &lt;a href='http://coretech.caecorp.cae.com/clearspace/tags/testa_releasenotes'&gt;Release Notes&lt;/a&gt;</description>
+ </info>
+ <publications/>
+ <configurations>
+  <conf name="BuildTimeDependencies"/>
+  <conf name="RunTimeDependencies"/>
+  <conf name="TestingDependencies"/>
+ </configurations>
+ <dependencies>
+  <dependency org="CAE-VSK" name="VSK-FC" rev="[0.50.0.0,0.55.0.0]" transitive="false" force="true" conf="BuildTimeDependencies-&gt;*">
+  </dependency>
+  <dependency org="CAE-VSK" name="VSK-FC" rev="0.53.0.1" transitive="false" force="true" conf="BuildTimeDependencies-&gt;*" policydependency="true">
+  </dependency>
+ </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies2.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-multipledependencies2.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-ns.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att-ns.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

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

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att2.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att2.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att3.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-att3.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Modified: 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=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml Tue Dec 14 16:28:01 2010
@@ -1,40 +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-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>
+<?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-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:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-extra-attrib-forced-dependencies.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-latestreleased.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-latestreleased.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-sources-and-javadoc-auto.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-sources-and-javadoc-auto.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-sources.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-sources.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-src.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-src.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-src.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-src.xml Tue Dec 14 16:28:01 2010
@@ -1,24 +1,24 @@
-<!--
-   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" xmlns:m="http://ant.apache.org/ivy/maven">
-    <info organisation="apache" module="test-m2-with-src" revision="1.0" />
-    <dependencies>
- 		   <dependency org="org.apache" name="test-src" rev="1.0" />
-    </dependencies>
-</ivy-module>
+<!--
+   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" xmlns:m="http://ant.apache.org/ivy/maven">
+    <info organisation="apache" module="test-m2-with-src" revision="1.0" />
+    <dependencies>
+ 		   <dependency org="org.apache" name="test-src" rev="1.0" />
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-src.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-m2-with-src.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-mod1.2-1.5.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-mod1.2-1.5.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-mod1.2-1.5.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-mod1.2-1.5.xml Tue Dec 14 16:28:01 2010
@@ -1,26 +1,26 @@
-<!--
-   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.0">
-	<info organisation="org1"
-	       module="mod1.2"
-	       revision="1.5"
-	       status="integration"
-	       publication="20041101110000"
-	/>
-</ivy-module>
+<!--
+   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.0">
+	<info organisation="org1"
+	       module="mod1.2"
+	       revision="1.5"
+	       status="integration"
+	       publication="20041101110000"
+	/>
+</ivy-module>

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-mod1.2-1.5.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-mod1.2-1.5.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-mod1.2-1.5.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-mod1.2.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-mod1.2.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-namespace.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-namespace.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-namespace2.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-namespace2.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-namespace3.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-namespace3.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-namespace4.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-namespace4.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-other.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ivy-other.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/search/SearchTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ConfigureTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message