incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1073371 [20/28] - in /incubator/easyant/core/trunk: ./ bin/ example/build-configurations/ example/build-configurations/src/main/java/org/apache/easyant/example/ example/build-configurations/src/test/java/org/apache/easyant/example/ example...
Date Tue, 22 Feb 2011 15:56:09 GMT
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/BasicConfigurationStrategy.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/BasicConfigurationStrategy.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/BasicConfigurationStrategy.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/BasicConfigurationStrategy.java Tue Feb 22 15:55:55 2011
@@ -22,67 +22,67 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Reference;
 
 public class BasicConfigurationStrategy extends AbstractFindClassPathStrategy{
-	private String organisation;
-	private String module;
-	private String revision;
-	private String conf = "default";
-	protected String settingsRef;
-
-	protected boolean doCheck() {
-		log("Checking plugin configuration ...",Project.MSG_VERBOSE);
-		loadCachePath(getOrganisation(), getModule(), getRevision(), getConf(),
-				getSettingsReference());
-		return true;
-	}
-
-	public String getOrganisation() {
-		return organisation;
-	}
-
-	public void setOrganisation(String organisation) {
-		this.organisation = organisation;
-	}
-
-	public String getModule() {
-		return module;
-	}
-
-	public void setModule(String module) {
-		this.module = module;
-	}
-
-	public String getRevision() {
-		return revision;
-	}
-
-	public void setRevision(String revision) {
-		this.revision = revision;
-	}
-
-	public String getConf() {
-		return conf;
-	}
-
-	public void setConf(String conf) {
-		this.conf = conf;
-	}
-
-	public String getSettingsRef() {
-		if (settingsRef == null) {
-			settingsRef= EasyAntMagicNames.EASYANT_IVY_INSTANCE;
-		}
-		return settingsRef;
-	}
-
-	public void setSettingsRef(String settingsRef) {
-		this.settingsRef = settingsRef;
-	}
-	
-	public Reference getSettingsReference() {
-		return new Reference(getProject(),getSettingsRef());
-	}
-	
-	
-	
+    private String organisation;
+    private String module;
+    private String revision;
+    private String conf = "default";
+    protected String settingsRef;
+
+    protected boolean doCheck() {
+        log("Checking plugin configuration ...",Project.MSG_VERBOSE);
+        loadCachePath(getOrganisation(), getModule(), getRevision(), getConf(),
+                getSettingsReference());
+        return true;
+    }
+
+    public String getOrganisation() {
+        return organisation;
+    }
+
+    public void setOrganisation(String organisation) {
+        this.organisation = organisation;
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    public String getRevision() {
+        return revision;
+    }
+
+    public void setRevision(String revision) {
+        this.revision = revision;
+    }
+
+    public String getConf() {
+        return conf;
+    }
+
+    public void setConf(String conf) {
+        this.conf = conf;
+    }
+
+    public String getSettingsRef() {
+        if (settingsRef == null) {
+            settingsRef= EasyAntMagicNames.EASYANT_IVY_INSTANCE;
+        }
+        return settingsRef;
+    }
+
+    public void setSettingsRef(String settingsRef) {
+        this.settingsRef = settingsRef;
+    }
+    
+    public Reference getSettingsReference() {
+        return new Reference(getProject(),getSettingsRef());
+    }
+    
+    
+    
 
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/EnvironmentStrategy.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/EnvironmentStrategy.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/EnvironmentStrategy.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/EnvironmentStrategy.java Tue Feb 22 15:55:55 2011
@@ -24,59 +24,59 @@ import org.apache.tools.ant.types.FileSe
 
 public class EnvironmentStrategy extends AbstractFindClassPathStrategy {
 
-	String env;
-	String layout = "/lib";
-	String filter;
-
-	public String getEnv() {
-		return env;
-	}
-
-	public void setEnv(String env) {
-		this.env = env;
-	}
-	
-
-	public String getLayout() {
-		return layout;
-	}
-
-	public void setLayout(String layout) {
-		this.layout = layout;
-	}
-	
-
-	public String getFilter() {
-		return filter;
-	}
-
-	public void setFilter(String filter) {
-		this.filter = filter;
-	}
-
-	/**
-	 * check environment variable
-	 * 
-	 * @return return true if the environment variable exist
-	 */
-	protected boolean doCheck() {
-		log("Checking environment variable ...", Project.MSG_VERBOSE);
-
-		if (getEnv() != null && System.getenv(getEnv()) != null) {
-			log(getEnv() + " found !", Project.MSG_VERBOSE);
-			File libDir = new File(System.getenv(getEnv()),getLayout());
-			FileSet fileSet = new FileSet();
-			fileSet.setDir(libDir);
-			fileSet.setIncludes(getFilter());
-			fileSet.setProject(getProject());
-			fileSet.setLocation(getLocation());
-
-			getPath().addFileset(fileSet);
-			getProject().addReference(getPathid(), getPath());
-			return true;
-		}
-		return false;
+    String env;
+    String layout = "/lib";
+    String filter;
+
+    public String getEnv() {
+        return env;
+    }
+
+    public void setEnv(String env) {
+        this.env = env;
+    }
+    
+
+    public String getLayout() {
+        return layout;
+    }
+
+    public void setLayout(String layout) {
+        this.layout = layout;
+    }
+    
+
+    public String getFilter() {
+        return filter;
+    }
+
+    public void setFilter(String filter) {
+        this.filter = filter;
+    }
+
+    /**
+     * check environment variable
+     * 
+     * @return return true if the environment variable exist
+     */
+    protected boolean doCheck() {
+        log("Checking environment variable ...", Project.MSG_VERBOSE);
+
+        if (getEnv() != null && System.getenv(getEnv()) != null) {
+            log(getEnv() + " found !", Project.MSG_VERBOSE);
+            File libDir = new File(System.getenv(getEnv()),getLayout());
+            FileSet fileSet = new FileSet();
+            fileSet.setDir(libDir);
+            fileSet.setIncludes(getFilter());
+            fileSet.setProject(getProject());
+            fileSet.setLocation(getLocation());
+
+            getPath().addFileset(fileSet);
+            getProject().addReference(getPathid(), getPath());
+            return true;
+        }
+        return false;
 
-	}
+    }
 
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/FindClasspathTask.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/FindClasspathTask.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/FindClasspathTask.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/FindClasspathTask.java Tue Feb 22 15:55:55 2011
@@ -28,105 +28,105 @@ import org.apache.tools.ant.BuildExcepti
  * rules.
  */
 public class FindClasspathTask extends AbstractEasyAntTask {
-	private String pathid;
-	private String organisation;
-	private String module;
-	private String revision;
-	private String conf = "default";
-
-	private AbstractFindClassPathStrategy currentStrategy;
-	private List<AbstractFindClassPathStrategy> strategies = new ArrayList<AbstractFindClassPathStrategy>();
-
-	public void execute() throws BuildException {
-		//define the default strategy if there is no nested strategy
-		if (getStrategies().size() == 0) {
-			add(createStrategy(new ProjectDependencyStrategy()));
-			add(createStrategy(new BasicConfigurationStrategy()));
-		}
-		// Process the chain
-		getStrategies().get(0).check();
-	}
-
-	public String getPathid() {
-		return pathid;
-	}
-
-	public void setPathid(String pathid) {
-		this.pathid = pathid;
-	}
-
-	public String getOrganisation() {
-		return organisation;
-	}
-
-	public void setOrganisation(String organisation) {
-		this.organisation = organisation;
-	}
-
-	public String getModule() {
-		return module;
-	}
-
-	public void setModule(String module) {
-		this.module = module;
-	}
-
-	public String getRevision() {
-		return revision;
-	}
-
-	public void setRevision(String revision) {
-		this.revision = revision;
-	}
-
-	public String getConf() {
-		return conf;
-	}
-
-	public void setConf(String conf) {
-		this.conf = conf;
-	}
-
-	public List<AbstractFindClassPathStrategy> getStrategies() {
-		return strategies;
-	}
-
-	public void setStrategies(List<AbstractFindClassPathStrategy> strategies) {
-		this.strategies = strategies;
-	}
-
-	public void add(AbstractFindClassPathStrategy strategy) {
-		if (currentStrategy != null) {
-			currentStrategy.setNextStrategy(strategy);
-		}
-		currentStrategy = strategy;
-		preconfigureStrategy(strategy);
-		getStrategies().add(strategy);
-	}
-
-	protected void preconfigureStrategy(AbstractFindClassPathStrategy strategy) {
-		strategy.setPathid(getPathid());
-		if (strategy instanceof BasicConfigurationStrategy) {
-			BasicConfigurationStrategy basicStrategy = (BasicConfigurationStrategy) strategy;
-			if (basicStrategy.getOrganisation() == null) {
-				basicStrategy.setOrganisation(getOrganisation());
-			}
-			if (basicStrategy.getModule() == null) {
-				basicStrategy.setModule(getModule());
-
-			}
-			if (basicStrategy.getRevision() == null) {
-				basicStrategy.setRevision(getRevision());
-			}
-			if (basicStrategy.getConf() == null) {
-				basicStrategy.setConf(getConf());
-			}
-		}
-	}
-	
-	protected AbstractFindClassPathStrategy createStrategy(AbstractFindClassPathStrategy strategy) {
-		strategy.setProject(getProject());
-		return strategy;
-	}
+    private String pathid;
+    private String organisation;
+    private String module;
+    private String revision;
+    private String conf = "default";
+
+    private AbstractFindClassPathStrategy currentStrategy;
+    private List<AbstractFindClassPathStrategy> strategies = new ArrayList<AbstractFindClassPathStrategy>();
+
+    public void execute() throws BuildException {
+        //define the default strategy if there is no nested strategy
+        if (getStrategies().size() == 0) {
+            add(createStrategy(new ProjectDependencyStrategy()));
+            add(createStrategy(new BasicConfigurationStrategy()));
+        }
+        // Process the chain
+        getStrategies().get(0).check();
+    }
+
+    public String getPathid() {
+        return pathid;
+    }
+
+    public void setPathid(String pathid) {
+        this.pathid = pathid;
+    }
+
+    public String getOrganisation() {
+        return organisation;
+    }
+
+    public void setOrganisation(String organisation) {
+        this.organisation = organisation;
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    public String getRevision() {
+        return revision;
+    }
+
+    public void setRevision(String revision) {
+        this.revision = revision;
+    }
+
+    public String getConf() {
+        return conf;
+    }
+
+    public void setConf(String conf) {
+        this.conf = conf;
+    }
+
+    public List<AbstractFindClassPathStrategy> getStrategies() {
+        return strategies;
+    }
+
+    public void setStrategies(List<AbstractFindClassPathStrategy> strategies) {
+        this.strategies = strategies;
+    }
+
+    public void add(AbstractFindClassPathStrategy strategy) {
+        if (currentStrategy != null) {
+            currentStrategy.setNextStrategy(strategy);
+        }
+        currentStrategy = strategy;
+        preconfigureStrategy(strategy);
+        getStrategies().add(strategy);
+    }
+
+    protected void preconfigureStrategy(AbstractFindClassPathStrategy strategy) {
+        strategy.setPathid(getPathid());
+        if (strategy instanceof BasicConfigurationStrategy) {
+            BasicConfigurationStrategy basicStrategy = (BasicConfigurationStrategy) strategy;
+            if (basicStrategy.getOrganisation() == null) {
+                basicStrategy.setOrganisation(getOrganisation());
+            }
+            if (basicStrategy.getModule() == null) {
+                basicStrategy.setModule(getModule());
+
+            }
+            if (basicStrategy.getRevision() == null) {
+                basicStrategy.setRevision(getRevision());
+            }
+            if (basicStrategy.getConf() == null) {
+                basicStrategy.setConf(getConf());
+            }
+        }
+    }
+    
+    protected AbstractFindClassPathStrategy createStrategy(AbstractFindClassPathStrategy strategy) {
+        strategy.setProject(getProject());
+        return strategy;
+    }
 
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/ProjectDependencyStrategy.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/ProjectDependencyStrategy.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/ProjectDependencyStrategy.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/findclasspath/ProjectDependencyStrategy.java Tue Feb 22 15:55:55 2011
@@ -31,136 +31,136 @@ import org.apache.tools.ant.Project;
 
 public class ProjectDependencyStrategy extends BasicConfigurationStrategy {
 
-	/**
-	 * check if project dependencies matches with expected module
-	 * 
-	 * @return return true if project dependencies matches with expected module
-	 */
-	@Override
-	protected boolean doCheck() {
-		log("Checking project dependencies ...", Project.MSG_VERBOSE);
-		CheckProjectDependencies checkProjectDependencies = new CheckProjectDependencies();
-		checkProjectDependencies.setSettingsRef(getSettingsReference());
-		checkProjectDependencies.setOrganisationToFind(getOrganisation());
-		checkProjectDependencies.setModuleToFind(getModule());
-		checkProjectDependencies.setRevisionToFind(getRevision());
-		checkProjectDependencies.setConfToFind(getConf());
-		initTask(checkProjectDependencies).execute();
-		return checkProjectDependencies.checkProjectDependencies();
-	}
-
-	@Override
-	public String getSettingsRef() {
-		if (settingsRef == null) {
-			settingsRef = IvyInstanceHelper.getProjectIvyInstanceName(getProject());
-		}
-		return settingsRef;
-	}
-
-	private class CheckProjectDependencies extends IvyPostResolveTask {
-
-		private String organisationToFind;
-		private String moduleToFind;
-		private String revisionToFind;
-		private String confToFind;
-
-		public String getOrganisationToFind() {
-			return organisationToFind;
-		}
-
-		public void setOrganisationToFind(String organisationToFind) {
-			this.organisationToFind = organisationToFind;
-		}
-
-		public String getModuleToFind() {
-			return moduleToFind;
-		}
-
-		public void setModuleToFind(String moduleToFind) {
-			this.moduleToFind = moduleToFind;
-		}
-
-		public String getRevisionToFind() {
-			return revisionToFind;
-		}
-
-		public void setRevisionToFind(String revisionToFind) {
-			this.revisionToFind = revisionToFind;
-		}
-
-		public String getConfToFind() {
-			return confToFind;
-		}
-
-		public void setConfToFind(String confToFind) {
-			this.confToFind = confToFind;
-		}
-
-		@Override
-		public void doExecute() throws BuildException {
-			prepareAndCheck();
-		}
-
-		public boolean checkProjectDependencies() {
-			execute();
-			try {
-				ResolutionCacheManager cacheMgr = getIvyInstance()
-						.getResolutionCacheManager();
-				String[] confs = splitConfs(getConf());
-				String resolveId = getResolveId();
-				if (resolveId == null) {
-					resolveId = ResolveOptions
-							.getDefaultResolveId(getResolvedModuleId());
-				}
-				XmlReportParser parser = new XmlReportParser();
-				for (int i = 0; i < confs.length; i++) {
-					File report = cacheMgr
-							.getConfigurationResolveReportInCache(resolveId,
-									confs[i]);
-					parser.parse(report);
-
-					Artifact[] artifacts = parser.getArtifacts();
-					for (int j = 0; j < artifacts.length; j++) {
-						Artifact artifact = artifacts[j];
-						ModuleRevisionId mrid = artifact.getModuleRevisionId();
-						if (mrid.getOrganisation().equals(
-								getOrganisationToFind())) {
-							if (mrid.getName().equals(getModuleToFind())) {
-								log(mrid.getOrganisation() + "#"
-										+ mrid.getName()
-										+ " found in project dependencies !",
-										Project.MSG_DEBUG);
-								// use this version
-								loadCachePath(getOrganisationToFind(),
-										getModuleToFind(), mrid.getRevision(),
-										getConfToFind(), getSettingsReference());
-								return true;
-							} else {
-								// if only organization is found in project
-								// dependencies use the same version with the
-								// required module
-								log(
-										"Only organisation : "
-												+ mrid.getOrganisation()
-												+ " was found in project dependencies !",
-										Project.MSG_DEBUG);
-								loadCachePath(mrid.getOrganisation(),
-										getModuleToFind(), mrid.getRevision(),
-										getConfToFind(), getSettingsReference());
-								return true;
-
-							}
-						}
-
-					}
-				}
-			} catch (Exception ex) {
-				throw new BuildException(
-						"impossible to check project dependencies: " + ex, ex);
-			}
-			return false;
-		}
+    /**
+     * check if project dependencies matches with expected module
+     * 
+     * @return return true if project dependencies matches with expected module
+     */
+    @Override
+    protected boolean doCheck() {
+        log("Checking project dependencies ...", Project.MSG_VERBOSE);
+        CheckProjectDependencies checkProjectDependencies = new CheckProjectDependencies();
+        checkProjectDependencies.setSettingsRef(getSettingsReference());
+        checkProjectDependencies.setOrganisationToFind(getOrganisation());
+        checkProjectDependencies.setModuleToFind(getModule());
+        checkProjectDependencies.setRevisionToFind(getRevision());
+        checkProjectDependencies.setConfToFind(getConf());
+        initTask(checkProjectDependencies).execute();
+        return checkProjectDependencies.checkProjectDependencies();
+    }
+
+    @Override
+    public String getSettingsRef() {
+        if (settingsRef == null) {
+            settingsRef = IvyInstanceHelper.getProjectIvyInstanceName(getProject());
+        }
+        return settingsRef;
+    }
+
+    private class CheckProjectDependencies extends IvyPostResolveTask {
+
+        private String organisationToFind;
+        private String moduleToFind;
+        private String revisionToFind;
+        private String confToFind;
+
+        public String getOrganisationToFind() {
+            return organisationToFind;
+        }
+
+        public void setOrganisationToFind(String organisationToFind) {
+            this.organisationToFind = organisationToFind;
+        }
+
+        public String getModuleToFind() {
+            return moduleToFind;
+        }
+
+        public void setModuleToFind(String moduleToFind) {
+            this.moduleToFind = moduleToFind;
+        }
+
+        public String getRevisionToFind() {
+            return revisionToFind;
+        }
+
+        public void setRevisionToFind(String revisionToFind) {
+            this.revisionToFind = revisionToFind;
+        }
+
+        public String getConfToFind() {
+            return confToFind;
+        }
+
+        public void setConfToFind(String confToFind) {
+            this.confToFind = confToFind;
+        }
+
+        @Override
+        public void doExecute() throws BuildException {
+            prepareAndCheck();
+        }
+
+        public boolean checkProjectDependencies() {
+            execute();
+            try {
+                ResolutionCacheManager cacheMgr = getIvyInstance()
+                        .getResolutionCacheManager();
+                String[] confs = splitConfs(getConf());
+                String resolveId = getResolveId();
+                if (resolveId == null) {
+                    resolveId = ResolveOptions
+                            .getDefaultResolveId(getResolvedModuleId());
+                }
+                XmlReportParser parser = new XmlReportParser();
+                for (int i = 0; i < confs.length; i++) {
+                    File report = cacheMgr
+                            .getConfigurationResolveReportInCache(resolveId,
+                                    confs[i]);
+                    parser.parse(report);
+
+                    Artifact[] artifacts = parser.getArtifacts();
+                    for (int j = 0; j < artifacts.length; j++) {
+                        Artifact artifact = artifacts[j];
+                        ModuleRevisionId mrid = artifact.getModuleRevisionId();
+                        if (mrid.getOrganisation().equals(
+                                getOrganisationToFind())) {
+                            if (mrid.getName().equals(getModuleToFind())) {
+                                log(mrid.getOrganisation() + "#"
+                                        + mrid.getName()
+                                        + " found in project dependencies !",
+                                        Project.MSG_DEBUG);
+                                // use this version
+                                loadCachePath(getOrganisationToFind(),
+                                        getModuleToFind(), mrid.getRevision(),
+                                        getConfToFind(), getSettingsReference());
+                                return true;
+                            } else {
+                                // if only organization is found in project
+                                // dependencies use the same version with the
+                                // required module
+                                log(
+                                        "Only organisation : "
+                                                + mrid.getOrganisation()
+                                                + " was found in project dependencies !",
+                                        Project.MSG_DEBUG);
+                                loadCachePath(mrid.getOrganisation(),
+                                        getModuleToFind(), mrid.getRevision(),
+                                        getConfToFind(), getSettingsReference());
+                                return true;
+
+                            }
+                        }
+
+                    }
+                }
+            } catch (Exception ex) {
+                throw new BuildException(
+                        "impossible to check project dependencies: " + ex, ex);
+            }
+            return false;
+        }
 
-	}
+    }
 
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/AbstractMenuGeneratorTask.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/AbstractMenuGeneratorTask.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/AbstractMenuGeneratorTask.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/AbstractMenuGeneratorTask.java Tue Feb 22 15:55:55 2011
@@ -28,32 +28,32 @@ import org.apache.tools.ant.Task;
  * If you're planning to write your own MenuGeneratorTask we strongly recommend you to extend this task.
  */
 public abstract class AbstractMenuGeneratorTask extends Task{
-	
-	private String context="default";
+    
+    private String context="default";
 
-	/**
-	 * Get or create if necessary a MenuGeneratorRegistry for a given context;
-	 * @param context a string representing a given context
-	 * @return a MenuGeneratorRegistry
-	 */
-	public MenuGeneratorRegistry getMenuGeneratorForContext(String context) {
-		return MenuGeneratorUtils.getRegistryForContext(getProject(), context, true);
-	}
+    /**
+     * Get or create if necessary a MenuGeneratorRegistry for a given context;
+     * @param context a string representing a given context
+     * @return a MenuGeneratorRegistry
+     */
+    public MenuGeneratorRegistry getMenuGeneratorForContext(String context) {
+        return MenuGeneratorUtils.getRegistryForContext(getProject(), context, true);
+    }
 
-	/**
-	 * Get the context
-	 * @return a context
-	 */
-	public String getContext() {
-		return context;
-	}
+    /**
+     * Get the context
+     * @return a context
+     */
+    public String getContext() {
+        return context;
+    }
 
-	/**
-	 * Set the context
-	 * @param context a context
-	 */
-	public void setContext(String context) {
-		this.context = context;
-	}
+    /**
+     * Set the context
+     * @param context a context
+     */
+    public void setContext(String context) {
+        this.context = context;
+    }
 
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/AddMenuEntryTask.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/AddMenuEntryTask.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/AddMenuEntryTask.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/AddMenuEntryTask.java Tue Feb 22 15:55:55 2011
@@ -32,17 +32,17 @@ import org.apache.tools.ant.BuildExcepti
  */
 public class AddMenuEntryTask extends AbstractMenuGeneratorTask {
 
-	private String title;
-	private String targetLink;
+    private String title;
+    private String targetLink;
 
-	private List<MenuEntry> menuEntries = new ArrayList<MenuEntry>();
+    private List<MenuEntry> menuEntries = new ArrayList<MenuEntry>();
 
-	@Override
-	public void execute() throws BuildException {
-		if (getTitle() == null && getTargetLink() == null && menuEntries.size() == 0) {
-			throw new BuildException("You must specfify a title and a target link as argument or as a nested element using a menuentry datatype !");
-		}
-		
+    @Override
+    public void execute() throws BuildException {
+        if (getTitle() == null && getTargetLink() == null && menuEntries.size() == 0) {
+            throw new BuildException("You must specfify a title and a target link as argument or as a nested element using a menuentry datatype !");
+        }
+        
         try {
             //handle argument
             if (getTitle() != null && getTargetLink() != null) {
@@ -57,62 +57,62 @@ public class AddMenuEntryTask extends Ab
         } catch (IOException ioe) {
             throw new BuildException("Error writing menu entry: " + ioe.getMessage(), ioe);
         }
-	}
+    }
 
-	/**
-	 * Get the title of the {@link MenuEntry}
-	 * @return a title
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * Set the title of the {@link MenuEntry}
-	 * @param title a title
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	/**
-	 * Get the target link of the {@link MenuEntry}
-	 * @return the target url
-	 */
-	public String getTargetLink() {
-		return targetLink;
-	}
-
-	/**
-	 * Set the target link of the {@link MenuEntry}
-	 * @param targetLink the target url
-	 */
-	public void setTargetLink(String targetLink) {
-		this.targetLink = targetLink;
-	}
-
-	/**
-	 * Get a list of nested {@link MenuEntry}
-	 * @return a list of {@link MenuEntry}
-	 */
-	public List<MenuEntry> getMenuEntries() {
-		return menuEntries;
-	}
-
-	/**
-	 * Set a list of nested {@link MenuEntry}
-	 * @param menuEntries a list of {@link MenuEntry}
-	 */
-	public void setMenuEntries(List<MenuEntry> menuEntries) {
-		this.menuEntries = menuEntries;
-	}
-
-	/**
-	 * Add a given {@link MenuEntry} 
-	 * @param menuEntry a given {@link MenuEntry}
-	 */
-	public void add(MenuEntry menuEntry) {
-		getMenuEntries().add(menuEntry);
-	}
+    /**
+     * Get the title of the {@link MenuEntry}
+     * @return a title
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Set the title of the {@link MenuEntry}
+     * @param title a title
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * Get the target link of the {@link MenuEntry}
+     * @return the target url
+     */
+    public String getTargetLink() {
+        return targetLink;
+    }
+
+    /**
+     * Set the target link of the {@link MenuEntry}
+     * @param targetLink the target url
+     */
+    public void setTargetLink(String targetLink) {
+        this.targetLink = targetLink;
+    }
+
+    /**
+     * Get a list of nested {@link MenuEntry}
+     * @return a list of {@link MenuEntry}
+     */
+    public List<MenuEntry> getMenuEntries() {
+        return menuEntries;
+    }
+
+    /**
+     * Set a list of nested {@link MenuEntry}
+     * @param menuEntries a list of {@link MenuEntry}
+     */
+    public void setMenuEntries(List<MenuEntry> menuEntries) {
+        this.menuEntries = menuEntries;
+    }
+
+    /**
+     * Add a given {@link MenuEntry} 
+     * @param menuEntry a given {@link MenuEntry}
+     */
+    public void add(MenuEntry menuEntry) {
+        getMenuEntries().add(menuEntry);
+    }
 
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/MenuEntry.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/MenuEntry.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/MenuEntry.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/MenuEntry.java Tue Feb 22 15:55:55 2011
@@ -23,35 +23,35 @@ import org.apache.tools.ant.types.DataTy
  * This {@link DataType} is a representation of an entry in a menu
  */
 public class MenuEntry extends DataType {
-	private String title;
-	private String targetLink;
-	/**
-	 * Get the title
-	 * @return a title
-	 */
-	public String getTitle() {
-		return title;
-	}
-	/**
-	 * Set the title
-	 * @param title a title
-	 */
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	/**
-	 * Get the target link
-	 * @return a target url
-	 */
-	public String getTargetLink() {
-		return targetLink;
-	}
-	/**
-	 * Set the target link
-	 * @param targetLink a target link
-	 */
-	public void setTargetLink(String targetLink) {
-		this.targetLink = targetLink;
-	}
-	
+    private String title;
+    private String targetLink;
+    /**
+     * Get the title
+     * @return a title
+     */
+    public String getTitle() {
+        return title;
+    }
+    /**
+     * Set the title
+     * @param title a title
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    /**
+     * Get the target link
+     * @return a target url
+     */
+    public String getTargetLink() {
+        return targetLink;
+    }
+    /**
+     * Set the target link
+     * @param targetLink a target link
+     */
+    public void setTargetLink(String targetLink) {
+        this.targetLink = targetLink;
+    }
+    
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/MenuGeneratorUtils.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/MenuGeneratorUtils.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/MenuGeneratorUtils.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/MenuGeneratorUtils.java Tue Feb 22 15:55:55 2011
@@ -23,25 +23,25 @@ import org.apache.tools.ant.Project;
 
 public class MenuGeneratorUtils {
 
-	public static MenuGeneratorRegistry createRegistryForContext(Project project, String context) {
-		MenuGeneratorRegistry menuGeneratorRegistry = new MenuGeneratorRegistry(context);
-		project.addReference(getReferenceId(context), menuGeneratorRegistry);
+    public static MenuGeneratorRegistry createRegistryForContext(Project project, String context) {
+        MenuGeneratorRegistry menuGeneratorRegistry = new MenuGeneratorRegistry(context);
+        project.addReference(getReferenceId(context), menuGeneratorRegistry);
         return menuGeneratorRegistry;
-	}
+    }
 
-	public static MenuGeneratorRegistry getRegistryForContext(Project project, String context, boolean create) {
-		MenuGeneratorRegistry registry = (MenuGeneratorRegistry) project.getReference(getReferenceId(context));
-		if (registry != null) {
-			return registry;
-		} else if (create) {
-			return createRegistryForContext(project, context);
-		} else {
-			throw new IllegalArgumentException("No menu generators are registered for " + context);
-		}
-	}
+    public static MenuGeneratorRegistry getRegistryForContext(Project project, String context, boolean create) {
+        MenuGeneratorRegistry registry = (MenuGeneratorRegistry) project.getReference(getReferenceId(context));
+        if (registry != null) {
+            return registry;
+        } else if (create) {
+            return createRegistryForContext(project, context);
+        } else {
+            throw new IllegalArgumentException("No menu generators are registered for " + context);
+        }
+    }
 
-	private static final String getReferenceId(String context) {
-		return context + EasyAntMagicNames.MENU_GENERATOR_REGISTRY_REF;
-	}
+    private static final String getReferenceId(String context) {
+        return context + EasyAntMagicNames.MENU_GENERATOR_REGISTRY_REF;
+    }
 
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/RegisterMenuGeneratorTask.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/RegisterMenuGeneratorTask.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/RegisterMenuGeneratorTask.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/RegisterMenuGeneratorTask.java Tue Feb 22 15:55:55 2011
@@ -51,33 +51,33 @@ public class RegisterMenuGeneratorTask e
 
     private String className;
     private BuiltinType type;
-	private Path classpath;
+    private Path classpath;
 
-	@Override
-	public void execute() throws BuildException {
-		if (getClassName() == null) {
-			throw new BuildException("either className or type argument is required !");
-		}
-
-		MenuGenerator menuGenerator = (MenuGenerator) ClasspathUtils.newInstance(getClassName(), getClassLoader(), MenuGenerator.class);
-		getMenuGeneratorForContext(getContext()).addMenuGenerator(menuGenerator);
-	}
-
-	/**
-	 * Get the classname to register
-	 * @return a classname
-	 */
-	public String getClassName() {
-		return className;
-	}
-
-	/**
-	 * Set the classname to register
-	 * @param className a classname
-	 */
-	public void setClassName(String className) {
-		this.className = className;
-	}
+    @Override
+    public void execute() throws BuildException {
+        if (getClassName() == null) {
+            throw new BuildException("either className or type argument is required !");
+        }
+
+        MenuGenerator menuGenerator = (MenuGenerator) ClasspathUtils.newInstance(getClassName(), getClassLoader(), MenuGenerator.class);
+        getMenuGeneratorForContext(getContext()).addMenuGenerator(menuGenerator);
+    }
+
+    /**
+     * Get the classname to register
+     * @return a classname
+     */
+    public String getClassName() {
+        return className;
+    }
+
+    /**
+     * Set the classname to register
+     * @param className a classname
+     */
+    public void setClassName(String className) {
+        this.className = className;
+    }
 
     public BuiltinType getType() {
         return type;
@@ -94,57 +94,57 @@ public class RegisterMenuGeneratorTask e
     }
 
     protected AntClassLoader getClassLoader() {
-		// defining a new specialized classloader and setting it as the thread
-		// context classloader
-		AntClassLoader loader = null;
-		if (classpath != null) {
-			loader = new AntClassLoader(this.getClass().getClassLoader(),
-					getProject(), classpath, false);
-		} else {
-			loader = new AntClassLoader(this.getClass().getClassLoader(),
-					false);
-		}
-		loader.setThreadContextLoader();
-		return loader;
-	}
-	
-	/**
-	 * Get the classpath used to locate the specified classname
-	 * @return a classpath
-	 */
-	public Path getClasspath() {
-		return classpath;
-	}
-	
-	
-		/**
-		 * The the classpath used to locate the specified classname
-		 * 
-		 * @param classpath
-		 */
-		public void setClasspath(Path classpath) {
-			createClasspath().append(classpath);
-		}
-
-		/**
-		 * Classpath to use, by reference, when compiling the rulebase
-		 * 
-		 * @param a reference to an existing classpath
-		 */
-		public void setClasspathref(Reference r) {
-			createClasspath().setRefid(r);
-		}
-
-		/**
-		 * Adds a path to the classpath.
-		 * 
-		 * @return created classpath
-		 */
-		public Path createClasspath() {
-			if (this.classpath == null) {
-				this.classpath = new Path(getProject());
-			}
-			return this.classpath.createPath();
-		}
+        // defining a new specialized classloader and setting it as the thread
+        // context classloader
+        AntClassLoader loader = null;
+        if (classpath != null) {
+            loader = new AntClassLoader(this.getClass().getClassLoader(),
+                    getProject(), classpath, false);
+        } else {
+            loader = new AntClassLoader(this.getClass().getClassLoader(),
+                    false);
+        }
+        loader.setThreadContextLoader();
+        return loader;
+    }
+    
+    /**
+     * Get the classpath used to locate the specified classname
+     * @return a classpath
+     */
+    public Path getClasspath() {
+        return classpath;
+    }
+    
+    
+        /**
+         * The the classpath used to locate the specified classname
+         * 
+         * @param classpath
+         */
+        public void setClasspath(Path classpath) {
+            createClasspath().append(classpath);
+        }
+
+        /**
+         * Classpath to use, by reference, when compiling the rulebase
+         * 
+         * @param a reference to an existing classpath
+         */
+        public void setClasspathref(Reference r) {
+            createClasspath().setRefid(r);
+        }
+
+        /**
+         * Adds a path to the classpath.
+         * 
+         * @return created classpath
+         */
+        public Path createClasspath() {
+            if (this.classpath == null) {
+                this.classpath = new Path(getProject());
+            }
+            return this.classpath.createPath();
+        }
 
 }

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/StartMenuTask.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/StartMenuTask.java?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/StartMenuTask.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/menu/StartMenuTask.java Tue Feb 22 15:55:55 2011
@@ -28,35 +28,35 @@ import java.util.List;
  */
 public class StartMenuTask extends AbstractMenuGeneratorTask {
 
-	private String file;
+    private String file;
 
-	@Override
-	public void execute() throws BuildException {
-		if (getFile() == null) {
-			throw new BuildException("file argument is required !");
-		}
-
-		//TODO: this isn't quite right.  we shouldn't be passing the same file argument to every generator.
-		List<MenuGenerator> generators = getMenuGeneratorForContext(getContext()).getMenuGenerators();
-		for (MenuGenerator generator : generators) {
-			try {
-			    generator.startMenu(getContext(), getFile());
-			} catch (IOException ioe) {
-			    throw new BuildException("Error writing menu file " + getFile() + ": " + ioe.getMessage(), ioe);
-			}
-		}
-	}
-
-	/**
-	 * Get the file associated to this generator
-	 * @return a file
-	 */
-	public String getFile() {
-		return file;
-	}
-
-	public void setFile(String file) {
-		this.file = file;
-	}
+    @Override
+    public void execute() throws BuildException {
+        if (getFile() == null) {
+            throw new BuildException("file argument is required !");
+        }
+
+        //TODO: this isn't quite right.  we shouldn't be passing the same file argument to every generator.
+        List<MenuGenerator> generators = getMenuGeneratorForContext(getContext()).getMenuGenerators();
+        for (MenuGenerator generator : generators) {
+            try {
+                generator.startMenu(getContext(), getFile());
+            } catch (IOException ioe) {
+                throw new BuildException("Error writing menu file " + getFile() + ": " + ioe.getMessage(), ioe);
+            }
+        }
+    }
+
+    /**
+     * Get the file associated to this generator
+     * @return a file
+     */
+    public String getFile() {
+        return file;
+    }
+
+    public void setFile(String file) {
+        this.file = file;
+    }
 
 }

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/antlib.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/antlib.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/antlib.xml (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/antlib.xml Tue Feb 22 15:55:55 2011
@@ -16,48 +16,48 @@
    limitations under the License.
 -->
 <antlib xmlns:current="ant:current">
-	<taskdef name="path" classname="org.apache.easyant.tasks.PathTask"/>
-	<taskdef name="parameter" classname="org.apache.easyant.tasks.ParameterTask"/>
-	
-	<taskdef name="import" classname="org.apache.easyant.tasks.Import"/>
-	<taskdef name="loadmodule" classname="org.apache.easyant.tasks.LoadModule"/>
-	<taskdef name="submodule" classname="org.apache.easyant.tasks.SubModule"/>
-	<taskdef name="repreport" classname="org.apache.easyant.tasks.RepositoryReport"/>
-	<taskdef name="core-version" classname="org.apache.easyant.tasks.CoreRevisionCheckerTask"/>
-	<taskdef name="property" classname="org.apache.easyant.tasks.PropertyTask"/>
-	
-	<taskdef name="searchmodule" classname="org.apache.easyant.tasks.SearchModule"/>
-	
-	<taskdef name="configure-build-scoped-repository" classname="org.apache.easyant.tasks.ConfigureBuildScopedRepository"/> 
-	
-	<taskdef name="findclasspath" classname="org.apache.easyant.tasks.findclasspath.FindClasspathTask"/>
-	<typedef name="environment-strategy" classname="org.apache.easyant.tasks.findclasspath.EnvironmentStrategy"/>
-	<typedef name="project-dependency-strategy" classname="org.apache.easyant.tasks.findclasspath.ProjectDependencyStrategy"/>
-	<typedef name="basic-configuration-strategy" classname="org.apache.easyant.tasks.findclasspath.BasicConfigurationStrategy"/>
-	
-	
-	<taskdef name="registerartifact" classname="org.apache.easyant.tasks.RegisterArtifact"/>
-	<taskdef name="bindtarget" classname="org.apache.easyant.tasks.BindTarget"/>
-	
+    <taskdef name="path" classname="org.apache.easyant.tasks.PathTask"/>
+    <taskdef name="parameter" classname="org.apache.easyant.tasks.ParameterTask"/>
+    
+    <taskdef name="import" classname="org.apache.easyant.tasks.Import"/>
+    <taskdef name="loadmodule" classname="org.apache.easyant.tasks.LoadModule"/>
+    <taskdef name="submodule" classname="org.apache.easyant.tasks.SubModule"/>
+    <taskdef name="repreport" classname="org.apache.easyant.tasks.RepositoryReport"/>
+    <taskdef name="core-version" classname="org.apache.easyant.tasks.CoreRevisionCheckerTask"/>
+    <taskdef name="property" classname="org.apache.easyant.tasks.PropertyTask"/>
+    
+    <taskdef name="searchmodule" classname="org.apache.easyant.tasks.SearchModule"/>
+    
+    <taskdef name="configure-build-scoped-repository" classname="org.apache.easyant.tasks.ConfigureBuildScopedRepository"/> 
+    
+    <taskdef name="findclasspath" classname="org.apache.easyant.tasks.findclasspath.FindClasspathTask"/>
+    <typedef name="environment-strategy" classname="org.apache.easyant.tasks.findclasspath.EnvironmentStrategy"/>
+    <typedef name="project-dependency-strategy" classname="org.apache.easyant.tasks.findclasspath.ProjectDependencyStrategy"/>
+    <typedef name="basic-configuration-strategy" classname="org.apache.easyant.tasks.findclasspath.BasicConfigurationStrategy"/>
+    
+    
+    <taskdef name="registerartifact" classname="org.apache.easyant.tasks.RegisterArtifact"/>
+    <taskdef name="bindtarget" classname="org.apache.easyant.tasks.BindTarget"/>
+    
 
-	<taskdef name="checkresolver" classname="org.apache.easyant.tasks.CheckResolver"/>
-	<taskdef name="easyant" classname="org.apache.easyant.tasks.EasyAntRunner"/>
-	
+    <taskdef name="checkresolver" classname="org.apache.easyant.tasks.CheckResolver"/>
+    <taskdef name="easyant" classname="org.apache.easyant.tasks.EasyAntRunner"/>
+    
     <taskdef name="startmenu" classname="org.apache.easyant.tasks.menu.StartMenuTask"/>
-	<taskdef name="addmenuentry" classname="org.apache.easyant.tasks.menu.AddMenuEntryTask"/>
-	<taskdef name="registermenugenerator" classname="org.apache.easyant.tasks.menu.RegisterMenuGeneratorTask"/>
-	<typedef name="menuentry" classname="org.apache.easyant.tasks.menu.MenuEntry"/>
+    <taskdef name="addmenuentry" classname="org.apache.easyant.tasks.menu.AddMenuEntryTask"/>
+    <taskdef name="registermenugenerator" classname="org.apache.easyant.tasks.menu.RegisterMenuGeneratorTask"/>
+    <typedef name="menuentry" classname="org.apache.easyant.tasks.menu.MenuEntry"/>
     <taskdef name="endmenu" classname="org.apache.easyant.tasks.menu.EndMenuTask"/>
 
-	<presetdef name="include">
-		<current:import mode="include" />
-	</presetdef>
-	
-	<presetdef name="build">
-		<current:import organisation="org.apache.easyant.buildtypes"/>
-	</presetdef>
-	
-	<presetdef name="plugin">
-		<current:import mode="include" organisation="org.apache.easyant.plugins"/>
-	</presetdef>
+    <presetdef name="include">
+        <current:import mode="include" />
+    </presetdef>
+    
+    <presetdef name="build">
+        <current:import organisation="org.apache.easyant.buildtypes"/>
+    </presetdef>
+    
+    <presetdef name="plugin">
+        <current:import mode="include" organisation="org.apache.easyant.plugins"/>
+    </presetdef>
 </antlib>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml Tue Feb 22 15:55:55 2011
@@ -15,23 +15,23 @@
    limitations under the License.
 -->
 <ivysettings>
-	<settings defaultResolver="easyant-default-chain"/>
-	<caches defaultCacheDir="${user.home}/.easyant/easyant-cache" useOrigin="true" />
-	<typedef name="jar" classname="org.apache.easyant.core.ivy.resolvers.JarResolver"/>
-	<resolvers>
-		<jar name="easyant-core-modules">
-			<ivy pattern="${easyant.core.repo.url}/[organisation]/[module]/[revision]/[module].ivy"/>
-			<artifact pattern="${easyant.core.repo.url}/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
-		</jar>
-		<filesystem name="easyant-shared-modules">
-			<ivy pattern="${user.home}/.easyant/repository/easyant-shared-modules/[organisation]/[module]/[revision]/[module].ivy"/>
-			<artifact pattern="${user.home}/.easyant/repository/easyant-shared-modules/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
-		</filesystem>
-		<ibiblio name="public-maven" m2compatible="true"/> 
-		<chain name="easyant-default-chain" returnFirst="true">
-			<resolver ref="easyant-core-modules" />
+    <settings defaultResolver="easyant-default-chain"/>
+    <caches defaultCacheDir="${user.home}/.easyant/easyant-cache" useOrigin="true" />
+    <typedef name="jar" classname="org.apache.easyant.core.ivy.resolvers.JarResolver"/>
+    <resolvers>
+        <jar name="easyant-core-modules">
+            <ivy pattern="${easyant.core.repo.url}/[organisation]/[module]/[revision]/[module].ivy"/>
+            <artifact pattern="${easyant.core.repo.url}/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
+        </jar>
+        <filesystem name="easyant-shared-modules">
+            <ivy pattern="${user.home}/.easyant/repository/easyant-shared-modules/[organisation]/[module]/[revision]/[module].ivy"/>
+            <artifact pattern="${user.home}/.easyant/repository/easyant-shared-modules/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
+        </filesystem>
+        <ibiblio name="public-maven" m2compatible="true"/> 
+        <chain name="easyant-default-chain" returnFirst="true">
+            <resolver ref="easyant-core-modules" />
             <resolver ref="easyant-shared-modules"/>
-			<resolver ref="public-maven"/>
-		</chain>
-	</resolvers>
+            <resolver ref="public-maven"/>
+        </chain>
+    </resolvers>
 </ivysettings>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-project-ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-project-ivysettings.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-project-ivysettings.xml (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-project-ivysettings.xml Tue Feb 22 15:55:55 2011
@@ -15,9 +15,9 @@
    limitations under the License.
 -->
 <ivysettings>
-	<property name="ivy.shared.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]" />
-	<property name="ivy.local.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]"/>
-	<caches useOrigin="true" defaultCacheDir="${user.home}/.easyant/project-cache" />
-	<include url="${ivy.default.settings.dir}/ivysettings.xml"/>
-	
-</ivysettings>
\ No newline at end of file
+    <property name="ivy.shared.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]" />
+    <property name="ivy.local.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]"/>
+    <caches useOrigin="true" defaultCacheDir="${user.home}/.easyant/project-cache" />
+    <include url="${ivy.default.settings.dir}/ivysettings.xml"/>
+    
+</ivysettings>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/easyant-config.xsd
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/easyant-config.xsd?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/easyant-config.xsd (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/easyant-config.xsd Tue Feb 22 15:55:55 2011
@@ -16,51 +16,51 @@
    limitations under the License.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified">
+    elementFormDefault="qualified">
 
-	<xs:element name="easyant-config">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="ivysettings" minOccurs="0" maxOccurs="1">
-					<xs:complexType>
-						<xs:attribute name="file" type="xs:string" />
-						<xs:attribute name="url" type="xs:string" />
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="system-plugins" minOccurs="0"
-					maxOccurs="1">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="plugin" minOccurs="0" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:attribute name="mrid" type="xs:string" />
-									<xs:attribute name="organisation" type="xs:string" />
-									<xs:attribute name="org" type="xs:string" />
-									<xs:attribute name="module" type="xs:string" />
-									<xs:attribute name="revision" type="xs:string" />
-									<xs:attribute name="rev" type="xs:string" />
-									<xs:attribute name="as" type="xs:string" />
-									<xs:attribute name="mode" type="xs:string" />
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-				<xs:element name="properties" minOccurs="0" maxOccurs="1">
-					<xs:complexType>
-						<xs:sequence>
-							<xs:element name="property" minOccurs="0" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:attribute name="name" type="xs:string" />
-									<xs:attribute name="value" type="xs:string" />
-									<xs:attribute name="file" type="xs:string" />
-									<xs:attribute name="url" type="xs:string" />
-								</xs:complexType>
-							</xs:element>
-						</xs:sequence>
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
\ No newline at end of file
+    <xs:element name="easyant-config">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="ivysettings" minOccurs="0" maxOccurs="1">
+                    <xs:complexType>
+                        <xs:attribute name="file" type="xs:string" />
+                        <xs:attribute name="url" type="xs:string" />
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="system-plugins" minOccurs="0"
+                    maxOccurs="1">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="plugin" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:attribute name="mrid" type="xs:string" />
+                                    <xs:attribute name="organisation" type="xs:string" />
+                                    <xs:attribute name="org" type="xs:string" />
+                                    <xs:attribute name="module" type="xs:string" />
+                                    <xs:attribute name="revision" type="xs:string" />
+                                    <xs:attribute name="rev" type="xs:string" />
+                                    <xs:attribute name="as" type="xs:string" />
+                                    <xs:attribute name="mode" type="xs:string" />
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="properties" minOccurs="0" maxOccurs="1">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="property" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:attribute name="name" type="xs:string" />
+                                    <xs:attribute name="value" type="xs:string" />
+                                    <xs:attribute name="file" type="xs:string" />
+                                    <xs:attribute name="url" type="xs:string" />
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml Tue Feb 22 15:55:55 2011
@@ -15,16 +15,16 @@
    limitations under the License.
 -->
 <ivysettings>
-	<include url="${easyant.default.ivysettings.url}"/>
-	<settings defaultResolver="easyant-extra-chain"/>
-	<resolvers>
-		<jar name="easyant-extra-modules">
-			<ivy pattern="${easyant.extramodules.repo.url}/[organisation]/[module]/[revision]/[module].ivy"/>
-			<artifact pattern="${easyant.extramodules.repo.url}/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
-		</jar>
-		<chain name="easyant-extra-chain" returnFirst="true">
-			<resolver ref="easyant-extra-modules" />
-			<resolver ref="easyant-default-chain" />
-		</chain>
-	</resolvers>
+    <include url="${easyant.default.ivysettings.url}"/>
+    <settings defaultResolver="easyant-extra-chain"/>
+    <resolvers>
+        <jar name="easyant-extra-modules">
+            <ivy pattern="${easyant.extramodules.repo.url}/[organisation]/[module]/[revision]/[module].ivy"/>
+            <artifact pattern="${easyant.extramodules.repo.url}/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
+        </jar>
+        <chain name="easyant-extra-chain" returnFirst="true">
+            <resolver ref="easyant-extra-modules" />
+            <resolver ref="easyant-default-chain" />
+        </chain>
+    </resolvers>
 </ivysettings>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report-dot.xsl
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report-dot.xsl?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report-dot.xsl (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report-dot.xsl Tue Feb 22 15:55:55 2011
@@ -20,22 +20,23 @@
 <xsl:template match="/ivy-report">
 /* * directed graph dot input file. * * generated by ivy report */
             digraph G {
-   	 "<xsl:value-of select="info/@organisation"/>-<xsl:value-of select="info/@module"/>" [label="<xsl:value-of select="info/@module"/>"];
+     "<xsl:value-of select="info/@organisation"/>-<xsl:value-of select="info/@module"/>" [label="<xsl:value-of select="info/@module"/>"];
      <xsl:for-each select="dependencies/module">
-   	    "<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/>" [label="<xsl:value-of select="@name"/>
-   	    	<xsl:for-each select="revision">
-                  <xsl:text>\n</xsl:text>
+        "<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/>" [label="<xsl:value-of select="@name"/>
+            <xsl:for-each select="revision">
+                  <xsl:text>
+</xsl:text>
                   <xsl:value-of select="@name"/><xsl:if test="@error"> (error)</xsl:if><xsl:if test="@evicted"> (evicted)</xsl:if>
             </xsl:for-each>
-   	     <xsl:text>"];
+         <xsl:text>"];
 </xsl:text>
       </xsl:for-each>
       <xsl:apply-templates select="dependencies/module/revision[not(@evicted)]/easyant/imports/import">
-	      <xsl:with-param name="parent_organisation" select="dependencies/module/@organisation"/>
-	      <xsl:with-param name="parent_name" select="dependencies/module/@name"/>
-	      <xsl:with-param name="parent_revision" select="dependencies/module/@revision"/>
+          <xsl:with-param name="parent_organisation" select="dependencies/module/@organisation"/>
+          <xsl:with-param name="parent_name" select="dependencies/module/@name"/>
+          <xsl:with-param name="parent_revision" select="dependencies/module/@revision"/>
       </xsl:apply-templates>
-  	  <xsl:text>}</xsl:text> 	      
+      <xsl:text>}</xsl:text>          
 </xsl:template>
 
 <xsl:template match="import">
@@ -43,19 +44,19 @@
 <xsl:param name="parent_name"/>
 <xsl:param name="parent_revision"/>
 <xsl:text>"</xsl:text>
-   	      <xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/>
-   	      <xsl:text>" -> "</xsl:text>
-   	      <xsl:value-of select="$parent_organisation"/>-<xsl:value-of select="$parent_name"/>
-   	      <xsl:text>" [label="</xsl:text>
-   	      		  <xsl:value-of select="$parent_revision"/>
-   	      <xsl:text>"]</xsl:text>
-   	      <xsl:text>;
+          <xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/>
+          <xsl:text>" -> "</xsl:text>
+          <xsl:value-of select="$parent_organisation"/>-<xsl:value-of select="$parent_name"/>
+          <xsl:text>" [label="</xsl:text>
+                  <xsl:value-of select="$parent_revision"/>
+          <xsl:text>"]</xsl:text>
+          <xsl:text>;
 </xsl:text>
 
       <xsl:apply-templates select="easyant/imports/import">
-      	  <xsl:with-param name="parent_organisation" select="@organisation"/>
-	      <xsl:with-param name="parent_name" select="@name"/>
-	      <xsl:with-param name="parent_revision" select="@revision"/>
+          <xsl:with-param name="parent_organisation" select="@organisation"/>
+          <xsl:with-param name="parent_name" select="@name"/>
+          <xsl:with-param name="parent_revision" select="@revision"/>
       </xsl:apply-templates>
   
 </xsl:template>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report.css
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report.css?rev=1073371&r1=1073370&r2=1073371&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report.css (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report.css Tue Feb 22 15:55:55 2011
@@ -16,8 +16,8 @@
  *
  */
 body {
-	font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
-	font-size:small; 
+    font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
+    font-size:small; 
 }
 
 div#logo {
@@ -29,12 +29,12 @@ div#logo {
 }
 
 #logo img {
-	border: 0;
+    border: 0;
 }
 
 div#date {
-	font-style:     italic;
-	padding-left:	60px;
+    font-style:     italic;
+    padding-left:   60px;
     padding-bottom: 40px; 
 }
 
@@ -42,43 +42,43 @@ div#date {
 h1 {
     margin-bottom:2px;
     
-	border-color:#7A9437;
-	border-style:solid;
-	border-width:0 0 3px 0;
+    border-color:#7A9437;
+    border-style:solid;
+    border-width:0 0 3px 0;
 }
 
 span#module {
-	color:#7A9437;
-	text-decoration:none;
+    color:#7A9437;
+    text-decoration:none;
 }
 
 span#organisation {
-	color:black;
-	text-decoration:none;
+    color:black;
+    text-decoration:none;
 }
 
 #confmenu {
-	color: #000;
-	border-bottom: 2px solid black;
-	margin: 12px 0px 0px 0px;
-	padding: 0px;
-	z-index: 1;
-	padding-left: 10px 
+    color: #000;
+    border-bottom: 2px solid black;
+    margin: 12px 0px 0px 0px;
+    padding: 0px;
+    z-index: 1;
+    padding-left: 10px 
 }
 
 #confmenu li {
-	display: inline;
-	overflow: hidden;
-	list-style-type: none; 
+    display: inline;
+    overflow: hidden;
+    list-style-type: none; 
 }
 
 #confmenu a, a.active {
-	color: #DEDECF;
-	background: #898B5E;
-	font: bold 1em "Trebuchet MS", Arial, sans-serif;
-	border: 2px solid black;
-	padding: 2px 5px 0px 5px;
-	text-decoration: none; 
+    color: #DEDECF;
+    background: #898B5E;
+    font: bold 1em "Trebuchet MS", Arial, sans-serif;
+    border: 2px solid black;
+    padding: 2px 5px 0px 5px;
+    text-decoration: none; 
 }
 
 /*
@@ -87,40 +87,40 @@ background: #DEE4CD
  */
 
 #confmenu a.active {
-	color: #7A9437;
-	background: #DEE4CD;
-	border-bottom: 3px solid #DEE4CD;
+    color: #7A9437;
+    background: #DEE4CD;
+    border-bottom: 3px solid #DEE4CD;
 }
 
 #confmenu a:hover {
-	color: #fff;
-	background: #ADC09F; 
+    color: #fff;
+    background: #ADC09F; 
 }
 
 #confmenu a:visited {
-	color: #DEDECF; 
+    color: #DEDECF; 
 }
 
 #confmenu a.active:visited {
-	color: #7A9437; 
+    color: #7A9437; 
 }
 
 #confmenu a.active:hover {
-	background: #DEE4CD;
-	color: #DEDECF; 
+    background: #DEE4CD;
+    color: #DEDECF; 
 }
 
 #content {
-	background: #DEE4CD;
-	padding: 20px;
-	border: 2px solid black;
-	border-top: none;
-	z-index: 2;	
+    background: #DEE4CD;
+    padding: 20px;
+    border: 2px solid black;
+    border-top: none;
+    z-index: 2; 
 }
 
 #content a {
-	text-decoration: none;
-	color: #E8E9BE; 
+    text-decoration: none;
+    color: #E8E9BE; 
 }
 
 #content a:hover { 
