svn commit: r501379 [2/6] - in /incubator/ivy/core/trunk: ./ src/java/org/apache/ivy/ src/java/org/apache/ivy/ant/ src/java/org/apache/ivy/circular/ src/java/org/apache/ivy/conf/ src/java/org/apache/ivy/conflict/ src/java/org/apache/ivy/core/ src/java/...

[xa...@apache.org]

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java Tue Jan 30 03:51:55 2007
@@ -20,13 +20,13 @@
 import java.io.File;
 import java.util.Date;
 
-import org.apache.ivy.DefaultPublishingDRResolver;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.IvyContext;
-import org.apache.ivy.ModuleDescriptor;
-import org.apache.ivy.ModuleRevisionId;
-import org.apache.ivy.PublishingDependencyRevisionResolver;
-import org.apache.ivy.status.StatusManager;
+import org.apache.ivy.core.IvyContext;
+import org.apache.ivy.core.deliver.DefaultPublishingDRResolver;
+import org.apache.ivy.core.deliver.PublishingDependencyRevisionResolver;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.module.status.StatusManager;
 import org.apache.ivy.util.Message;
 import org.apache.ivy.util.MessageImpl;
 import org.apache.tools.ant.BuildException;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyExtractFromSources.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyExtractFromSources.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyExtractFromSources.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyExtractFromSources.java Tue Jan 30 03:51:55 2007
@@ -32,7 +32,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.ivy.ModuleRevisionId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.filters.LineContainsRegExp;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java Tue Jan 30 03:51:55 2007
@@ -18,9 +18,9 @@
 package org.apache.ivy.ant;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleId;
-import org.apache.ivy.ModuleRevisionId;
-import org.apache.ivy.ResolvedModuleRevision;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.resolve.ResolvedModuleRevision;
 import org.apache.tools.ant.BuildException;
 
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java Tue Jan 30 03:51:55 2007
@@ -23,11 +23,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ivy.Configuration;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleDescriptor;
-import org.apache.ivy.Configuration.Visibility;
-import org.apache.ivy.parser.ModuleDescriptorParserRegistry;
+import org.apache.ivy.core.module.descriptor.Configuration;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.descriptor.Configuration.Visibility;
+import org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistry;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java Tue Jan 30 03:51:55 2007
@@ -20,9 +20,9 @@
 import java.io.File;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleRevisionId;
-import org.apache.ivy.filter.FilterHelper;
-import org.apache.ivy.matcher.PatternMatcher;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.plugins.matcher.PatternMatcher;
+import org.apache.ivy.util.filter.FilterHelper;
 import org.apache.tools.ant.BuildException;
 
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java Tue Jan 30 03:51:55 2007
@@ -18,9 +18,9 @@
 package org.apache.ivy.ant;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleRevisionId;
-import org.apache.ivy.matcher.PatternMatcher;
-import org.apache.ivy.util.IvyPatternHelper;
+import org.apache.ivy.core.IvyPatternHelper;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.plugins.matcher.PatternMatcher;
 import org.apache.tools.ant.BuildException;
 
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Tue Jan 30 03:51:55 2007
@@ -20,12 +20,12 @@
 import java.io.File;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleId;
-import org.apache.ivy.filter.Filter;
-import org.apache.ivy.filter.FilterHelper;
-import org.apache.ivy.report.ResolveReport;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.report.ResolveReport;
 import org.apache.ivy.util.Message;
 import org.apache.ivy.util.StringUtils;
+import org.apache.ivy.util.filter.Filter;
+import org.apache.ivy.util.filter.FilterHelper;
 import org.apache.tools.ant.BuildException;
 
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java Tue Jan 30 03:51:55 2007
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ivy.Artifact;
-import org.apache.ivy.ArtifactRevisionId;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleRevisionId;
-import org.apache.ivy.util.IvyPatternHelper;
+import org.apache.ivy.core.IvyPatternHelper;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.core.module.id.ArtifactRevisionId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.apache.ivy.util.Message;
 import org.apache.tools.ant.BuildException;
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyReport.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyReport.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyReport.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyReport.java Tue Jan 30 03:51:55 2007
@@ -24,10 +24,10 @@
 import java.util.List;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleId;
-import org.apache.ivy.report.XmlReportOutputter;
+import org.apache.ivy.core.IvyPatternHelper;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.plugins.report.XmlReportOutputter;
 import org.apache.ivy.util.FileUtil;
-import org.apache.ivy.util.IvyPatternHelper;
 import org.apache.ivy.util.Message;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.XSLTProcess;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRepositoryReport.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRepositoryReport.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRepositoryReport.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRepositoryReport.java Tue Jan 30 03:51:55 2007
@@ -23,15 +23,15 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.ivy.DefaultModuleDescriptor;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleId;
-import org.apache.ivy.ModuleRevisionId;
-import org.apache.ivy.filter.FilterHelper;
-import org.apache.ivy.matcher.PatternMatcher;
-import org.apache.ivy.report.ResolveReport;
-import org.apache.ivy.report.XmlReportOutputter;
+import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.report.ResolveReport;
+import org.apache.ivy.plugins.matcher.PatternMatcher;
+import org.apache.ivy.plugins.report.XmlReportOutputter;
 import org.apache.ivy.util.FileUtil;
