ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r1299482 - in /ant/ivy/core/trunk: ./ doc/use/ src/java/org/apache/ivy/ant/ src/java/org/apache/ivy/core/install/ test/java/org/apache/ivy/ant/ test/repositories/IVY-1313/ test/repositories/IVY-1313/repo/ test/repositories/IVY-1313/repo/org...
Date Sun, 11 Mar 2012 23:11:01 GMT
Author: maartenc
Date: Sun Mar 11 23:11:00 2012
New Revision: 1299482

URL: http://svn.apache.org/viewvc?rev=1299482&view=rev
Log:
IMPROVEMENT: ivy:install task does not allow specification of conf (IVY-1313) (thanks to Nihal
Sinha)

Added:
    ant/ivy/core/trunk/test/repositories/IVY-1313/
    ant/ivy/core/trunk/test/repositories/IVY-1313/ivysettings.xml
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/ivys/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/ivys/ivy-1.0.xml
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/jars/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/jars/mod1-1.0.jar
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/sources/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/sources/mod1-1.0.jar
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/ivys/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/ivys/ivy-1.0.xml
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/jars/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/jars/mod2-1.0.jar
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/sources/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/sources/mod2-1.0.jar
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/ivys/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/ivys/ivy-1.0.xml
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/jars/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/jars/mod3-1.0.jar
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/sources/
    ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/sources/mod3-1.0.jar
Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/doc/use/install.html
    ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallOptions.java
    ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=1299482&r1=1299481&r2=1299482&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sun Mar 11 23:11:00 2012
@@ -105,6 +105,7 @@ for detailed view of each issue, please 
 	Ben Schmidt
 	Ruslan Shevchenko
 	John Shields
+	Nihal Sinha
 	Simon Steiner
 	Johan Stuyts
 	John Tinetti
@@ -133,6 +134,7 @@ for detailed view of each issue, please 
 - NEW: An new resolver 'mirroredurl' which can handle a list of mirrored URL repositories
(IVY-468)
 - NEW: Support for a jar resolver (IVY-1312)
 
+- IMPROVEMENT: ivy:install task does not allow specification of conf (IVY-1313) (thanks to
Nihal Sinha)
 - IMPROVEMENT: ivy:makepom ignores the artifact type in generated dependencies (IVY-1229)
(thanks to Douglas Palmer)
 - IMPROVEMENT: ivy:makepom now honors exclusion of artifacts in generated pom files (IVY-1294)
(thanks to Jens Rohloff)
 - IMPROVEMENT: Added support for dynamic revisions in <extends> tag (IVY-1281) (thanks
to Jean-Louis Boudart)

Modified: ant/ivy/core/trunk/doc/use/install.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/install.html?rev=1299482&r1=1299481&r2=1299482&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/use/install.html (original)
+++ ant/ivy/core/trunk/doc/use/install.html Sun Mar 11 23:11:00 2012
@@ -52,6 +52,8 @@ For more details about this task and its
         <td>Yes</td></tr>
     <tr><td>type</td><td>the type(s) of artefact(s) to install. 
You can give multiple values separated by commas</td>
         <td>No, defaults to '*' meaning all types</td></tr>
+    <tr><td>conf</td><td>the configurations to install. Only the
dependencies of the specified configurations will be installed. <span class="since">since
2.3</span></td>
+        <td>No, defaults to '*' meaning all configurations</td></tr>
     <tr><td>validate</td><td>true to force ivy files validation against
ivy.xsd, false to force no validation</td>
         <td>No. Defaults to default ivy value (as configured in configuration file)</td></tr>
     <tr><td>overwrite</td><td>true to override modules already present
in the destination resolver, false otherwise</td>

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java?rev=1299482&r1=1299481&r2=1299482&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java Sun Mar 11 23:11:00 2012
@@ -40,6 +40,8 @@ public class IvyInstall extends IvyTask 
     private String revision;
 
     private String branch;
