You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/08/14 18:40:57 UTC

svn commit: r1373016 - /incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java

Author: jlboudart
Date: Tue Aug 14 18:40:56 2012
New Revision: 1373016

URL: http://svn.apache.org/viewvc?rev=1373016&view=rev
Log:
PluginService should handle plugins even if there is no buildtype

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

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java?rev=1373016&r1=1373015&r2=1373016&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java Tue Aug 14 18:40:56 2012
@@ -392,23 +392,22 @@ public class DefaultPluginServiceImpl im
                 buildType.setModuleMrid(md.getBuildType());
                 buildType.setEasyantReport(getPluginInfo(ModuleRevisionId.parse(md.getBuildType())));
                 eaReport.addImportedModuleReport(buildType);
-                // Store infos on plugins
-                for (Iterator iterator = md.getPlugins().iterator(); iterator.hasNext();) {
-                    PluginDescriptor plugin = (PluginDescriptor) iterator.next();
-                    ImportedModuleReport pluginReport = new ImportedModuleReport();
-                    ModuleRevisionId mrid = ModuleRevisionId.parse(plugin.getMrid());
-                    pluginReport.setModuleMrid(plugin.getMrid());
-                    if (plugin.getAs() == null) {
-                        pluginReport.setAs(mrid.getName());
-                    } else {
-                        pluginReport.setAs(plugin.getAs());
-                    }
-                    pluginReport.setType(plugin.getMode());
-                    pluginReport.setEasyantReport(getPluginInfo(ModuleRevisionId.parse(plugin.getMrid())));
-                    eaReport.addImportedModuleReport(pluginReport);
+            }
+            // Store infos on plugins
+            for (Iterator iterator = md.getPlugins().iterator(); iterator.hasNext();) {
+                PluginDescriptor plugin = (PluginDescriptor) iterator.next();
+                ImportedModuleReport pluginReport = new ImportedModuleReport();
+                ModuleRevisionId mrid = ModuleRevisionId.parse(plugin.getMrid());
+                pluginReport.setModuleMrid(plugin.getMrid());
+                if (plugin.getAs() == null) {
+                    pluginReport.setAs(mrid.getName());
+                } else {
+                    pluginReport.setAs(plugin.getAs());
                 }
+                pluginReport.setType(plugin.getMode());
+                pluginReport.setEasyantReport(getPluginInfo(ModuleRevisionId.parse(plugin.getMrid())));
+                eaReport.addImportedModuleReport(pluginReport);
             }
-
         } catch (Exception e) {
             throw new Exception("problem while parsing Ivy module file: " + e.getMessage(), e);
         }