ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r730161 - in /ant/ivy/ivyde/trunk: org.apache.ivyde.eclipse/ org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ test/retrieve-conf/ test/retrieve-conf/src/
Date Tue, 30 Dec 2008 16:08:32 GMT
Author: hibou
Date: Tue Dec 30 08:08:32 2008
New Revision: 730161

URL: http://svn.apache.org/viewvc?rev=730161&view=rev
Log:
IVYDE-142: merge of the configurations before resolve (thanks to Daniel Becheanu)

Added:
    ant/ivy/ivyde/trunk/test/retrieve-conf/   (with props)
    ant/ivy/ivyde/trunk/test/retrieve-conf/.classpath
    ant/ivy/ivyde/trunk/test/retrieve-conf/.project
    ant/ivy/ivyde/trunk/test/retrieve-conf/ivy.xml   (with props)
    ant/ivy/ivyde/trunk/test/retrieve-conf/ivysettings.xml   (with props)
    ant/ivy/ivyde/trunk/test/retrieve-conf/src/
Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=730161&r1=730160&r2=730161&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Tue Dec 30 08:08:32 2008
@@ -9,6 +9,7 @@
 - FIX: project://[projectname]/ scheme for settings only work with java projects, not simple
projects (IVYDE-145)
 - FIX: source and javadoc attachment regression (IVYDE-146)
 - FIX: IvyDE does not save "Configurations" and "Types" field values for "Retrive" tab  (IVYDE-142)
(thanks to Daniel Becheanu)
+- FIX: Retrieve after resolve task fails because of wrong resolve configuration (IVYDE-142)
(thanks to Daniel Becheanu)
 
   version 2.0.0 beta1
 ==========================

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java?rev=730161&r1=730160&r2=730161&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
Tue Dec 30 08:08:32 2008
@@ -216,12 +216,15 @@
                         IvyResolveJob.class.getClassLoader());
                     try {
                         Map/*<ModuleRevisionId, IvyNode>*/ dependencies = Collections.EMPTY_MAP;
+                        List configurations = new ArrayList();
+                        configurations.addAll(conf.getConfs());
+                        configurations.addAll(Arrays.asList(conf.getInheritedRetrieveConfs().split(",")));
                         if (usePreviousResolveIfExist) {
-                            if (conf.confs.size() == 1 && "*".equals(conf.confs.get(0)))
{
+                            if (configurations.size() == 1 && "*".equals(configurations.get(0)))
{
                                 confs = md.getConfigurationsNames();
                             } else {
-                                confs = (String[]) conf.confs
-                                        .toArray(new String[conf.confs.size()]);
+                                confs = (String[]) configurations
+                                        .toArray(new String[configurations.size()]);
                             }
 
                             all = new LinkedHashSet();
@@ -255,8 +258,8 @@
                                             + md.getModuleRevisionId().getModuleId()
                                             + " doesn't contain enough data: resolving again\n");
                                     ResolveOptions resolveOption = new ResolveOptions()
-                                            .setConfs((String[]) conf.confs
-                                                    .toArray(new String[conf.confs.size()]));
+                                            .setConfs((String[]) configurations
+                                                    .toArray(new String[configurations.size()]));
                                     resolveOption.setValidate(ivy.getSettings().doValidate());
                                     ResolveReport r = ivy.resolve(md, resolveOption);
                                     all.addAll(Arrays.asList(r.getArtifactsReports(null,
false)));
@@ -271,7 +274,7 @@
                         } else {
                             Message.info("\n\nIVYDE: calling resolve on " + conf.ivyXmlPath
+ "\n");
                             ResolveOptions resolveOption = new ResolveOptions()
-                                    .setConfs((String[]) conf.confs.toArray(new String[conf.confs
+                                    .setConfs((String[]) configurations.toArray(new String[configurations
                                             .size()]));
                             resolveOption.setValidate(ivy.getSettings().doValidate());
                             ResolveReport report = ivy.resolve(md, resolveOption);

Propchange: ant/ivy/ivyde/trunk/test/retrieve-conf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Dec 30 08:08:32 2008
@@ -0,0 +1,3 @@
+bin
+lib
+

Added: ant/ivy/ivyde/trunk/test/retrieve-conf/.classpath
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-conf/.classpath?rev=730161&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/retrieve-conf/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/retrieve-conf/.classpath Tue Dec 30 08:08:32 2008
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=default&amp;ivySettingsPath=project%3A%2F%2F%2Fivysettings.xml&amp;doRetrieve=true&amp;retrievePattern=lib%2F%5Bartifact%5D-%5Btype%5D.%5Bext%5D&amp;retrieveSync=true&amp;retrieveConfs=*&amp;retrieveTypes=*&amp;acceptedTypes=jar&amp;sourceTypes=source&amp;javadocTypes=javadoc&amp;sourceSuffixes=-source%2C-sources%2C-src&amp;javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&amp;alphaOrder=false&amp;resolveInWorkspace=false"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: ant/ivy/ivyde/trunk/test/retrieve-conf/.project
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-conf/.project?rev=730161&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/retrieve-conf/.project (added)
+++ ant/ivy/ivyde/trunk/test/retrieve-conf/.project Tue Dec 30 08:08:32 2008
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ivydetest-retrieve-conf</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Added: ant/ivy/ivyde/trunk/test/retrieve-conf/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-conf/ivy.xml?rev=730161&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/retrieve-conf/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/retrieve-conf/ivy.xml Tue Dec 30 08:08:32 2008
@@ -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.    
+-->
+<ivy-module version="1.0">
+    <info organisation="org.apache.ivyde" module="ivytest-retrieve-conf">
+        <description>
+            Project that triggers a retrieve after resolve with a conf different from the
classpath one
+        </description>
+    </info>
+    <configurations>
+        <conf name="default" />
+        <conf name="retrieve" />
+    </configurations>
+    <dependencies>
+        <dependency org="myorg" name="mymodule" rev="1.1" conf="default" />
+        <dependency org="myorg" name="mybluemodule" rev="1.1" conf="retrieve->default"
/>
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/test/retrieve-conf/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/test/retrieve-conf/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/test/retrieve-conf/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/ivyde/trunk/test/retrieve-conf/ivysettings.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/retrieve-conf/ivysettings.xml?rev=730161&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/retrieve-conf/ivysettings.xml (added)
+++ ant/ivy/ivyde/trunk/test/retrieve-conf/ivysettings.xml Tue Dec 30 08:08:32 2008
@@ -0,0 +1,10 @@
+<ivysettings>
+    <caches defaultCacheDir="${ivy.settings.dir}/../cache-fakerepo" useOrigin="true" />
+    <settings defaultResolver="fakerepo" checkUpToDate="false" validate="false" />
+    <resolvers>
+        <filesystem name="fakerepo">
+            <ivy pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/ivy-[revision].xml"/>
+            <artifact pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+        </filesystem>
+    </resolvers>
+</ivysettings>

Propchange: ant/ivy/ivyde/trunk/test/retrieve-conf/ivysettings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/test/retrieve-conf/ivysettings.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/test/retrieve-conf/ivysettings.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message