ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r810885 - in /ant/ivy/ivyde/trunk: CHANGES.txt org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceResolver.java
Date Thu, 03 Sep 2009 10:48:29 GMT
Author: hibou
Date: Thu Sep  3 10:48:29 2009
New Revision: 810885

URL: http://svn.apache.org/viewvc?rev=810885&view=rev
Log:
IVYDE-186 : make the workspace resolver understand than found working@WORKSTATION match everything

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=810885&r1=810884&r2=810885&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Thu Sep  3 10:48:29 2009
@@ -8,6 +8,7 @@
 
 - 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)
+- FIX: Resolve in Workspace fails to find projects under certain conditions (IVYDE-186) (thanks
to Adam Karl)
 
   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=810885&r1=810884&r2=810885&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
Thu Sep  3 10:48:29 2009
@@ -179,7 +179,8 @@
                 }
 
                 // Found one; check if it is for the module we need
-                if (versionMatcher.accept(dd.getDependencyRevisionId(), md)) {
+                if (md.getModuleRevisionId().getRevision().startsWith("working@")
+                        || versionMatcher.accept(dd.getDependencyRevisionId(), md)) {
 
                     Artifact af = new DefaultArtifact(md.getModuleRevisionId(), md
                             .getPublicationDate(), javaProject.getPath().toString(),



Mime
View raw message