ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r987776 - in /ant/ivy/ivyde/trunk: CHANGES.txt org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
Date Sat, 21 Aug 2010 15:56:24 GMT
Author: hibou
Date: Sat Aug 21 15:56:23 2010
New Revision: 987776

URL: http://svn.apache.org/viewvc?rev=987776&view=rev
Log:
IVYDE-244:
 * use the Ivy API so the settings gets configured correctly

Modified:
    ant/ivy/ivyde/trunk/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java

Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=987776&r1=987775&r2=987776&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Sat Aug 21 15:56:23 2010
@@ -10,6 +10,7 @@
 - IMPROVE: IvyDE now resolve by batch, then preventing too many workspace build (IVYDE-177)
 
 - FIX: Variable based path for ivysettings doesn't work it there are some spaces in the path
(IVYDE-253)
+- FIX: Triggers are not called (IVYDE-244)
 
   version 2.1.0
 ==========================

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java?rev=987776&r1=987775&r2=987776&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerState.java
Sat Aug 21 15:56:23 2010
@@ -147,9 +147,11 @@ public class IvyClasspathContainerState 
             // no settings specified, so take the default one
             if (ivy == null) {
                 IvySettings ivySettings = createIvySettings();
+                ivy = Ivy.newInstance(ivySettings);
                 try {
-                    ivySettings.loadDefault();
+                    ivy.configureDefault();
                 } catch (ParseException e) {
+                    ivy = null;
                     IvyDEException ex = new IvyDEException(
                             "Parsing error of the default Ivy settings",
                             "The default Ivy settings file could not be parsed: " + e.getMessage(),
@@ -157,6 +159,7 @@ public class IvyClasspathContainerState 
                     setConfStatus(ex);
                     throw ex;
                 } catch (IOException e) {
+                    ivy = null;
                     IvyDEException ex = new IvyDEException(
                             "Read error of the default Ivy settings",
                             "The default Ivy settings file could not be read: "
@@ -164,7 +167,6 @@ public class IvyClasspathContainerState 
                     setConfStatus(ex);
                     throw ex;
                 }
-                ivy = Ivy.newInstance(ivySettings);
             }
             setConfStatus(null);
             return ivy;
@@ -195,23 +197,25 @@ public class IvyClasspathContainerState 
             // an URL but not a file
             if (ivy == null || ivySettingsLastModified == -1) {
                 IvySettings ivySettings = createIvySettings();
+                ivy = Ivy.newInstance(ivySettings);
                 try {
-                    ivySettings.load(url);
+                    ivy.configure(url);
                     ivySettingsLastModified = 0;
                 } catch (ParseException e) {
+                    ivy = null;
                     IvyDEException ex = new IvyDEException("Parsing error of the Ivy settings",
                             "The ivy settings file '" + settingsPath + "' could not be parsed:
"
                                     + e.getMessage(), e);
                     setConfStatus(ex);
                     throw ex;
                 } catch (IOException e) {
+                    ivy = null;
                     IvyDEException ex = new IvyDEException("Read error of the Ivy settings",
                             "The ivy settings file '" + settingsPath + "' could not be read:
"
                                     + e.getMessage(), e);
                     setConfStatus(ex);
                     throw ex;
                 }
-                ivy = Ivy.newInstance(ivySettings);
             }
         }
         setConfStatus(null);
@@ -235,22 +239,24 @@ public class IvyClasspathContainerState 
             } else {
                 Message.info("\n\nIVYDE: ivysettings has changed, configuring ivy again\n");
             }
+            ivy = Ivy.newInstance(ivySettings);
             try {
-                ivySettings.load(file);
+                ivy.configure(file);
             } catch (ParseException e) {
+                ivy = null;
                 IvyDEException ex = new IvyDEException("Parsing error of the Ivy settings",
                         "The ivy settings file '" + ivySettingsPath + "' could not be parsed:
"
                                 + e.getMessage(), e);
                 setConfStatus(ex);
                 throw ex;
             } catch (IOException e) {
+                ivy = null;
                 IvyDEException ex = new IvyDEException("Read error of the Ivy settings",
                         "The ivy settings file '" + ivySettingsPath + "' could not be read:
"
                                 + e.getMessage(), e);
                 setConfStatus(ex);
                 throw ex;
             }
-            ivy = Ivy.newInstance(ivySettings);
             ivySettingsLastModified = file.lastModified();
         }
         return ivy;



Mime
View raw message