+    
+    private String conf = "*";
 
     private boolean overwrite = false;
 
@@ -48,7 +50,7 @@ public class IvyInstall extends IvyTask 
     private String to;
 
     private boolean transitive;
-
+    
     private String type;
 
     private String matcher = PatternMatcher.EXACT;
@@ -103,6 +105,7 @@ public class IvyInstall extends IvyTask 
                     .setTransitive(transitive)
                     .setValidate(doValidate(settings))
                     .setOverwrite(overwrite)
+                    .setConfs(conf.split(","))
                     .setArtifactFilter(FilterHelper.getArtifactTypeFilter(type))
                     .setMatcherName(matcher));
         } catch (Exception e) {
@@ -206,4 +209,13 @@ public class IvyInstall extends IvyTask 
     public void setMatcher(String matcher) {
         this.matcher = matcher;
     }
+    
+    public String getConf() {
+        return conf;
+    }
+    
+    public void setConf(String conf) {
+        this.conf = conf;
+    }
+
 }

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java?rev=1299482&r1=1299481&r2=1299482&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java Sun Mar 11
23:11:00 2012
@@ -91,23 +91,31 @@ public class InstallEngine {
                     ExactPatternMatcher.ANY_EXPRESSION), ExactPatternMatcher.INSTANCE,
                 new NoConflictManager());
 