+import org.apache.ivy.util.filter.FilterHelper;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.XSLTProcess;
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java Tue Jan 30 03:51:55 2007
@@ -22,11 +22,11 @@
 import java.text.ParseException;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleDescriptor;
-import org.apache.ivy.ModuleRevisionId;
-import org.apache.ivy.filter.FilterHelper;
-import org.apache.ivy.report.ResolveReport;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.report.ResolveReport;
 import org.apache.ivy.util.Message;
+import org.apache.ivy.util.filter.FilterHelper;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java Tue Jan 30 03:51:55 2007
@@ -17,7 +17,7 @@
  */
 package org.apache.ivy.ant;
 
-import org.apache.ivy.filter.Filter;
+import org.apache.ivy.util.filter.Filter;
 import org.apache.tools.ant.BuildException;
 
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java Tue Jan 30 03:51:55 2007
@@ -26,9 +26,9 @@
 import java.util.Map;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.IvyContext;
-import org.apache.ivy.ModuleDescriptor;
-import org.apache.ivy.report.ResolveReport;
+import org.apache.ivy.core.IvyContext;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.report.ResolveReport;
 import org.apache.ivy.util.Message;
 import org.apache.ivy.util.StringUtils;
 import org.apache.tools.ant.BuildException;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/PackageMapping.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/PackageMapping.java?view=diff&rev=501379&r1=501378&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/PackageMapping.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/PackageMapping.java Tue Jan 30 03:51:55 2007
@@ -17,7 +17,7 @@
  */
 package org.apache.ivy.ant;
 
-import org.apache.ivy.ModuleRevisionId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/IvyContext.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/IvyContext.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/IvyContext.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java Tue Jan 30 03:51:55 2007
@@ -15,15 +15,15 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.ivy.circular.CircularDependencyStrategy;
-import org.apache.ivy.util.IvyThread;
+import org.apache.ivy.Ivy;
+import org.apache.ivy.plugins.circular.CircularDependencyStrategy;
 import org.apache.ivy.util.MessageImpl;
 
 
@@ -95,14 +95,14 @@
         }
         return _defaultIvy;
     }
