Author: hibou
Date: Mon Aug 18 04:40:35 2008
New Revision: 686729
URL: http://svn.apache.org/viewvc?rev=686729&view=rev
Log:
IVYDE-96:
- make the test reproduce the bug
- add the proposed fix
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
ant/ivy/ivyde/trunk/test/custom-attributes/ivy.xml
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mybluemodule/ivy-1.1.xml
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=686729&r1=686728&r2=686729&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Mon Aug 18
04:40:35 2008
@@ -14,6 +14,7 @@
- FIX: Ivy preferences page mentions ivyconf not ivysettings (IVYDE-103)
- FIX: Resolve is not triggered anymore with Eclipse 3.4 (IVYDE-110)
- FIX: An incorrect configuration of a container make 3 error popup (IVYDE-112)
+- FIX: IvyDE does not honour the "validate" Attribute in a ivysetting file
(IVYDE-96)
version 2.0.0 alpha1
===========================
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=686729&r1=686728&r2=686729&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
Mon Aug 18 04:40:35 2008
@@ -240,9 +240,11 @@
Message.info("\n\nIVYDE: previous resolve of "
+
md.getModuleRevisionId().getModuleId()
+ " doesn't contain enough data:
resolving again\n");
- ResolveReport r = ivy.resolve(md, new
ResolveOptions()
+ ResolveOptions resolveOption = new
ResolveOptions()
.setConfs((String[]) conf.confs
- .toArray(new
String[conf.confs.size()])));
+ .toArray(new
String[conf.confs.size()]));
+
resolveOption.setValidate(ivy.getSettings().doValidate());
+ ResolveReport r = ivy.resolve(md,
resolveOption);
all.addAll(Arrays.asList(r.getArtifactsReports(null, false)));
confs = r.getConfigurations();
dependencies = listDependencies(r);
@@ -254,9 +256,11 @@
}
} else {
Message.info("\n\nIVYDE: calling resolve on " +
conf.ivyXmlPath + "\n");
- ResolveReport report = ivy.resolve(md, new
ResolveOptions()
+ ResolveOptions resolveOption = new ResolveOptions()
.setConfs((String[]) conf.confs.toArray(new
String[conf.confs
- .size()])));
+ .size()]));
+
resolveOption.setValidate(ivy.getSettings().doValidate());
+ ResolveReport report = ivy.resolve(md, resolveOption);
problemMessages = report.getAllProblemMessages();
all = new
LinkedHashSet(Arrays.asList(report.getArtifactsReports(null,
false)));
Modified: ant/ivy/ivyde/trunk/test/custom-attributes/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/custom-attributes/ivy.xml?rev=686729&r1=686728&r2=686729&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/test/custom-attributes/ivy.xml (original)
+++ ant/ivy/ivyde/trunk/test/custom-attributes/ivy.xml Mon Aug 18 04:40:35 2008
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra";>
+<ivy-module version="2.0">
<info organisation="org.apache.ivyde"
module="ivytest-custom-attributes">
<description>
</description>
@@ -25,6 +25,6 @@
<conf name="default" />
</configurations>
<dependencies>
- <dependency org="myorg" name="mybluemodule" e:color="blue"
rev="1.1" conf="default" />
+ <dependency org="myorg" name="mybluemodule" color="blue"
rev="1.1" conf="default" />
</dependencies>
</ivy-module>
Modified: ant/ivy/ivyde/trunk/test/fakerepo/myorg/mybluemodule/ivy-1.1.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/myorg/mybluemodule/ivy-1.1.xml?rev=686729&r1=686728&r2=686729&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/test/fakerepo/myorg/mybluemodule/ivy-1.1.xml (original)
+++ ant/ivy/ivyde/trunk/test/fakerepo/myorg/mybluemodule/ivy-1.1.xml Mon Aug 18
04:40:35 2008
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="1.0" xmlns:e="http://ant.apache.org/ivy/extra";>
+<ivy-module version="1.4">
<info organisation="myorg"
module="mybluemodule"
revision="1.1"
- e:color="blue"
+ color="blue"
status="release"
publication="20080811152510"
default="true"
