Author: hibou
Date: Sun Aug 30 10:02:57 2009
New Revision: 809293
URL: http://svn.apache.org/viewvc?rev=809293&view=rev
Log:
IVYDE-188 :
- make the workspace resolver tag real artifacts not downloadable by itself
- make the module descriptor of a project not declare a default artifact
Modified:
ant/ivy/ivyde/trunk/CHANGES.txt
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=809293&r1=809292&r2=809293&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Sun Aug 30 10:02:57 2009
@@ -6,6 +6,7 @@
- NEW: Inclusion of Ivy related schemas into the Eclipse XML Catalog
(IVYDE-190) (thanks to Miguel Griffa)
- FIX: "Ivy Settings Path" Browse button results in an incorrectly formatted
URL (IVYDE-191) (thanks to Jon Schneider)
+- FIX: Workspace Resolver Prevents Source Download (IVYDE-188) (thanks to
Phillip Webb)
version 2.0.0 final
==========================
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java?rev=809293&r1=809292&r2=809293&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
Sun Aug 30 10:02:57 2009
@@ -132,9 +132,9 @@
adr.setDownloadStatus(DownloadStatus.NO);
adr.setSize(0);
} else {
- Message.verbose("\t[Eclipse Workspace resolver - skipping
non-project artifact] "
- + artifacts[i]);
- adr.setDownloadStatus(DownloadStatus.NO);
+ Message.verbose("\t[Eclipse Workspace resolver] "
+ + "cannot download non-project artifact: " +
artifacts[i]);
+ adr.setDownloadStatus(DownloadStatus.FAILED);
}
}
return dr;
@@ -201,8 +201,11 @@
}
private DefaultModuleDescriptor cloneMd(ModuleDescriptor md, Artifact af) {
- DefaultModuleDescriptor newMd =
DefaultModuleDescriptor.newDefaultInstance(md
- .getModuleRevisionId());
+
+ DefaultModuleDescriptor newMd = new
DefaultModuleDescriptor(md.getModuleRevisionId(),
+ "release", null, true);
+ newMd.addConfiguration(new
Configuration(ModuleDescriptor.DEFAULT_CONFIGURATION));
+ newMd.setLastModified(System.currentTimeMillis());
newMd.setDescription(md.getDescription());
newMd.setHomePage(md.getHomePage());