-    void setIvy(Ivy ivy) {
+    public void setIvy(Ivy ivy) {
     	_ivy = new WeakReference(ivy);
     	_operatingThread = Thread.currentThread();
     }
     public File getCache() {
     	return _cache == null ? getIvy().getDefaultCache() : _cache;
     }
-    void setCache(File cache) {
+    public void setCache(File cache) {
     	_cache = cache;
     }
 

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyPatternHelper.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/util/IvyPatternHelper.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyPatternHelper.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/util/IvyPatternHelper.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyPatternHelper.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/util/IvyPatternHelper.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyPatternHelper.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.util;
+package org.apache.ivy.core;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -27,12 +27,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.ivy.Artifact;
-import org.apache.ivy.ArtifactOrigin;
-import org.apache.ivy.DefaultArtifact;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.IvyContext;
-import org.apache.ivy.ModuleRevisionId;
+import org.apache.ivy.core.cache.ArtifactOrigin;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.core.module.descriptor.DefaultArtifact;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.util.Message;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyThread.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/util/IvyThread.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyThread.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/util/IvyThread.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyThread.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/util/IvyThread.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyThread.java Tue Jan 30 03:51:55 2007
@@ -15,9 +15,8 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.util;
+package org.apache.ivy.core;
 
-import org.apache.ivy.IvyContext;
 
 /**
  * A simple thread subclass associated the same IvyContext as the thread in which it is instanciated.

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/ArtifactOrigin.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/ArtifactOrigin.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ArtifactOrigin.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.cache;
 
 /**
  * This class contains information about the origin of an artifact.

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DefaultPublishingDRResolver.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultPublishingDRResolver.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DefaultPublishingDRResolver.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultPublishingDRResolver.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DefaultPublishingDRResolver.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultPublishingDRResolver.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DefaultPublishingDRResolver.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,10 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.deliver;
+
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
 
 
 public class DefaultPublishingDRResolver implements PublishingDependencyRevisionResolver {

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/PublishingDependencyRevisionResolver.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/PublishingDependencyRevisionResolver.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/PublishingDependencyRevisionResolver.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/PublishingDependencyRevisionResolver.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/PublishingDependencyRevisionResolver.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/PublishingDependencyRevisionResolver.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/PublishingDependencyRevisionResolver.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,10 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.deliver;
+
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
 
 /**
  * @author Xavier Hanin

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/FilteredIvyListener.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/event/FilteredIvyListener.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/FilteredIvyListener.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/event/FilteredIvyListener.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/FilteredIvyListener.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/event/FilteredIvyListener.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/FilteredIvyListener.java Tue Jan 30 03:51:55 2007
@@ -15,9 +15,9 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event;
+package org.apache.ivy.core.event;
 
-import org.apache.ivy.filter.Filter;
+import org.apache.ivy.util.filter.Filter;
 
 public class FilteredIvyListener implements IvyListener {
 	private IvyListener _listener;

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/event/IvyEvent.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/event/IvyEvent.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/event/IvyEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java Tue Jan 30 03:51:55 2007
@@ -15,15 +15,15 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event;
+package org.apache.ivy.core.event;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleDescriptor;
-import org.apache.ivy.ModuleId;
-import org.apache.ivy.ModuleRevisionId;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.apache.ivy.util.StringUtils;
 
 

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEventFilter.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/event/IvyEventFilter.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEventFilter.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/event/IvyEventFilter.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEventFilter.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/event/IvyEventFilter.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEventFilter.java Tue Jan 30 03:51:55 2007
@@ -15,16 +15,16 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event;
+package org.apache.ivy.core.event;
 
-import org.apache.ivy.filter.AndFilter;
-import org.apache.ivy.filter.Filter;
-import org.apache.ivy.filter.NoFilter;
-import org.apache.ivy.filter.NotFilter;
-import org.apache.ivy.filter.OrFilter;
-import org.apache.ivy.matcher.ExactPatternMatcher;
-import org.apache.ivy.matcher.Matcher;
-import org.apache.ivy.matcher.PatternMatcher;
+import org.apache.ivy.plugins.matcher.ExactPatternMatcher;
+import org.apache.ivy.plugins.matcher.Matcher;
+import org.apache.ivy.plugins.matcher.PatternMatcher;
+import org.apache.ivy.util.filter.AndFilter;
+import org.apache.ivy.util.filter.Filter;
+import org.apache.ivy.util.filter.NoFilter;
+import org.apache.ivy.util.filter.NotFilter;
+import org.apache.ivy.util.filter.OrFilter;
 
 /**
  * A filter implementation filtering {@link IvyEvent} based upon

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyListener.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/event/IvyListener.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyListener.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/event/IvyListener.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyListener.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/event/IvyListener.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyListener.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event;
+package org.apache.ivy.core.event;
 
 import java.util.EventListener;
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/DownloadEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/DownloadEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/DownloadEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/DownloadEvent.java Tue Jan 30 03:51:55 2007
@@ -15,11 +15,11 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.download;
+package org.apache.ivy.core.event.download;
 
-import org.apache.ivy.Artifact;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.event.IvyEvent;
+import org.apache.ivy.core.event.IvyEvent;
+import org.apache.ivy.core.module.descriptor.Artifact;
 
 public abstract class DownloadEvent extends IvyEvent {
     private Artifact _artifact;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/EndArtifactDownloadEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/EndArtifactDownloadEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/EndArtifactDownloadEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/EndArtifactDownloadEvent.java Tue Jan 30 03:51:55 2007
@@ -15,15 +15,15 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.download;
+package org.apache.ivy.core.event.download;
 
 import java.io.File;
 
-import org.apache.ivy.Artifact;
-import org.apache.ivy.ArtifactOrigin;
-import org.apache.ivy.DependencyResolver;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.report.ArtifactDownloadReport;
+import org.apache.ivy.core.cache.ArtifactOrigin;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.core.report.ArtifactDownloadReport;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
 
 
 public class EndArtifactDownloadEvent extends DownloadEvent {

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/NeedArtifactEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/NeedArtifactEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/NeedArtifactEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/NeedArtifactEvent.java Tue Jan 30 03:51:55 2007
@@ -15,11 +15,11 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.download;
+package org.apache.ivy.core.event.download;
 
-import org.apache.ivy.Artifact;
-import org.apache.ivy.DependencyResolver;
 import org.apache.ivy.Ivy;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
 
 public class NeedArtifactEvent extends DownloadEvent {
     public static final String NAME = "need-artifact";

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/PrepareDownloadEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/PrepareDownloadEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/PrepareDownloadEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/PrepareDownloadEvent.java Tue Jan 30 03:51:55 2007
@@ -15,11 +15,11 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.download;
+package org.apache.ivy.core.event.download;
 
-import org.apache.ivy.Artifact;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.event.IvyEvent;
+import org.apache.ivy.core.event.IvyEvent;
+import org.apache.ivy.core.module.descriptor.Artifact;
 
 public class PrepareDownloadEvent extends IvyEvent {
 	public static final String NAME = "prepare-download";

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/StartArtifactDownloadEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/StartArtifactDownloadEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/StartArtifactDownloadEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/StartArtifactDownloadEvent.java Tue Jan 30 03:51:55 2007
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.download;
+package org.apache.ivy.core.event.download;
 
-import org.apache.ivy.Artifact;
-import org.apache.ivy.ArtifactOrigin;
-import org.apache.ivy.DependencyResolver;
 import org.apache.ivy.Ivy;
+import org.apache.ivy.core.cache.ArtifactOrigin;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
 
 public class StartArtifactDownloadEvent extends DownloadEvent {
     public static final String NAME = "pre-download-artifact";

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java Tue Jan 30 03:51:55 2007
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.resolve;
+package org.apache.ivy.core.event.resolve;
 
-import org.apache.ivy.DependencyDescriptor;
-import org.apache.ivy.DependencyResolver;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ResolvedModuleRevision;
+import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.apache.ivy.core.resolve.ResolvedModuleRevision;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
 
 public class EndResolveDependencyEvent extends ResolveDependencyEvent {
 	public static final String NAME = "post-resolve-dependency";

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveEvent.java Tue Jan 30 03:51:55 2007
@@ -15,11 +15,11 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.resolve;
+package org.apache.ivy.core.event.resolve;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleDescriptor;
-import org.apache.ivy.report.ResolveReport;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.report.ResolveReport;
 
 public class EndResolveEvent extends ResolveEvent {
 	public static final String NAME = "post-resolve";

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java Tue Jan 30 03:51:55 2007
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.resolve;
+package org.apache.ivy.core.event.resolve;
 
-import org.apache.ivy.DependencyDescriptor;
-import org.apache.ivy.DependencyResolver;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.event.IvyEvent;
+import org.apache.ivy.core.event.IvyEvent;
+import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
 
 public class ResolveDependencyEvent extends IvyEvent {
 	private DependencyResolver _resolver;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveEvent.java Tue Jan 30 03:51:55 2007
@@ -15,11 +15,11 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.resolve;
+package org.apache.ivy.core.event.resolve;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleDescriptor;
-import org.apache.ivy.event.IvyEvent;
+import org.apache.ivy.core.event.IvyEvent;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 
 public class ResolveEvent extends IvyEvent {
 	private ModuleDescriptor _md;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/StartResolveDependencyEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/StartResolveDependencyEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/StartResolveDependencyEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/StartResolveDependencyEvent.java Tue Jan 30 03:51:55 2007
@@ -15,11 +15,11 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.resolve;
+package org.apache.ivy.core.event.resolve;
 
-import org.apache.ivy.DependencyDescriptor;
-import org.apache.ivy.DependencyResolver;
 import org.apache.ivy.Ivy;
+import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
 
 public class StartResolveDependencyEvent extends ResolveDependencyEvent {
 	public static final String NAME = "pre-resolve-dependency";

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/StartResolveEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/StartResolveEvent.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/StartResolveEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/StartResolveEvent.java Tue Jan 30 03:51:55 2007
@@ -15,10 +15,10 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.event.resolve;
+package org.apache.ivy.core.event.resolve;
 
 import org.apache.ivy.Ivy;
-import org.apache.ivy.ModuleDescriptor;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 
 public class StartResolveEvent extends ResolveEvent {
 	public static final String NAME = "pre-resolve";

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/AbstractArtifact.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/AbstractArtifact.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/AbstractArtifact.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.util.Map;
 

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Artifact.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/Artifact.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Artifact.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/Artifact.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Artifact.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/Artifact.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Artifact.java Tue Jan 30 03:51:55 2007
@@ -15,12 +15,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.net.URL;
 import java.util.Date;
 
-import org.apache.ivy.extendable.ExtendableItem;
+import org.apache.ivy.core.module.id.ArtifactRevisionId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.util.extendable.ExtendableItem;
 
 
 

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/Configuration.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/Configuration.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/Configuration.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java Tue Jan 30 03:51:55 2007
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.apache.ivy.extendable.DefaultExtendableItem;
+import org.apache.ivy.util.extendable.DefaultExtendableItem;
 
 
 

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultArtifact.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultArtifact.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultArtifact.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java Tue Jan 30 03:51:55 2007
@@ -15,11 +15,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.net.URL;
 import java.util.Date;
 import java.util.Map;
+
+import org.apache.ivy.core.module.id.ArtifactRevisionId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
 
 /**
  * @author Hanin

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyArtifactDescriptor.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultDependencyArtifactDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyArtifactDescriptor.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultDependencyArtifactDescriptor.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyArtifactDescriptor.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultDependencyArtifactDescriptor.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyArtifactDescriptor.java Tue Jan 30 03:51:55 2007
@@ -15,13 +15,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.ivy.matcher.PatternMatcher;
+import org.apache.ivy.core.module.id.ArtifactId;
+import org.apache.ivy.plugins.matcher.PatternMatcher;
 
 
 public class DefaultDependencyArtifactDescriptor implements DependencyArtifactDescriptor {

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultDependencyDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultDependencyDescriptor.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultDependencyDescriptor.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,10 +30,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.ivy.matcher.MatcherHelper;
-import org.apache.ivy.namespace.NameSpaceHelper;
-import org.apache.ivy.namespace.Namespace;
-import org.apache.ivy.namespace.NamespaceTransformer;
+import org.apache.ivy.core.module.id.ArtifactId;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.plugins.matcher.MatcherHelper;
+import org.apache.ivy.plugins.namespace.NameSpaceHelper;
+import org.apache.ivy.plugins.namespace.Namespace;
+import org.apache.ivy.plugins.namespace.NamespaceTransformer;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultModuleDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultModuleDescriptor.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultModuleDescriptor.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,17 +31,20 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ivy.matcher.MatcherHelper;
-import org.apache.ivy.matcher.PatternMatcher;
-import org.apache.ivy.namespace.NameSpaceHelper;
-import org.apache.ivy.namespace.Namespace;
-import org.apache.ivy.namespace.NamespaceTransformer;
-import org.apache.ivy.parser.ModuleDescriptorParser;
-import org.apache.ivy.repository.Resource;
-import org.apache.ivy.status.StatusManager;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.module.status.StatusManager;
+import org.apache.ivy.plugins.conflict.ConflictManager;
+import org.apache.ivy.plugins.matcher.MatcherHelper;
+import org.apache.ivy.plugins.matcher.PatternMatcher;
+import org.apache.ivy.plugins.namespace.NameSpaceHelper;
+import org.apache.ivy.plugins.namespace.Namespace;
+import org.apache.ivy.plugins.namespace.NamespaceTransformer;
+import org.apache.ivy.plugins.parser.ModuleDescriptorParser;
+import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
+import org.apache.ivy.plugins.repository.Resource;
+import org.apache.ivy.plugins.version.VersionMatcher;
 import org.apache.ivy.util.Message;
-import org.apache.ivy.version.VersionMatcher;
-import org.apache.ivy.xml.XmlModuleDescriptorWriter;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DependencyArtifactDescriptor.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/DependencyArtifactDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DependencyArtifactDescriptor.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/DependencyArtifactDescriptor.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DependencyArtifactDescriptor.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/DependencyArtifactDescriptor.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DependencyArtifactDescriptor.java Tue Jan 30 03:51:55 2007
@@ -15,11 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.net.URL;
 
-import org.apache.ivy.matcher.PatternMatcher;
+import org.apache.ivy.core.module.id.ArtifactId;
+import org.apache.ivy.plugins.matcher.PatternMatcher;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DependencyDescriptor.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/DependencyDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DependencyDescriptor.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/DependencyDescriptor.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DependencyDescriptor.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/DependencyDescriptor.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DependencyDescriptor.java Tue Jan 30 03:51:55 2007
@@ -15,10 +15,13 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
-import org.apache.ivy.extendable.ExtendableItem;
-import org.apache.ivy.namespace.Namespace;
+import org.apache.ivy.core.module.id.ArtifactId;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.plugins.namespace.Namespace;
+import org.apache.ivy.util.extendable.ExtendableItem;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/License.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/License.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/License.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/License.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/License.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/License.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/License.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 public class License {
     private String _name;

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/MDArtifact.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/MDArtifact.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/MDArtifact.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java Tue Jan 30 03:51:55 2007
@@ -15,13 +15,16 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
+import org.apache.ivy.core.module.id.ArtifactRevisionId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
 
 /**
  * @author x.hanin

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/ModuleDescriptor.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/ModuleDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/ModuleDescriptor.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/ModuleDescriptor.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/ModuleDescriptor.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ModuleDescriptor.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/ModuleDescriptor.java Tue Jan 30 03:51:55 2007
@@ -15,17 +15,20 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.descriptor;
 
 import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Date;
 
-import org.apache.ivy.extendable.ExtendableItem;
-import org.apache.ivy.parser.ModuleDescriptorParser;
-import org.apache.ivy.repository.Resource;
-import org.apache.ivy.version.VersionMatcher;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.plugins.conflict.ConflictManager;
+import org.apache.ivy.plugins.parser.ModuleDescriptorParser;
+import org.apache.ivy.plugins.repository.Resource;
+import org.apache.ivy.plugins.version.VersionMatcher;
+import org.apache.ivy.util.extendable.ExtendableItem;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactId.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/ArtifactId.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactId.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/ArtifactId.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactId.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ArtifactId.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactId.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.id;
 
 /**
  * Identifies an artifact in a module, without revision information

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactRevisionId.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/ArtifactRevisionId.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactRevisionId.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/ArtifactRevisionId.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactRevisionId.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ArtifactRevisionId.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactRevisionId.java Tue Jan 30 03:51:55 2007
@@ -15,12 +15,12 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.id;
 
 import java.util.Map;
 
-import org.apache.ivy.extendable.UnmodifiableExtendableItem;
-import org.apache.ivy.util.IvyPatternHelper;
+import org.apache.ivy.core.IvyPatternHelper;
+import org.apache.ivy.util.extendable.UnmodifiableExtendableItem;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleId.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/ModuleId.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleId.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/ModuleId.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleId.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ModuleId.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleId.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.id;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/ModuleRevisionId.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/ModuleRevisionId.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ModuleRevisionId.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java Tue Jan 30 03:51:55 2007
@@ -15,14 +15,15 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.module.id;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.ivy.extendable.UnmodifiableExtendableItem;
-import org.apache.ivy.util.IvyPatternHelper;
+import org.apache.ivy.core.IvyContext;
+import org.apache.ivy.core.IvyPatternHelper;
+import org.apache.ivy.util.extendable.UnmodifiableExtendableItem;
 
 
 

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/Status.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/Status.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/Status.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/Status.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.status;
+package org.apache.ivy.core.module.status;
 
 public class Status {
     private String _name;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/StatusManager.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/StatusManager.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/StatusManager.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/StatusManager.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.status;
+package org.apache.ivy.core.module.status;
 
 import java.util.ArrayList;
 import java.util.Arrays;

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java Tue Jan 30 03:51:55 2007
@@ -15,10 +15,10 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.report;
+package org.apache.ivy.core.report;
 
-import org.apache.ivy.Artifact;
-import org.apache.ivy.ArtifactOrigin;
+import org.apache.ivy.core.cache.ArtifactOrigin;
+import org.apache.ivy.core.module.descriptor.Artifact;
 
 /**
  * @author x.hanin

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.report;
+package org.apache.ivy.core.report;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -32,14 +32,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.ivy.Artifact;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.IvyNode;
-import org.apache.ivy.ModuleDescriptor;
-import org.apache.ivy.ModuleId;
-import org.apache.ivy.ModuleRevisionId;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.resolve.IvyNode;
+import org.apache.ivy.plugins.report.XmlReportOutputter;
+import org.apache.ivy.plugins.report.XmlReportParser;
 import org.apache.ivy.util.Message;
-import org.apache.ivy.xml.XmlReportParser;
 
 
 /**

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadReport.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadReport.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadReport.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadReport.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.report;
+package org.apache.ivy.core.report;
 
 
 import java.util.ArrayList;
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ivy.Artifact;
+import org.apache.ivy.core.module.descriptor.Artifact;
 
 /**
  * @author x.hanin

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.report;
+package org.apache.ivy.core.report;
 
 /**
  * @author x.hanin

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java?view=diff&rev=501379&r1=501336&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.report;
+package org.apache.ivy.core.report;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -27,10 +27,11 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ivy.IvyNode;
-import org.apache.ivy.ModuleDescriptor;
-import org.apache.ivy.ModuleId;
-import org.apache.ivy.filter.Filter;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.resolve.IvyNode;
+import org.apache.ivy.plugins.report.ReportOutputter;
+import org.apache.ivy.util.filter.Filter;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultModuleRevision.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultModuleRevision.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/DefaultModuleRevision.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java Tue Jan 30 03:51:55 2007
@@ -15,10 +15,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.resolve;
 
 import java.net.URL;
 import java.util.Date;
+
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
 
 
 /**

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/IvyNode.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/IvyNode.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/IvyNode.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.resolve;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,12 +33,26 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.ivy.event.resolve.EndResolveDependencyEvent;
-import org.apache.ivy.event.resolve.StartResolveDependencyEvent;
-import org.apache.ivy.filter.Filter;
-import org.apache.ivy.filter.FilterHelper;
-import org.apache.ivy.matcher.MatcherHelper;
+import org.apache.ivy.core.IvyContext;
+import org.apache.ivy.core.event.resolve.EndResolveDependencyEvent;
+import org.apache.ivy.core.event.resolve.StartResolveDependencyEvent;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.core.module.descriptor.Configuration;
+import org.apache.ivy.core.module.descriptor.DefaultArtifact;
+import org.apache.ivy.core.module.descriptor.DependencyArtifactDescriptor;
+import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.apache.ivy.core.module.descriptor.MDArtifact;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.descriptor.Configuration.Visibility;
+import org.apache.ivy.core.module.id.ArtifactId;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.plugins.conflict.ConflictManager;
+import org.apache.ivy.plugins.matcher.MatcherHelper;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
 import org.apache.ivy.util.Message;
+import org.apache.ivy.util.filter.Filter;
+import org.apache.ivy.util.filter.FilterHelper;
 
 
 public class IvyNode {
@@ -1513,7 +1527,7 @@
      * @return true if current node is transitive and the parent configuration is
      * transitive.
      */
-    protected boolean isTransitive() {
+    public boolean isTransitive() {
         return (_data.isTransitive() &&
         		getDependencyDescriptor(getParent()).isTransitive() &&
                 isParentConfTransitive() );

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/ResolveData.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/ResolveData.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ResolveData.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java Tue Jan 30 03:51:55 2007
@@ -15,14 +15,16 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.resolve;
 
 import java.io.File;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.ivy.report.ConfigurationResolveReport;
+import org.apache.ivy.Ivy;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.report.ConfigurationResolveReport;
 
 
 public class ResolveData {

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolvedModuleRevision.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/ResolvedModuleRevision.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolvedModuleRevision.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/ResolvedModuleRevision.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolvedModuleRevision.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ResolvedModuleRevision.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolvedModuleRevision.java Tue Jan 30 03:51:55 2007
@@ -15,10 +15,14 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy;
+package org.apache.ivy.core.resolve;
 
 import java.net.URL;
 import java.util.Date;
+
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
 
 /**
  * @author x.hanin

Added: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/ModuleEntry.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/ModuleEntry.java?view=auto&rev=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/ModuleEntry.java (added)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/ModuleEntry.java Tue Jan 30 03:51:55 2007
@@ -0,0 +1,50 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.ivy.core.search;
+
+import org.apache.ivy.plugins.resolver.DependencyResolver;
+
+
+
+public class ModuleEntry {
+    private OrganisationEntry _organisationEntry;
+    private String _module;
+
+    public ModuleEntry(OrganisationEntry org, String name) {
+        _organisationEntry = org;
+        _module = name;
+    }
+
+    public String getOrganisation() {
+        return _organisationEntry.getOrganisation();
+    }
+    
+    public DependencyResolver getResolver() {
+        return _organisationEntry.getResolver();
+    }
+
+    public String getModule() {
+        return _module;
+    }
+    
+
+    public OrganisationEntry getOrganisationEntry() {
+        return _organisationEntry;
+    }
+    
+}

Added: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/OrganisationEntry.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/OrganisationEntry.java?view=auto&rev=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/OrganisationEntry.java (added)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/OrganisationEntry.java Tue Jan 30 03:51:55 2007
@@ -0,0 +1,40 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.ivy.core.search;
+
+import org.apache.ivy.plugins.resolver.DependencyResolver;
+
+
+public class OrganisationEntry {
+    private DependencyResolver _resolver;
+    private String _organisation;
+
+    public OrganisationEntry(DependencyResolver resolver, String organisation) {
+        _resolver = resolver;
+        _organisation = organisation;
+    }
+
+    public String getOrganisation() {
+        return _organisation;
+    }
+    
+    public DependencyResolver getResolver() {
+        return _resolver;
+    }
+    
+}

Added: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/RevisionEntry.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/RevisionEntry.java?view=auto&rev=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/RevisionEntry.java (added)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/RevisionEntry.java Tue Jan 30 03:51:55 2007
@@ -0,0 +1,59 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.ivy.core.search;
+
+import org.apache.ivy.plugins.resolver.DependencyResolver;
+
+
+
+
+public class RevisionEntry {
+    private ModuleEntry _moduleEntry;
+    private String _revision;
+
+    public RevisionEntry(ModuleEntry mod, String name) {
+        _moduleEntry = mod;
+        _revision = name;
+    }
+
+    public ModuleEntry getModuleEntry() {
+        return _moduleEntry;
+    }
+    
+
+    public String getRevision() {
+        return _revision;
+    }
+
+    public String getModule() {
+        return _moduleEntry.getModule();
+    }
+
+    public String getOrganisation() {
+        return _moduleEntry.getOrganisation();
+    }
+
+    public OrganisationEntry getOrganisationEntry() {
+        return _moduleEntry.getOrganisationEntry();
+    }
+
+    public DependencyResolver getResolver() {
+        return _moduleEntry.getResolver();
+    }
+    
+}

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyPattern.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/util/IvyPattern.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyPattern.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/util/IvyPattern.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyPattern.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/util/IvyPattern.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyPattern.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.util;
+package org.apache.ivy.core.settings;
 
 /**
  * @author x.hanin

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/xml/XmlIvyConfigurationParser.java)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/xml/XmlIvyConfigurationParser.java&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/xml/XmlIvyConfigurationParser.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java Tue Jan 30 03:51:55 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.ivy.xml;
+package org.apache.ivy.core.settings;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,16 +30,16 @@
 
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.ivy.ConflictManager;
 import org.apache.ivy.Ivy;
-import org.apache.ivy.LatestStrategy;
-import org.apache.ivy.ModuleId;
-import org.apache.ivy.circular.CircularDependencyStrategy;
-import org.apache.ivy.matcher.PatternMatcher;
-import org.apache.ivy.status.StatusManager;
-import org.apache.ivy.url.URLHandlerRegistry;
+import org.apache.ivy.core.module.id.ModuleId;
+import org.apache.ivy.core.module.status.StatusManager;
+import org.apache.ivy.plugins.circular.CircularDependencyStrategy;
+import org.apache.ivy.plugins.conflict.ConflictManager;
+import org.apache.ivy.plugins.latest.LatestStrategy;
+import org.apache.ivy.plugins.matcher.PatternMatcher;
 import org.apache.ivy.util.Configurator;
 import org.apache.ivy.util.Message;
+import org.apache.ivy.util.url.URLHandlerRegistry;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -49,7 +49,7 @@
  * @author Hanin
  *
  */
-public class XmlIvyConfigurationParser extends DefaultHandler {
+public class XmlSettingsParser extends DefaultHandler {
 	private Configurator _configurator;
     private List _configuratorTags = Arrays.asList(new String[] {"resolvers", "namespaces", "parsers", "latest-strategies", "conflict-managers", "outputters", "version-matchers", "statuses", "circular-dependency-strategies", "triggers"});
 
@@ -61,7 +61,7 @@
     private String _defaultCircular;
     private String _currentConfiguratorTag;
 
-    public XmlIvyConfigurationParser(Ivy ivy) {
+    public XmlSettingsParser(Ivy ivy) {
         _ivy = ivy;
 	}
 
@@ -227,7 +227,7 @@
                             ivyconfURL = incFile.toURL();
                         }
                     }
-                    new XmlIvyConfigurationParser(_ivy).parse(_configurator, ivyconfURL);
+                    new XmlSettingsParser(_ivy).parse(_configurator, ivyconfURL);
                 } finally {
                     _ivy.setVariables(variables);
                 }

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivy.properties (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/ivy.properties)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivy.properties?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/ivy.properties&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivy.properties&r2=501379
==============================================================================
    (empty)

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/repository.properties (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/repository.properties)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/repository.properties?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/repository.properties&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/repository.properties&r2=501379
==============================================================================
    (empty)

Copied: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/typedef.properties (from r501336, incubator/ivy/core/trunk/src/java/org/apache/ivy/typedef.properties)
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/typedef.properties?view=diff&rev=501379&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/typedef.properties&r1=501336&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/typedef.properties&r2=501379
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/typedef.properties (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/typedef.properties Tue Jan 30 03:51:55 2007
@@ -1,33 +1,33 @@
-filesystem 	= org.apache.ivy.resolver.FileSystemResolver
-chain 		= org.apache.ivy.resolver.ChainResolver
-ibiblio		= org.apache.ivy.resolver.IBiblioResolver
-url			= org.apache.ivy.resolver.URLResolver
-dual		= org.apache.ivy.resolver.DualResolver
-ivyrep		= org.apache.ivy.resolver.IvyRepResolver
-ssh         = org.apache.ivy.resolver.SshResolver
-sftp        = org.apache.ivy.resolver.SFTPResolver
-vsftp       = org.apache.ivy.resolver.VsftpResolver
-vfs         = org.apache.ivy.resolver.VfsResolver
-cache		= org.apache.ivy.resolver.CacheResolver
+filesystem 	= org.apache.ivy.plugins.resolver.FileSystemResolver
+chain 		= org.apache.ivy.plugins.resolver.ChainResolver
+ibiblio		= org.apache.ivy.plugins.resolver.IBiblioResolver
+url			= org.apache.ivy.plugins.resolver.URLResolver
+dual		= org.apache.ivy.plugins.resolver.DualResolver
+ivyrep		= org.apache.ivy.plugins.resolver.IvyRepResolver
+ssh         = org.apache.ivy.plugins.resolver.SshResolver
+sftp        = org.apache.ivy.plugins.resolver.SFTPResolver
+vsftp       = org.apache.ivy.plugins.resolver.VsftpResolver
+vfs         = org.apache.ivy.plugins.resolver.VfsResolver
+cache		= org.apache.ivy.plugins.resolver.CacheResolver
 
-latest-revision = org.apache.ivy.latest.LatestRevisionStrategy
-latest-lexico   = org.apache.ivy.latest.LatestLexicographicStrategy
-latest-time     = org.apache.ivy.latest.LatestTimeStrategy
+latest-revision = org.apache.ivy.plugins.latest.LatestRevisionStrategy
+latest-lexico   = org.apache.ivy.plugins.latest.LatestLexicographicStrategy
+latest-time     = org.apache.ivy.plugins.latest.LatestTimeStrategy
 
-fixed-cm 	= org.apache.ivy.conflict.FixedConflictManager
-latest-cm   = org.apache.ivy.conflict.LatestConflictManager
-no-cm     	= org.apache.ivy.conflict.NoConflictManager
-strict-cm   = org.apache.ivy.conflict.StrictConflictManager
-regexp-cm   = org.apache.ivy.conflict.RegexpConflictManager
+fixed-cm 	= org.apache.ivy.plugins.conflict.FixedConflictManager
+latest-cm   = org.apache.ivy.plugins.conflict.LatestConflictManager
+no-cm     	= org.apache.ivy.plugins.conflict.NoConflictManager
+strict-cm   = org.apache.ivy.plugins.conflict.StrictConflictManager
+regexp-cm   = org.apache.ivy.plugins.conflict.RegexpConflictManager
 
 
-namespace   = org.apache.ivy.namespace.Namespace
+namespace   = org.apache.ivy.plugins.namespace.Namespace
 
-exact-vm		= org.apache.ivy.version.ExactVersionMatcher
-chain-vm		= org.apache.ivy.version.ChainVersionMatcher
-latest-vm  		= org.apache.ivy.version.LatestVersionMatcher
-sub-vm  		= org.apache.ivy.version.SubVersionMatcher
-range-vm		= org.apache.ivy.version.VersionRangeMatcher
+exact-vm		= org.apache.ivy.plugins.version.ExactVersionMatcher
+chain-vm		= org.apache.ivy.plugins.version.ChainVersionMatcher
+latest-vm  		= org.apache.ivy.plugins.version.LatestVersionMatcher
+sub-vm  		= org.apache.ivy.plugins.version.SubVersionMatcher
+range-vm		= org.apache.ivy.plugins.version.VersionRangeMatcher
 
 ant-build		= org.apache.ivy.ant.AntBuildTrigger
 ant-call		= org.apache.ivy.ant.AntCallTrigger