-            if (MatcherHelper.isExact(matcher, mrid)) {
-                DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(md, mrid,
false,
-                        false, options.isTransitive());
-                dd.addDependencyConfiguration("default", "*");
-                md.addDependency(dd);
-            } else {
-                ModuleRevisionId[] mrids = searchEngine.listModules(fromResolver, mrid, matcher);
-
-                for (int i = 0; i < mrids.length; i++) {
-                    Message.info("\tfound " + mrids[i] + " to install: adding to the list");
-                    DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(md,
mrids[i],
-                            false, false, options.isTransitive());
-                    dd.addDependencyConfiguration("default", "*");
-                    md.addDependency(dd);
+            for (int c = 0; c < options.getConfs().length; c++) {
+                final String[] depConfs = options.getConfs();
+
+                for (int j = 0; j < depConfs.length; j++) {
+                    final String depConf = depConfs[j].trim();
+                
+                    if (MatcherHelper.isExact(matcher, mrid)) {
+                        DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(md,
mrid, false,
+                                false, options.isTransitive());
+                        dd.addDependencyConfiguration("default", depConf);
+                        md.addDependency(dd);
+                    } else {
+                        ModuleRevisionId[] mrids = searchEngine.listModules(fromResolver,
mrid, matcher);
+        
+                        for (int i = 0; i < mrids.length; i++) {
+                            Message.info("\tfound " + mrids[i] + " to install: adding to
the list");
+                            DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(md,
mrids[i],
+                                    false, false, options.isTransitive());
+                            dd.addDependencyConfiguration("default", depConf);
+                            md.addDependency(dd);
+                        }
+                    }
                 }
             }
-
+            
             // resolve using appropriate resolver
             ResolveReport report = new ResolveReport(md, resolveId);
 

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallOptions.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallOptions.java?rev=1299482&r1=1299481&r2=1299482&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallOptions.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallOptions.java Sun Mar 11
23:11:00 2012
@@ -25,6 +25,7 @@ public class InstallOptions {
     private boolean transitive = true;
     private boolean validate = true;
     private boolean overwrite = false;
+    private String[] confs = {"*"};
     private Filter artifactFilter = FilterHelper.NO_FILTER;
     private String matcherName = PatternMatcher.EXACT;
     
@@ -63,4 +64,11 @@ public class InstallOptions {
         this.matcherName = matcherName;
         return this;
     }
+    public String[] getConfs() {
+        return confs;
+    }
+    public InstallOptions setConfs(String[] conf) {
+        this.confs = conf;
+        return this;
+    }
 }

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java?rev=1299482&r1=1299481&r2=1299482&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInstallTest.java Sun Mar 11 23:11:00
2012
@@ -110,6 +110,45 @@ public class IvyInstallTest extends Test
         assertTrue(new File("build/test/install/org8/mod8.1/a-1.1.txt").exists());      
 
     }
 
+    /**
+     * Normal case; no confs set (should use the default->* configuration).
+     */
+    public void testInstallWithConfsDefaultSettings() {
+        project.setProperty("ivy.settings.file", "test/repositories/IVY-1313/ivysettings.xml");
+        install.setOrganisation("org1");
+        install.setModule("mod1");
+        install.setRevision("1.0");
+        install.setFrom("default");
+        install.setTo("install");
+        install.setTransitive(true);
+
+        install.execute();
+        
+        assertTrue(new File("build/test/install/org1/mod1/jars/mod1-1.0.jar").exists());
+        assertTrue(new File("build/test/install/org1/mod2/jars/mod2-1.0.jar").exists());
+        assertTrue(new File("build/test/install/org1/mod3/jars/mod3-1.0.jar").exists());
+    }
+    
+    /**
+     * Test retrieving artifacts under only the master and runtime configuration.
+     */
+    public void testInstallWithConfsRuntimeOnly() {
+        project.setProperty("ivy.settings.file", "test/repositories/IVY-1313/ivysettings.xml");
+        install.setOrganisation("org1");
+        install.setModule("mod1");
+        install.setRevision("1.0");
+        install.setFrom("default");
+        install.setTo("install");
+        install.setConf("master,runtime");
+        install.setTransitive(true);
+
+        install.execute();
+
+        assertTrue(new File("build/test/install/org1/mod1/jars/mod1-1.0.jar").exists());
+        assertTrue(new File("build/test/install/org1/mod2/jars/mod2-1.0.jar").exists());
+        assertFalse(new File("build/test/install/org1/mod3/jars/mod3-1.0.jar").exists());
+    }
+    
     public void testInstallWithClassifiers() throws Exception {
         // IVY-1324
         project.setProperty("ivy.settings.url", new File("test/repositories/m2/ivysettings.xml").toURL().toExternalForm());

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/ivysettings.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/ivysettings.xml?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/ivysettings.xml (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/ivysettings.xml Sun Mar 11 23:11:00 2012
@@ -0,0 +1,33 @@
+<!--
+   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>
+	<properties file="${ivy.settings.dir}/../ivysettings.properties" />
+	<settings defaultResolver="default" />
+	<caches defaultCacheDir="${cache.dir}" />
+	<resolvers>
+		<filesystem name="default">
+			<ivy pattern="${ivy.settings.dir}/repo/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+			<artifact pattern="${ivy.settings.dir}/repo/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+		</filesystem>
+		<filesystem name="install">
+			<ivy pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+			<artifact pattern="${ivy.basedir}/build/test/install/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+		</filesystem>
+	</resolvers>
+</ivysettings>

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/ivys/ivy-1.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/ivys/ivy-1.0.xml?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/ivys/ivy-1.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/ivys/ivy-1.0.xml Sun Mar
11 23:11:00 2012
@@ -0,0 +1,48 @@
+<?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="org1"
+		module="mod1"
+		revision="1.0"
+		status="release"
+		publication="20120301000000">
+		<description homepage="" />
+	</info>
+	<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." extends="runtime"/>
+		<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="sources" visibility="public" description="this configuration contains the
source artifact of this module, if any."/>
+		<conf name="javadoc" visibility="public" description="this configuration contains the
javadoc artifact of this module, if any."/>
+		<conf name="optional" visibility="public" description="contains all optional dependencies"/>
+	</configurations>
+	<publications>
+		<artifact name="mod1" type="jar" ext="jar" conf="master"/>
+		<artifact name="mod1" type="source" ext="jar" conf="sources"/>
+	</publications>
+	<dependencies>
+		<dependency org="org1" name="mod2" rev="1.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+		<dependency org="org1" name="mod3" rev="1.0" force="true" conf="optional->compile(*),master(*)"/>
+	</dependencies>
+</ivy-module>

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/jars/mod1-1.0.jar
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/jars/mod1-1.0.jar?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/jars/mod1-1.0.jar (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/jars/mod1-1.0.jar Sun Mar
11 23:11:00 2012
@@ -0,0 +1 @@
+ 

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/sources/mod1-1.0.jar
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/sources/mod1-1.0.jar?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/sources/mod1-1.0.jar (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod1/sources/mod1-1.0.jar Sun
Mar 11 23:11:00 2012
@@ -0,0 +1 @@
+ 

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/ivys/ivy-1.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/ivys/ivy-1.0.xml?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/ivys/ivy-1.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/ivys/ivy-1.0.xml Sun Mar
11 23:11:00 2012
@@ -0,0 +1,46 @@
+<?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="org1"
+		module="mod2"
+		revision="1.0"
+		status="release"
+		publication="20120301000000">
+		<description homepage="" />
+	</info>
+	<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." extends="runtime"/>
+		<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="sources" visibility="public" description="this configuration contains the
source artifact of this module, if any."/>
+		<conf name="javadoc" visibility="public" description="this configuration contains the
javadoc artifact of this module, if any."/>
+		<conf name="optional" visibility="public" description="contains all optional dependencies"/>
+	</configurations>
+	<publications>
+		<artifact name="mod2" type="jar" ext="jar" conf="master"/>
+		<artifact name="mod2" type="source" ext="jar" conf="sources"/>
+	</publications>
+	<dependencies>
+	</dependencies>
+</ivy-module>

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/jars/mod2-1.0.jar
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/jars/mod2-1.0.jar?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/jars/mod2-1.0.jar (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/jars/mod2-1.0.jar Sun Mar
11 23:11:00 2012
@@ -0,0 +1 @@
+ 

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/sources/mod2-1.0.jar
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/sources/mod2-1.0.jar?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/sources/mod2-1.0.jar (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod2/sources/mod2-1.0.jar Sun
Mar 11 23:11:00 2012
@@ -0,0 +1 @@
+ 

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/ivys/ivy-1.0.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/ivys/ivy-1.0.xml?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/ivys/ivy-1.0.xml (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/ivys/ivy-1.0.xml Sun Mar
11 23:11:00 2012
@@ -0,0 +1,46 @@
+<?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="org1"
+		module="mod3"
+		revision="1.0"
+		status="release"
+		publication="20120301000000">
+		<description homepage="" />
+	</info>
+	<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." extends="runtime"/>
+		<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="sources" visibility="public" description="this configuration contains the
source artifact of this module, if any."/>
+		<conf name="javadoc" visibility="public" description="this configuration contains the
javadoc artifact of this module, if any."/>
+		<conf name="optional" visibility="public" description="contains all optional dependencies"/>
+	</configurations>
+	<publications>
+		<artifact name="mod3" type="jar" ext="jar" conf="master"/>
+		<artifact name="mod3" type="source" ext="jar" conf="sources"/>
+	</publications>
+	<dependencies>
+	</dependencies>
+</ivy-module>

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/jars/mod3-1.0.jar
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/jars/mod3-1.0.jar?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/jars/mod3-1.0.jar (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/jars/mod3-1.0.jar Sun Mar
11 23:11:00 2012
@@ -0,0 +1 @@
+ 

Added: ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/sources/mod3-1.0.jar
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/sources/mod3-1.0.jar?rev=1299482&view=auto
==============================================================================
--- ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/sources/mod3-1.0.jar (added)
+++ ant/ivy/core/trunk/test/repositories/IVY-1313/repo/org1/mod3/sources/mod3-1.0.jar Sun
Mar 11 23:11:00 2012
@@ -0,0 +1 @@
+ 



Mime
View raw message