svn commit: r1578247 - in /ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services: PluginService.java impl/DefaultPluginServiceImpl.java

[jlboudart]

Author: jlboudart
Date: Mon Mar 17 07:03:01 2014
New Revision: 1578247

URL: http://svn.apache.org/r1578247
Log:
Fix broken unit tests, pluginservice should usecacheonly if easyant is run in 
offline mode

Modified:
    
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java
    
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java

Modified: 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java
URL: 
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java?rev=1578247&r1=1578246&r2=1578247&view=diff
==============================================================================
--- 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java
 (original)
+++ 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/PluginService.java
 Mon Mar 17 07:03:01 2014
@@ -201,4 +201,10 @@ public interface PluginService {
      * @return a string representing the description of the module descriptor
      */
     String getBuildTypeDescription(String moduleRevisionId);
+
+    /**
+     * Specify if plugin service should be used offline
+     * @param offlineMode
+     */
+    void setOfflineMode(boolean offlineMode);
 }

Modified: 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
URL: 
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java?rev=1578247&r1=1578246&r2=1578247&view=diff
==============================================================================
--- 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
 (original)
+++ 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
 Mon Mar 17 07:03:01 2014
@@ -90,6 +90,8 @@ public class DefaultPluginServiceImpl im
     private final Ivy ivyInstance;
     private final IvyAntSettings easyantIvySettings;
 
+    private boolean offlineMode;
+
     /**
      * This is the default constructor, the IvyContext should be the 
IvyContext configured to the easyant ivy instance
      * 
@@ -126,8 +128,8 @@ public class DefaultPluginServiceImpl im
 
             ResolveOptions resolveOptions = new ResolveOptions();
             resolveOptions.setLog(ResolveOptions.LOG_QUIET);
-            resolveOptions.setUseCacheOnly(true);
             resolveOptions.setConfs(conf.split(","));
+            resolveOptions.setUseCacheOnly(offlineMode);
             ResolveReport report = 
IvyContext.getContext().getIvy().getResolveEngine()
                     .resolve(pluginIvyFile.toURI().toURL(), resolveOptions);
             eaReport = new EasyAntReport();
@@ -165,8 +167,8 @@ public class DefaultPluginServiceImpl im
 
             ResolveOptions resolveOptions = new ResolveOptions();
             resolveOptions.setLog(ResolveOptions.LOG_QUIET);
-            resolveOptions.setUseCacheOnly(true);
             resolveOptions.setConfs(conf.split(","));
+            resolveOptions.setUseCacheOnly(offlineMode);
             final ResolveReport report = 
IvyContext.getContext().getIvy().getResolveEngine()
                     .resolve(moduleRevisionId, resolveOptions, true);
             eaReport = new EasyAntReport();
@@ -753,4 +755,8 @@ public class DefaultPluginServiceImpl im
             return null;
         }
     }
+
+    public void setOfflineMode(boolean offlineMode) {
+        this.offlineMode = offlineMode;
+    }
 }