@@ -164,77 +164,77 @@ h5 {
 }
 
 span.resolved {
-	padding-left: 15px;
-	font-weight: 500;
-	font-size: small;
+    padding-left: 15px;
+    font-weight: 500;
+    font-size: small;
 }
 
 
 #content table  {
-	border-collapse:collapse;
-	width:90%;
-	margin:auto;
-	margin-top: 5px;
+    border-collapse:collapse;
+    width:90%;
+    margin:auto;
+    margin-top: 5px;
 }
 #content thead {
-	background-color:#CED4BD;
-	border:1px solid #7A9437;
+    background-color:#CED4BD;
+    border:1px solid #7A9437;
 }
 #content tbody {
-	border-collapse:collapse;
-	background-color:#FFFFFF;
-	border:1px solid #7A9437;
+    border-collapse:collapse;
+    background-color:#FFFFFF;
+    border:1px solid #7A9437;
 }
 
 #content th {
-	font-family:monospace;
-	border:1px solid #7A9437;
-	padding:5px;
+    font-family:monospace;
+    border:1px solid #7A9437;
+    padding:5px;
 }
 
 #content td {
-	border:1px dotted #7A9437;
-	padding:0 3 0 3;
+    border:1px dotted #7A9437;
+    padding:0 3 0 3;
 }
 
 #content table a {
