incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1389079 [1/2] - in /incubator/easyant/core/trunk/src/main/java/org/apache/easyant: core/ core/ant/ core/parser/ core/report/ core/services/impl/ man/ tasks/ tasks/findclasspath/
Date Sun, 23 Sep 2012 15:28:04 GMT
Author: jlboudart
Date: Sun Sep 23 15:28:03 2012
New Revision: 1389079

URL: http://svn.apache.org/viewvc?rev=1389079&view=rev
Log:
Cleaning warnings in the whole project

Modified:
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/SubModule.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/AbstractFindClassPathStrategy.java

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java Sun Sep 23 15:28:03 2012
@@ -156,11 +156,11 @@ public class EasyAntEngine {
                     if (getLocalURL == null
                             && "org.eclipse.osgi.framework.internal.core.BundleURLConnection".equals(conn.getClass()
                                     .getName())) {
-                        EasyAntEngine.getLocalURL = conn.getClass().getMethod("getLocalURL", null);
+                        EasyAntEngine.getLocalURL = conn.getClass().getMethod("getLocalURL", (Class<?>) null);
                         getLocalURL.setAccessible(true);
                     }
                     if (getLocalURL != null && conn != null) {
-                        URL localJarUrl = (URL) getLocalURL.invoke(conn, null);
+                        URL localJarUrl = (URL) getLocalURL.invoke(conn, (Class<?>) null);
                         return getJarUrl(localJarUrl);
                     }
                 } catch (Throwable throwable) {
@@ -230,7 +230,7 @@ public class EasyAntEngine {
                 return null;
             }
             try {
-                path = defaultGlboalEasyAntIvySettings.toURL().toExternalForm();
+                path = defaultGlboalEasyAntIvySettings.toURI().toURL().toExternalForm();
             } catch (MalformedURLException e) {
                 throw new BuildException("Can't load easyant ivysettings file from "
                         + defaultGlboalEasyAntIvySettings.getAbsolutePath(), e);
@@ -402,9 +402,7 @@ public class EasyAntEngine {
     public void initProject(Project project) {
         project.init();
         // set user-define properties
-        Enumeration e = configuration.getDefinedProps().keys();
-        while (e.hasMoreElements()) {
-            String arg = (String) e.nextElement();
+        for (String arg : configuration.getDefinedProps().stringPropertyNames()) {
             String value = (String) configuration.getDefinedProps().get(arg);
             project.setUserProperty(arg, value);
         }
@@ -542,7 +540,7 @@ public class EasyAntEngine {
             String tgName = extensionInfo[0];
             String name = extensionInfo[1];
             OnMissingExtensionPoint missingBehaviour = OnMissingExtensionPoint.FAIL;
-            Hashtable projectTargets = project.getTargets();
+            Hashtable<?, ?> projectTargets = project.getTargets();
             if (!projectTargets.containsKey(tgName)) {
                 String message = "can't add target " + name + " to extension-point " + tgName
                         + " because the extension-point is unknown.";

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java Sun Sep 23 15:28:03 2012
@@ -24,14 +24,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.Vector;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -463,10 +461,10 @@ public class EasyAntMain implements AntM
      * 
      * @return the correct place in the list for the given name
      */
-    private static int findTargetPosition(Vector names, String name) {
+    private static int findTargetPosition(List<String> names, String name) {
         int res = names.size();
         for (int i = 0; i < names.size() && res == names.size(); i++) {
-            if (name.compareTo((String) names.elementAt(i)) < 0) {
+            if (name.compareTo((String) names.get(i)) < 0) {
                 res = i;
             }
         }
@@ -490,7 +488,7 @@ public class EasyAntMain implements AntM
      *            The maximum length of the names of the targets. If descriptions are given, they are padded to this
      *            position so they line up (so long as the names really <i>are</i> shorter than this).
      */
-    private static void printTargets(Project project, Vector names, Vector descriptions, String heading, int maxlen) {
+    private static void printTargets(Project project, List<String> names, List<String> descriptions, String heading, int maxlen) {
         if (names.size() > 0) {
             // now, start printing the targets and their descriptions
             String lSep = System.getProperty("line.separator");
@@ -503,10 +501,10 @@ public class EasyAntMain implements AntM
             msg.append(lSep + heading + lSep + lSep);
             for (int i = 0; i < names.size(); i++) {
                 msg.append(" ");
-                msg.append(names.elementAt(i));
+                msg.append(names.get(i));
                 if (descriptions != null) {
-                    msg.append(spaces.substring(0, maxlen - ((String) names.elementAt(i)).length() + 2));
-                    msg.append(descriptions.elementAt(i));
+                    msg.append(spaces.substring(0, maxlen - (names.get(i)).length() + 2));
+                    msg.append(descriptions.get(i));
                 }
                 msg.append(lSep);
             }
@@ -526,21 +524,18 @@ public class EasyAntMain implements AntM
     protected static void printTargets(Project project, boolean printSubTargets) {
         // find the target with the longest name
         int maxLength = 0;
-        Map ptargets = ProjectUtils.removeDuplicateTargets(project.getTargets());
+        Map<String, Target> ptargets = ProjectUtils.removeDuplicateTargets(project.getTargets());
         String targetName;
         String targetDescription;
-        Target currentTarget;
         // split the targets in top-level and sub-targets depending
         // on the presence of a description
-        Vector topNames = new Vector();
-        Vector topDescriptions = new Vector();
-        Vector subNames = new Vector();
-
-        Vector highLevelTargets = new Vector();
-        Vector highLevelTargetsDescriptions = new Vector();
-
-        for (Iterator i = ptargets.values().iterator(); i.hasNext();) {
-            currentTarget = (Target) i.next();
+        List<String> topNames = new ArrayList<String>();
+        List<String> topDescriptions = new ArrayList<String>();
+        List<String> subNames = new ArrayList<String>();
+
+        List<String> highLevelTargets = new ArrayList<String>();
+        List<String> highLevelTargetsDescriptions = new ArrayList<String>();
+        for (Target currentTarget : ptargets.values()) {
             targetName = currentTarget.getName();
             if (targetName.equals("")) {
                 continue;
@@ -549,15 +544,15 @@ public class EasyAntMain implements AntM
             // maintain a sorted list of targets
             if (currentTarget instanceof ExtensionPoint && !currentTarget.getName().contains(":")) {
                 int pos = findTargetPosition(highLevelTargets, targetName);
-                highLevelTargets.insertElementAt(targetName, pos);
-                highLevelTargetsDescriptions.insertElementAt(targetDescription, pos);
+                highLevelTargets.add(pos,targetName);
+                highLevelTargetsDescriptions.add(pos,targetDescription);
             } else if (targetDescription != null) {
                 int pos = findTargetPosition(topNames, targetName);
-                topNames.insertElementAt(targetName, pos);
-                topDescriptions.insertElementAt(targetDescription, pos);
+                topNames.add(pos,targetName);
+                topDescriptions.add(pos,targetDescription);
             } else {
                 int pos = findTargetPosition(subNames, targetName);
-                subNames.insertElementAt(targetName, pos);
+                subNames.add(pos,targetName);
             }
             if (targetName.length() > maxLength) {
                 maxLength = targetName.length();

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ProjectUtils.java Sun Sep 23 15:28:03 2012
@@ -28,6 +28,7 @@ import org.apache.tools.ant.BuildExcepti
 import org.apache.tools.ant.BuildListener;
 import org.apache.tools.ant.BuildLogger;
 import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.Location;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 
@@ -145,10 +146,10 @@ public class ProjectUtils {
      *            the targets to filter.
      * @return the filtered targets.
      */
-    public static Map removeDuplicateTargets(Map targets) {
-        Map locationMap = new HashMap();
-        for (Iterator i = targets.entrySet().iterator(); i.hasNext();) {
-            Map.Entry entry = (Map.Entry) i.next();
+    public static Map<String, Target> removeDuplicateTargets(Map<?, ?> targets) {
+        Map<Location, Target> locationMap = new HashMap<Location, Target>();
+        for (Iterator<?> i = targets.entrySet().iterator(); i.hasNext();) {
+            Map.Entry<?, ?> entry = (Map.Entry<?, ?>) i.next();
             String name = (String) entry.getKey();
             Target target = (Target) entry.getValue();
             Target otherTarget = (Target) locationMap.get(target.getLocation());
@@ -161,9 +162,8 @@ public class ProjectUtils {
                 // wins
             }
         }
-        Map ret = new HashMap();
-        for (Iterator i = locationMap.values().iterator(); i.hasNext();) {
-            Target target = (Target) i.next();
+        Map<String, Target> ret = new HashMap<String, Target>();
+        for (Target target : locationMap.values()) {
             ret.put(target.getName(), target);
         }
         return ret;

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java Sun Sep 23 15:28:03 2012
@@ -195,8 +195,9 @@ public class DefaultEasyAntXmlModuleDesc
         protected void ivyModuleStarted(Attributes attributes) throws SAXException {
             super.ivyModuleStarted(attributes);
             // lookup easyant namespace
-            for (Iterator iterator = getMd().getExtraAttributesNamespaces().entrySet().iterator(); iterator.hasNext();) {
-                Entry namespace = (Entry) iterator.next();
+            for (Iterator<?> iterator = getMd().getExtraAttributesNamespaces().entrySet().iterator(); iterator
+                    .hasNext();) {
+                Entry<?, ?> namespace = (Entry<?, ?>) iterator.next();
                 if (EasyAntConstants.EASYANT_MD_NAMESPACE.equals(namespace.getValue())) {
                     easyantPrefix = (String) namespace.getKey();
                 }
@@ -499,7 +500,7 @@ public class DefaultEasyAntXmlModuleDesc
                     throw new SAXException(fileName + " doesn't exists !");
                 }
                 PropertiesFile props = new PropertiesFile(file, "project properties");
-                Enumeration enumeration = props.propertyNames();
+                Enumeration<?> enumeration = props.propertyNames();
                 while (enumeration.hasMoreElements()) {
                     String key = (String) enumeration.nextElement();
                     String value = getSettings().substitute(props.getProperty(key));

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/EasyAntConfigParser.java Sun Sep 23 15:28:03 2012
@@ -23,7 +23,6 @@ import java.io.InputStream;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
@@ -201,18 +200,15 @@ public class EasyAntConfigParser {
                             properties.load(is);
                             is.close();
                         }
-                        for (Iterator iterator = properties.keySet().iterator(); iterator.hasNext();) {
-                            String key = (String) iterator.next();
+                        for (String key : properties.stringPropertyNames()) {
                             easyAntConfiguration.getDefinedProps().put(key, properties.get(key));
                         }
-
                     } catch (Exception e) {
                         if (attributes.getValue("file") != null) {
                             throw new SAXException("can't read property file at : " + attributes.getValue("file"));
                         } else if (attributes.getValue("url") != null) {
                             throw new SAXException("can't read property file at : " + attributes.getValue("url"));
                         }
-
                     }
                 } else if (attributes.getValue("name") != null) {
                     easyAntConfiguration.getDefinedProps().put(attributes.getValue("name"),
@@ -220,8 +216,6 @@ public class EasyAntConfigParser {
                 }
 
             }
-
         }
     }
-
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java Sun Sep 23 15:28:03 2012
@@ -20,7 +20,6 @@ package org.apache.easyant.core.report;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -29,8 +28,8 @@ import org.apache.ivy.core.module.descri
 import org.apache.ivy.core.report.ResolveReport;
 
 /**
- * This class represent a report of an easyant module It contains all
- * informations about properties / parameters / plugins / etc..
+ * This class represent a report of an easyant module It contains all informations about properties / parameters /
+ * plugins / etc..
  */
 public class EasyAntReport {
 
@@ -74,12 +73,12 @@ public class EasyAntReport {
         }
         return null;
     }
-    
+
     public TargetReport getTargetReport(String name, boolean includeImports) {
         TargetReport retVal = getTargetReport(name);
-        if(retVal == null && includeImports) {
+        if (retVal == null && includeImports) {
             List<TargetReport> targets = getAvailableTargets();
-            for(TargetReport target : targets) {
+            for (TargetReport target : targets) {
                 if (target.getName().equals(name)) {
                     retVal = target;
                 }
@@ -87,7 +86,7 @@ public class EasyAntReport {
         }
         return retVal;
     }
-    
+
     /**
      * Add a given targetReport to the list of know target
      * 
@@ -102,8 +101,7 @@ public class EasyAntReport {
     }
 
     /**
-     * Get an extension point by its name Return null if no extensionPointReport where found with
-     * this name
+     * Get an extension point by its name Return null if no extensionPointReport where found with this name
      * 
      * @param name
      *            represent the extension point name
@@ -122,9 +120,8 @@ public class EasyAntReport {
     }
 
     /**
-     * Get an extension point by its name Return null if no extensionPointReport where found with
-     * this name. The includeImports parameters can be additionally used to
-     * extend the search to include imports by the current module.
+     * Get an extension point by its name Return null if no extensionPointReport where found with this name. The
+     * includeImports parameters can be additionally used to extend the search to include imports by the current module.
      * 
      * @param name
      *            represent the extensionPoint name
@@ -134,9 +131,9 @@ public class EasyAntReport {
      */
     public ExtensionPointReport getExtensionPointReport(String name, boolean includeImports) {
         ExtensionPointReport retVal = getExtensionPointReport(name);
-        if(includeImports && retVal == null) {
+        if (includeImports && retVal == null) {
             List<ExtensionPointReport> extensionPoints = getAvailableExtensionPoints();
-            for(ExtensionPointReport extensionPoint : extensionPoints) {
+            for (ExtensionPointReport extensionPoint : extensionPoints) {
                 if (extensionPoint.getName().equals(name)) {
                     retVal = extensionPoint;
                 }
@@ -144,7 +141,7 @@ public class EasyAntReport {
         }
         return retVal;
     }
-    
+
     /**
      * Get a list of extension points available in this module
      * 
@@ -201,29 +198,27 @@ public class EasyAntReport {
     /**
      * Returns the imported module indicated by the passed parameter.
      * 
-     * The method attempts to match either the complete module id, module name
-     * or the module alias as specified in the build module.
+     * The method attempts to match either the complete module id, module name or the module alias as specified in the
+     * build module.
      * 
      * @param module
-     *      name of the module - either module id or the module alias.
+     *            name of the module - either module id or the module alias.
      * 
-     * @return
-     *      instance of the exact module report queried for, if such a 
-     *      module exists. it returns null otherwise.
+     * @return instance of the exact module report queried for, if such a module exists. it returns null otherwise.
      */
     public ImportedModuleReport getImportedModuleReport(String module) {
-        if(module.indexOf(';') > 0) {
+        if (module.indexOf(';') > 0) {
             module = module.substring(0, module.indexOf(';'));
         }
         ImportedModuleReport retVal = null;
-        for(ImportedModuleReport moduleRep : importedModuleReports) {
-            if(moduleRep.moduleMrid != null && moduleRep.moduleMrid.startsWith(module)) {
+        for (ImportedModuleReport moduleRep : importedModuleReports) {
+            if (moduleRep.moduleMrid != null && moduleRep.moduleMrid.startsWith(module)) {
                 retVal = moduleRep;
                 break;
             } else if (module.equals(moduleRep.getModuleRevisionId().getName())) {
                 retVal = moduleRep;
                 break;
-            } else if(moduleRep.as != null && moduleRep.as.equals(module)) {
+            } else if (moduleRep.as != null && moduleRep.as.equals(module)) {
                 retVal = moduleRep;
                 break;
             }
@@ -236,18 +231,16 @@ public class EasyAntReport {
         }
         return retVal;
     }
-    
+
     /**
      * Add an imported module
      * 
      * @param importedModuleReport
      *            a report that represent the importedModule
      */
-    public void addImportedModuleReport(
-            ImportedModuleReport importedModuleReport) {
+    public void addImportedModuleReport(ImportedModuleReport importedModuleReport) {
         if (importedModuleReport == null) {
-            throw new IllegalArgumentException(
-                    "importedModuleReport cannot be null");
+            throw new IllegalArgumentException("importedModuleReport cannot be null");
         }
         importedModuleReports.add(importedModuleReport);
     }
@@ -258,14 +251,11 @@ public class EasyAntReport {
      * @param propertyName
      *            the property name
      * @param propertyDescriptor
-     *            a property descriptor that contains several info on the
-     *            propery (description / required or not etc...)
+     *            a property descriptor that contains several info on the propery (description / required or not etc...)
      */
-    public void addPropertyDescriptor(String propertyName,
-            PropertyDescriptor propertyDescriptor) {
+    public void addPropertyDescriptor(String propertyName, PropertyDescriptor propertyDescriptor) {
         if (propertyName == null || propertyDescriptor == null) {
-            throw new IllegalArgumentException(
-                    "propertyName and propertyDescriptor cannot be null");
+            throw new IllegalArgumentException("propertyName and propertyDescriptor cannot be null");
         }
         this.propertyReports.put(propertyName, propertyDescriptor);
     }
@@ -276,8 +266,7 @@ public class EasyAntReport {
      * @param properties
      *            a map of propertyDescriptor to inject
      */
-    public void addAllPropertyDescriptor(
-            Map<String, PropertyDescriptor> properties) {
+    public void addAllPropertyDescriptor(Map<String, PropertyDescriptor> properties) {
         if (properties == null) {
             throw new IllegalArgumentException("properties cannot be null");
         }
@@ -295,6 +284,7 @@ public class EasyAntReport {
 
     /**
      * Get a list of all the properties available in this module or in all imported modules
+     * 
      * @return a list of all the properties available in this module or in all imported modules
      */
     public Map<String, PropertyDescriptor> getAvailableProperties() {
@@ -306,36 +296,25 @@ public class EasyAntReport {
         if (importedModuleReports != null) {
             for (ImportedModuleReport importedModuleReport : importedModuleReports) {
                 if (importedModuleReport.getEasyantReport() != null) {
-                    Map<String, PropertyDescriptor> subproperties = importedModuleReport
-                            .getEasyantReport().getAvailableProperties();
-                    for (Iterator iterator = subproperties.keySet().iterator(); iterator
-                            .hasNext();) {
-                        String propName = (String) iterator.next();
-                        PropertyDescriptor propertyToInsert = (PropertyDescriptor) subproperties
-                                .get(propName);
+                    Map<String, PropertyDescriptor> subproperties = importedModuleReport.getEasyantReport()
+                            .getAvailableProperties();
+                    for (String propName : subproperties.keySet()) {
+                        PropertyDescriptor propertyToInsert = subproperties.get(propName);
                         if (availableProperties.containsKey(propName)) {
                             PropertyDescriptor propertyDescriptor = (PropertyDescriptor) availableProperties
                                     .get(propName);
 
                             if (propertyDescriptor.getDescription() == null
                                     && propertyToInsert.getDescription() != null) {
-                                propertyDescriptor
-                                        .setDescription(propertyToInsert
-                                                .getDescription());
-                                propertyDescriptor.setRequired(propertyToInsert
-                                        .isRequired());
-                                propertyDescriptor
-                                        .setDefaultValue(propertyToInsert
-                                                .getDefaultValue());
-                                availableProperties.put(propName,
-                                        propertyDescriptor);
+                                propertyDescriptor.setDescription(propertyToInsert.getDescription());
+                                propertyDescriptor.setRequired(propertyToInsert.isRequired());
+                                propertyDescriptor.setDefaultValue(propertyToInsert.getDefaultValue());
+                                availableProperties.put(propName, propertyDescriptor);
                             }
 
                         } else
                             availableProperties.put(propName, propertyToInsert);
-
                     }
-
                 }
             }
         }
@@ -343,25 +322,22 @@ public class EasyAntReport {
     }
 
     /**
-     * This utilitary function allow us to retrieve a list of all targetReport
-     * available in this module and in all imported subModules
+     * This utilitary function allow us to retrieve a list of all targetReport available in this module and in all
+     * imported subModules
      * 
-     * @return a list of all TargetReport available in the module or in its
-     *         submodules
+     * @return a list of all TargetReport available in the module or in its submodules
      */
     public List<TargetReport> getAvailableTargets() {
         List<TargetReport> targets = new ArrayList<TargetReport>();
         targets.addAll(targetReports);
         for (ImportedModuleReport importedModuleReport : importedModuleReports) {
             if (importedModuleReport.getEasyantReport() != null)
-                for (TargetReport targetReport : importedModuleReport
-                        .getEasyantReport().getAvailableTargets()) {
+                for (TargetReport targetReport : importedModuleReport.getEasyantReport().getAvailableTargets()) {
                     TargetReport target = new TargetReport();
                     if (importedModuleReport.getAs() == null)
                         targets.add(targetReport);
                     else {
-                        target.setName(importedModuleReport.getAs()
-                                + targetReport.getName());
+                        target.setName(importedModuleReport.getAs() + targetReport.getName());
                         target.setDepends(targetReport.getDepends());
                         target.setIfCase(targetReport.getIfCase());
                         target.setUnlessCase(targetReport.getUnlessCase());
@@ -375,7 +351,7 @@ public class EasyAntReport {
         return targets;
 
     }
-    
+
     /**
      * Return a list of target that are not bound to any phases
      */
@@ -401,13 +377,12 @@ public class EasyAntReport {
         }
         return extensionPoints;
     }
-    
+
     /**
-     * This utilitary function allow us to retrieve a list of all ExtensionPointReport
-     * available in this module and in all imported subModules
+     * This utilitary function allow us to retrieve a list of all ExtensionPointReport available in this module and in
+     * all imported subModules
      * 
-     * @return a list of all ExtensionPointReport available in the module or in its
-     *         submodules
+     * @return a list of all ExtensionPointReport available in the module or in its submodules
      */
     public List<ExtensionPointReport> getAvailableExtensionPoints() {
         List<ExtensionPointReport> extensionPoints = getAvailableExtensionPointsWithoutTarget();
@@ -417,8 +392,7 @@ public class EasyAntReport {
         for (int i = 0; i < extensionPoints.size(); i++) {
             ExtensionPointReport extensionPoint = extensionPoints.get(i);
             for (TargetReport target : targets) {
-                if (target.getExtensionPoint() != null
-                        && target.getExtensionPoint().equals(extensionPoint.getName())) {
+                if (target.getExtensionPoint() != null && target.getExtensionPoint().equals(extensionPoint.getName())) {
                     extensionPoint.addTargetReport(target);
                     extensionPoints.set(i, extensionPoint);
                 }
@@ -427,7 +401,7 @@ public class EasyAntReport {
 
         return extensionPoints;
     }
-    
+
     public ResolveReport getResolveReport() {
         return resolveReport;
     }
@@ -438,6 +412,7 @@ public class EasyAntReport {
 
     /**
      * Get attached module descriptor
+     * 
      * @return attached module descriptor
      */
     public ModuleDescriptor getModuleDescriptor() {
@@ -446,11 +421,13 @@ public class EasyAntReport {
 
     /**
      * Set attached module descriptor
-     * @param moduleDescriptor attached module descriptor
+     * 
+     * @param moduleDescriptor
+     *            attached module descriptor
      */
     public void setModuleDescriptor(ModuleDescriptor moduleDescriptor) {
         this.moduleDescriptor = moduleDescriptor;
-        
+
     }
 
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java Sun Sep 23 15:28:03 2012
@@ -82,9 +82,8 @@ public class XMLEasyAntReportWriter {
         if (mrid.getBranch() != null) {
             out.println("\t\tbranch=\"" + XMLHelper.escape(mrid.getBranch()) + "\"");
         }
-        Map extraAttributes = mrid.getExtraAttributes();
-        for (Iterator it = extraAttributes.entrySet().iterator(); it.hasNext();) {
-            Map.Entry entry = (Entry) it.next();
+        Map<?, ?> extraAttributes = mrid.getExtraAttributes();
+        for (Map.Entry<?, ?> entry : extraAttributes.entrySet()) {
             out.println("\t\textra-" + entry.getKey() + "=\"" + XMLHelper.escape(entry.getValue().toString()) + "\"");
         }
         out.println("\t\tconf=\"" + XMLHelper.escape(report.getConfiguration()) + "\"");
@@ -113,13 +112,13 @@ public class XMLEasyAntReportWriter {
         out.println("\t<dependencies>");
 
         // create a list of ModuleRevisionIds indicating the position for each dependency
-        List dependencies = new ArrayList(report.getModuleRevisionIds());
+        List<?> dependencies = new ArrayList(report.getModuleRevisionIds());
 
-        for (Iterator iter = report.getModuleIds().iterator(); iter.hasNext();) {
+        for (Iterator<?> iter = report.getModuleIds().iterator(); iter.hasNext();) {
             ModuleId mid = (ModuleId) iter.next();
             out.println("\t\t<module organisation=\"" + XMLHelper.escape(mid.getOrganisation()) + "\"" + " name=\""
                     + XMLHelper.escape(mid.getName()) + "\">");
-            for (Iterator it2 = report.getNodes(mid).iterator(); it2.hasNext();) {
+            for (Iterator<?> it2 = report.getNodes(mid).iterator(); it2.hasNext();) {
                 IvyNode dep = (IvyNode) it2.next();
                 ouputRevision(report, out, dependencies, dep, easyAntReport);
             }
@@ -134,7 +133,7 @@ public class XMLEasyAntReportWriter {
 
     private void ouputRevision(ConfigurationResolveReport report, PrintWriter out, List dependencies, IvyNode dep,
             EasyAntReport easyAntReport) {
-        Map extraAttributes;
+        Map<?, ?> extraAttributes;
         ModuleDescriptor md = null;
         if (dep.getModuleRevision() != null) {
             md = dep.getModuleRevision().getDescriptor();
@@ -168,7 +167,7 @@ public class XMLEasyAntReportWriter {
             details.append(" homepage=\"").append(XMLHelper.escape(md.getHomePage())).append("\"");
         }
         extraAttributes = md != null ? md.getExtraAttributes() : dep.getResolvedId().getExtraAttributes();
-        for (Iterator iterator = extraAttributes.keySet().iterator(); iterator.hasNext();) {
+        for (Iterator<?> iterator = extraAttributes.keySet().iterator(); iterator.hasNext();) {
             String attName = (String) iterator.next();
             details.append(" extra-").append(attName).append("=\"")
                     .append(XMLHelper.escape(extraAttributes.get(attName).toString())).append("\"");
@@ -204,9 +203,9 @@ public class XMLEasyAntReportWriter {
     private void outputEvictionInformation(ConfigurationResolveReport report, PrintWriter out, IvyNode dep) {
         if (dep.isEvicted(report.getConfiguration())) {
             EvictionData ed = dep.getEvictedData(report.getConfiguration());
-            Collection selected = ed.getSelected();
+            Collection<?> selected = ed.getSelected();
             if (selected != null) {
-                for (Iterator it3 = selected.iterator(); it3.hasNext();) {
+                for (Iterator<?> it3 = selected.iterator(); it3.hasNext();) {
                     IvyNode sel = (IvyNode) it3.next();
                     out.println("\t\t\t\t<evicted-by rev=\"" + XMLHelper.escape(sel.getResolvedId().getRevision())
                             + "\"/>");
@@ -247,8 +246,8 @@ public class XMLEasyAntReportWriter {
         Caller[] callers = dep.getCallers(report.getConfiguration());
         for (int i = 0; i < callers.length; i++) {
             StringBuffer callerDetails = new StringBuffer();
-            Map callerExtraAttributes = callers[i].getDependencyDescriptor().getExtraAttributes();
-            for (Iterator iterator = callerExtraAttributes.keySet().iterator(); iterator.hasNext();) {
+            Map<?, ?> callerExtraAttributes = callers[i].getDependencyDescriptor().getExtraAttributes();
+            for (Iterator<?> iterator = callerExtraAttributes.keySet().iterator(); iterator.hasNext();) {
                 String attName = (String) iterator.next();
                 callerDetails.append(" extra-").append(attName).append("=\"")
                         .append(XMLHelper.escape(callerExtraAttributes.get(attName).toString())).append("\"");
@@ -277,14 +276,14 @@ public class XMLEasyAntReportWriter {
     }
 
     private void outputArtifacts(ConfigurationResolveReport report, PrintWriter out, IvyNode dep) {
-        Map extraAttributes;
+        Map<?, ?> extraAttributes;
         ArtifactDownloadReport[] adr = report.getDownloadReports(dep.getResolvedId());
         out.println("\t\t\t\t<artifacts>");
         for (int i = 0; i < adr.length; i++) {
             out.print("\t\t\t\t\t<artifact name=\"" + XMLHelper.escape(adr[i].getName()) + "\" type=\""
                     + XMLHelper.escape(adr[i].getType()) + "\" ext=\"" + XMLHelper.escape(adr[i].getExt()) + "\"");
             extraAttributes = adr[i].getArtifact().getExtraAttributes();
-            for (Iterator iterator = extraAttributes.keySet().iterator(); iterator.hasNext();) {
+            for (Iterator<?> iterator = extraAttributes.keySet().iterator(); iterator.hasNext();) {
                 String attName = (String) iterator.next();
                 out.print(" extra-" + attName + "=\"" + XMLHelper.escape(extraAttributes.get(attName).toString())
                         + "\"");

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=1389079&r1=1389078&r2=1389079&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 Sun Sep 23 15:28:03 2012
@@ -216,13 +216,12 @@ public class DefaultPluginServiceImpl im
     }
 
     private void analyseProject(Project project, EasyAntReport eaReport, String conf) throws IOException, Exception {
-        Map targets = ProjectUtils.removeDuplicateTargets(project.getTargets());
-        for (Iterator iterator = targets.values().iterator(); iterator.hasNext();) {
-            Target target = (Target) iterator.next();
+        Map<String, Target> targets = ProjectUtils.removeDuplicateTargets(project.getTargets());
+        for (Target target : targets.values()) {
             handleTarget(target, eaReport);
             for (int i = 0; i < target.getTasks().length; i++) {
                 Task task = target.getTasks()[i];
-                Class taskClass = ComponentHelper.getComponentHelper(project).getComponentClass(task.getTaskType());
+                Class<?> taskClass = ComponentHelper.getComponentHelper(project).getComponentClass(task.getTaskType());
                 if (taskClass == null) {
                     continue;
                 }
@@ -339,10 +338,6 @@ public class DefaultPluginServiceImpl im
         }
     }
 
-    /**
-     * @param target
-     * @param eaReport
-     */
     private void handleTarget(Target target, EasyAntReport eaReport) {
         if (!"".equals(target.getName())) {
             boolean isExtensionPoint = target instanceof ExtensionPoint;
@@ -350,7 +345,7 @@ public class DefaultPluginServiceImpl im
                 TargetReport targetReport = new TargetReport();
                 targetReport.setName(target.getName());
                 StringBuilder sb = new StringBuilder();
-                Enumeration targetDeps = target.getDependencies();
+                Enumeration<?> targetDeps = target.getDependencies();
                 while (targetDeps.hasMoreElements()) {
                     String t = (String) targetDeps.nextElement();
                     sb.append(t);
@@ -362,10 +357,10 @@ public class DefaultPluginServiceImpl im
                 targetReport.setDescription(target.getDescription());
                 targetReport.setIfCase(target.getIf());
                 targetReport.setUnlessCase(target.getUnless());
-                for (Iterator iterator = target.getProject().getTargets().values().iterator(); iterator.hasNext();) {
+                for (Iterator<?> iterator = target.getProject().getTargets().values().iterator(); iterator.hasNext();) {
                     Target currentTarget = (Target) iterator.next();
                     if (currentTarget instanceof ExtensionPoint) {
-                        Enumeration dependencies = currentTarget.getDependencies();
+                        Enumeration<?> dependencies = currentTarget.getDependencies();
                         while (dependencies.hasMoreElements()) {
                             String dep = (String) dependencies.nextElement();
                             if (dep.equals(target.getName())) {
@@ -382,7 +377,7 @@ public class DefaultPluginServiceImpl im
             } else {
                 ExtensionPointReport extensionPoint = new ExtensionPointReport(target.getName());
                 StringBuilder sb = new StringBuilder();
-                Enumeration targetDeps = target.getDependencies();
+                Enumeration<?> targetDeps = target.getDependencies();
                 while (targetDeps.hasMoreElements()) {
                     String t = (String) targetDeps.nextElement();
                     sb.append(t);
@@ -422,8 +417,8 @@ public class DefaultPluginServiceImpl im
         IvyContext.pushNewContext().setIvy(ivyInstance);
         // First we need to parse the specified file to retrieve all the easyant
         // stuff
-        parser.parseDescriptor(ivyInstance.getSettings(), moduleDescriptor.toURL(),
-                new URLResource(moduleDescriptor.toURL()), true);
+        parser.parseDescriptor(ivyInstance.getSettings(), moduleDescriptor.toURI().toURL(),
+                new URLResource(moduleDescriptor.toURI().toURL()), true);
         EasyAntModuleDescriptor md = parser.getEasyAntModuleDescriptor();
         IvyContext.popContext();
         return md;
@@ -452,8 +447,7 @@ public class DefaultPluginServiceImpl im
                 eaReport.addImportedModuleReport(buildType);
             }
             // Store infos on plugins
-            for (Iterator iterator = md.getPlugins().iterator(); iterator.hasNext();) {
-                PluginDescriptor plugin = (PluginDescriptor) iterator.next();
+            for (PluginDescriptor plugin : md.getPlugins()) {
                 ImportedModuleReport pluginReport = new ImportedModuleReport();
                 ModuleRevisionId mrid = ModuleRevisionId.parse(plugin.getMrid());
                 pluginReport.setModuleMrid(plugin.getMrid());

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java Sun Sep 23 15:28:03 2012
@@ -29,6 +29,8 @@ import org.apache.easyant.core.report.Ta
  */
 public class Describe extends EasyantOption {
     
+    private static final long serialVersionUID = 1L;
+    
     public Describe()
             throws IllegalArgumentException {
         super("describe", true, "Describes extension points / target / property specified by the argument");

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/EasyantOption.java Sun Sep 23 15:28:03 2012
@@ -46,6 +46,9 @@ import org.apache.tools.ant.Project;
  * 
  */
 public abstract class EasyantOption extends Option {
+    
+    private static final long serialVersionUID = 1L;
+    
     public static final String LINE_SEP = System.getProperty("line.separator");
     private Project project;
     private EasyAntReport eareport;

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java Sun Sep 23 15:28:03 2012
@@ -29,6 +29,9 @@ import org.apache.easyant.core.report.Ex
  */
 public class ListExtensionPoints extends EasyantOption{
     
+    private static final long serialVersionUID = 1L;
+    
+    
     public ListExtensionPoints()
             throws IllegalArgumentException {
         super("listExtensionPoints", false, "List all phases available");

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java Sun Sep 23 15:28:03 2012
@@ -26,7 +26,8 @@ import org.apache.easyant.core.report.Im
  * build module.
  */
 public class ListPlugins extends EasyantOption {
-
+    private static final long serialVersionUID = 1L;
+    
     
     public ListPlugins()
             throws IllegalArgumentException {

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java Sun Sep 23 15:28:03 2012
@@ -29,6 +29,8 @@ import org.apache.easyant.core.report.Im
  */
 public class ListProps extends EasyantOption {
 
+    private static final long serialVersionUID = 1L;
+    
     public ListProps() throws IllegalArgumentException {
         super("listProps", true, "List all properties available or specified in a given plugin as argument");
         setOptionalArg(true);

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java Sun Sep 23 15:28:03 2012
@@ -35,6 +35,7 @@ import org.apache.tools.ant.Project;
  */
 public class ListTargets extends EasyantOption {
     
+    private static final long serialVersionUID = 1L;
     
     public ListTargets() {
         super("listTargets", true, "List all targets available or associated with a given phase or plugin as argument");

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java Sun Sep 23 15:28:03 2012
@@ -188,7 +188,7 @@ public abstract class AbstractImport ext
     protected void checkCoreCompliance(ResolveReport report, String confToCheck) {
         if (report.getConfigurationReport(confToCheck) != null) {
             log("checking module's provided dependencies ...", Project.MSG_DEBUG);
-            for (Iterator iterator = report.getConfigurationReport(confToCheck).getModuleRevisionIds().iterator(); iterator
+            for (Iterator<?> iterator = report.getConfigurationReport(confToCheck).getModuleRevisionIds().iterator(); iterator
                     .hasNext();) {
                 ModuleRevisionId currentmrid = (ModuleRevisionId) iterator.next();
                 log("checking " + currentmrid.toString(), Project.MSG_DEBUG);

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java Sun Sep 23 15:28:03 2012
@@ -31,7 +31,7 @@ import org.apache.tools.ant.Task;
 public class BindTarget extends Task {
 
     private String target;
-    private String toPhase;
+    private String extensionOf;
 
     private String buildConfigurations;
 
@@ -52,11 +52,11 @@ public class BindTarget extends Task {
         }
 
         // unbind current mapping
-        for (Iterator iterator = getProject().getTargets().values().iterator(); iterator
+        for (Iterator<?> iterator = getProject().getTargets().values().iterator(); iterator
                 .hasNext();) {
             Target current = (Target) iterator.next();
             if (current instanceof ExtensionPoint) {
-                Enumeration dependencies = current.getDependencies();
+                Enumeration<?> dependencies = current.getDependencies();
                 StringBuilder dependsOn = new StringBuilder();
                 boolean requiresUpdates = false;
                 while (dependencies.hasMoreElements()) {
@@ -92,16 +92,16 @@ public class BindTarget extends Task {
             }
         }
 
-        if (getToPhase() != null && !getToPhase().equals("")) {
-            if (!getProject().getTargets().containsKey(getToPhase())) {
+        if (getExtensionOf() != null && !getExtensionOf().equals("")) {
+            if (!getProject().getTargets().containsKey(getExtensionOf())) {
                 throw new BuildException("can't add target " + getTarget()
-                        + " to phase " + getToPhase() + " because the phase"
+                        + " to phase " + getExtensionOf() + " because the phase"
                         + " is unknown.");
             }
-            Target p = (Target) getProject().getTargets().get(getToPhase());
+            Target p = (Target) getProject().getTargets().get(getExtensionOf());
 
             if (!(p instanceof Phase)) {
-                throw new BuildException("referenced target " + getToPhase()
+                throw new BuildException("referenced target " + getExtensionOf()
                         + " is not a phase");
             }
             p.addDependency(getTarget());
@@ -109,12 +109,12 @@ public class BindTarget extends Task {
 
     }
 
-    public String getToPhase() {
-        return toPhase;
+    public String getExtensionOf() {
+        return extensionOf;
     }
 
     public void setExtensionOf(String toPhase) {
-        this.toPhase = toPhase;
+        this.extensionOf = toPhase;
     }
 
     public String getTarget() {

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ConfigureEasyAntIvyInstance.java Sun Sep 23 15:28:03 2012
@@ -46,7 +46,7 @@ public class ConfigureEasyAntIvyInstance
     public void setConfigurationFile(String configurationFile) {
         File f = new File(configurationFile);
         try {
-            EasyantConfigurationFactory.getInstance().createConfigurationFromFile(getEasyantConfiguration(), f.toURL());
+            EasyantConfigurationFactory.getInstance().createConfigurationFromFile(getEasyantConfiguration(), f.toURI().toURL());
         } catch (Exception e) {
             throw new BuildException("Can't create easyantConfiguration from File " + configurationFile, e);
         }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/EasyAntRunner.java Sun Sep 23 15:28:03 2012
@@ -65,7 +65,7 @@ public class EasyAntRunner extends Task 
         try {
             EasyantConfigurationFactory.getInstance()
                     .createConfigurationFromFile(getEasyantConfiguration(),
-                            f.toURL());
+                            f.toURI().toURL());
         } catch (Exception e) {
             throw new BuildException(
                     "Can't create easyantConfiguration from File "

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/GoOffline.java Sun Sep 23 15:28:03 2012
@@ -100,7 +100,7 @@ public class GoOffline extends AbstractE
             if (importedModule.getEasyantReport() != null) {
                 //install module dependencies
                 ResolveReport resolveReport=importedModule.getEasyantReport().getResolveReport();
-                for (Iterator iterator = resolveReport.getDependencies().iterator(); iterator.hasNext();) {
+                for (Iterator<?> iterator = resolveReport.getDependencies().iterator(); iterator.hasNext();) {
                     IvyNode dependency = (IvyNode) iterator.next();
                     install(dependency.getResolvedId(), getEasyantResolverName(),
                             EasyAntMagicNames.EASYANT_IVY_INSTANCE);

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ImportAntscripts.java Sun Sep 23 15:28:03 2012
@@ -218,7 +218,7 @@ public class ImportAntscripts extends Ta
             log(nbPaths + " paths resolved in " + (System.currentTimeMillis() - startTime) + "ms.", Project.MSG_VERBOSE);
 
             log("Importing " + antScriptsPath.size() + " ant scripts", Project.MSG_VERBOSE);
-            Iterator itScripts = antScriptsPath.iterator();
+            Iterator<?> itScripts = antScriptsPath.iterator();
             while (itScripts.hasNext()) {
                 log("\t" + itScripts.next(), Project.MSG_VERBOSE);
             }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java?rev=1389079&r1=1389078&r2=1389079&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java Sun Sep 23 15:28:03 2012
@@ -255,8 +255,8 @@ public class LoadModule extends Abstract
 
         try {
             parser.setActiveBuildConfigurations(getProject().getProperty(EasyAntMagicNames.ACTIVE_BUILD_CONFIGURATIONS));
-            parser.parseDescriptor(getEasyAntIvyInstance().getSettings(), buildModule.toURL(), new URLResource(
-                    buildModule.toURL()), true);
+            parser.parseDescriptor(getEasyAntIvyInstance().getSettings(), buildModule.toURI().toURL(), new URLResource(
+                    buildModule.toURI().toURL()), true);
             EasyAntModuleDescriptor md = parser.getEasyAntModuleDescriptor();
             ModuleRevisionId currentModule = md.getIvyModuleDescriptor().getModuleRevisionId();
 



Mime
View raw message