-	color:#7A9437;
-	text-decoration:none;
+    color:#7A9437;
+    text-decoration:none;
 }
 
 #content table a:hover {
-	background-color:#CED4BD;
-	color:#7A9437;
+    background-color:#CED4BD;
+    color:#7A9437;
 }
 
 
 
 table.deps  {
-	border-collapse:collapse;
-	width:90%;
-	margin:auto;
-	margin-top: 5px;
+    border-collapse:collapse;
+    width:90%;
+    margin:auto;
+    margin-top: 5px;
 }
 
 table.deps thead {
-	background-color:#CED4BD;
-	border:1px solid #7A9437;
+    background-color:#CED4BD;
+    border:1px solid #7A9437;
 }
 table.deps tbody {
-	border-collapse:collapse;
-	background-color:#FFFFFF;
-	border:1px solid #7A9437;
+    border-collapse:collapse;
+    background-color:#FFFFFF;
+    border:1px solid #7A9437;
 }
 
 table.deps th {
-	font-family:monospace;
-	border:1px solid #7A9437;
-	padding:2;
+    font-family:monospace;
+    border:1px solid #7A9437;
+    padding:2;
 }
 
 table.deps td {
-	border:1px dotted #7A9437;
-	padding:0 3 0 3;
+    border:1px dotted #7A9437;
+    padding:0 3 0 3;
 }
 
 
@@ -242,37 +242,36 @@ table.deps td {
 
 
 table.header  {
-	border:0;
-	width:90%;
-	margin:auto;
-	margin-top: 5px;
+    border:0;
+    width:90%;
+    margin:auto;
+    margin-top: 5px;
 }
 
 table.header thead {
-	border:0;
+    border:0;
 }
 table.header tbody {
-	border:0;
+    border:0;
 }
 table.header tr {
-	padding:0px;
-	border:0;
+    padding:0px;
+    border:0;
 }
 table.header td {
-	padding:0 3 0 3;
-	border:0;
+    padding:0 3 0 3;
+    border:0;
 }
 
 td.title {
     width:150px;
     margin-right:15px;
 
-	font-size:small;
-	font-weight:700;
+    font-size:small;
+    font-weight:700;
 }
 
 td.title:first-letter {
-	color:#7A9437;
-	background-color:transparent;
+    color:#7A9437;
+    background-color:transparent;
 }
-



Mime
View raw message