Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcherTest.java Tue Jan 30 03:51:55 2007 @@ -15,9 +15,12 @@ * limitations under the License. * */ -package org.apache.ivy.matcher; +package org.apache.ivy.plugins.matcher; import java.util.regex.PatternSyntaxException; + +import org.apache.ivy.plugins.matcher.ExactOrRegexpPatternMatcher; +import org.apache.ivy.plugins.matcher.Matcher; /** *
Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactPatternMatcherTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactPatternMatcherTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactPatternMatcherTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/ExactPatternMatcherTest.java Tue Jan 30 03:51:55 2007 @@ -15,7 +15,10 @@ * limitations under the License. * */ -package org.apache.ivy.matcher; +package org.apache.ivy.plugins.matcher; + +import org.apache.ivy.plugins.matcher.ExactPatternMatcher; +import org.apache.ivy.plugins.matcher.Matcher; /** * @see ExactPatternMatcher Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/GlobPatternMatcherTest.java Tue Jan 30 03:51:55 2007 @@ -15,9 +15,12 @@ * limitations under the License. * */ -package org.apache.ivy.matcher; +package org.apache.ivy.plugins.matcher; import java.util.regex.PatternSyntaxException; + +import org.apache.ivy.plugins.matcher.GlobPatternMatcher; +import org.apache.ivy.plugins.matcher.Matcher; /** * @see GlobPatternMatcher Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcherTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcherTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcherTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcherTest.java Tue Jan 30 03:51:55 2007 @@ -15,9 +15,12 @@ * limitations under the License. * */ -package org.apache.ivy.matcher; +package org.apache.ivy.plugins.matcher; import java.util.regex.PatternSyntaxException; + +import org.apache.ivy.plugins.matcher.Matcher; +import org.apache.ivy.plugins.matcher.RegexpPatternMatcher; /** * @see RegexpPatternMatcher Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/namespace/MRIDTransformationRuleTest.java Tue Jan 30 03:51:55 2007 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.ivy.namespace; +package org.apache.ivy.plugins.namespace; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.namespace.MRIDRule; -import org.apache.ivy.namespace.MRIDTransformationRule; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.plugins.namespace.MRIDRule; +import org.apache.ivy.plugins.namespace.MRIDTransformationRule; import junit.framework.TestCase; Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java (from r501336, incubator/ivy/core/trunk/test/java/org/apache/ivy/parser/AbstractModuleDescriptorParserTester.java) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/parser/AbstractModuleDescriptorParserTester.java&r1=501336&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/parser/AbstractModuleDescriptorParserTester.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParserTester.java Tue Jan 30 03:51:55 2007 @@ -15,16 +15,16 @@ * limitations under the License. * */ -package org.apache.ivy.parser; +package org.apache.ivy.plugins.parser; import java.util.Arrays; -import org.apache.ivy.Artifact; -import org.apache.ivy.Configuration; -import org.apache.ivy.DependencyArtifactDescriptor; -import org.apache.ivy.DependencyDescriptor; -import org.apache.ivy.ModuleDescriptor; -import org.apache.ivy.Configuration.Visibility; +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.Configuration; +import org.apache.ivy.core.module.descriptor.DependencyArtifactDescriptor; +import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.descriptor.ModuleDescriptor; +import org.apache.ivy.core.module.descriptor.Configuration.Visibility; import junit.framework.TestCase; Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java (from r501336, incubator/ivy/core/trunk/test/java/org/apache/ivy/parser/ModuleDescriptorParserRegistryTest.java) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java?view=diff&rev=501379&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/parser/ModuleDescriptorParserRegistryTest.java&r1=501336&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/parser/ModuleDescriptorParserRegistryTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistryTest.java Tue Jan 30 03:51:55 2007 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.ivy.parser; +package org.apache.ivy.plugins.parser; import java.io.File; import java.io.IOException; @@ -23,13 +23,13 @@ import java.net.URL; import java.text.ParseException; -import org.apache.ivy.DefaultModuleDescriptor; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleDescriptor; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.parser.AbstractModuleDescriptorParser; -import org.apache.ivy.parser.ModuleDescriptorParserRegistry; -import org.apache.ivy.repository.Resource; +import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; +import org.apache.ivy.core.module.descriptor.ModuleDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.plugins.parser.AbstractModuleDescriptorParser; +import org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistry; +import org.apache.ivy.plugins.repository.Resource; import junit.framework.TestCase; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java Tue Jan 30 03:51:55 2007 @@ -15,21 +15,21 @@ * limitations under the License. * */ -package org.apache.ivy.external.m2; +package org.apache.ivy.plugins.parser.m2; import java.util.Arrays; import java.util.HashSet; -import org.apache.ivy.Artifact; -import org.apache.ivy.DependencyDescriptor; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleDescriptor; -import org.apache.ivy.ModuleId; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.external.m2.PomModuleDescriptorParser; -import org.apache.ivy.parser.AbstractModuleDescriptorParserTester; -import org.apache.ivy.repository.url.URLResource; -import org.apache.ivy.xml.XmlModuleDescriptorParserTest; +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +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.plugins.parser.AbstractModuleDescriptorParserTester; +import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser; +import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest; +import org.apache.ivy.plugins.repository.url.URLResource; public class PomModuleDescriptorParserTest extends AbstractModuleDescriptorParserTester { Copied: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/nores (from r501336, incubator/ivy/core/trunk/test/java/org/apache/ivy/parser/nores) URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/nores?view=diff&rev=501379&p1=incubator/ivy/core/trunk/test/java/org/apache/ivy/parser/nores&r1=501336&p2=incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/nores&r2=501379 ============================================================================== (empty) Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.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.plugins.parser.xml; import java.io.IOException; import java.text.ParseException; @@ -24,21 +24,21 @@ import java.util.GregorianCalendar; import java.util.HashSet; -import org.apache.ivy.Artifact; -import org.apache.ivy.Configuration; -import org.apache.ivy.ConflictManager; -import org.apache.ivy.DependencyDescriptor; import org.apache.ivy.Ivy; -import org.apache.ivy.License; -import org.apache.ivy.ModuleDescriptor; -import org.apache.ivy.ModuleId; -import org.apache.ivy.Configuration.Visibility; -import org.apache.ivy.conflict.FixedConflictManager; -import org.apache.ivy.conflict.NoConflictManager; -import org.apache.ivy.matcher.PatternMatcher; -import org.apache.ivy.parser.AbstractModuleDescriptorParserTester; +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.Configuration; +import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.descriptor.License; +import org.apache.ivy.core.module.descriptor.ModuleDescriptor; +import org.apache.ivy.core.module.descriptor.Configuration.Visibility; +import org.apache.ivy.core.module.id.ModuleId; +import org.apache.ivy.plugins.conflict.ConflictManager; +import org.apache.ivy.plugins.conflict.FixedConflictManager; +import org.apache.ivy.plugins.conflict.NoConflictManager; +import org.apache.ivy.plugins.matcher.PatternMatcher; +import org.apache.ivy.plugins.parser.AbstractModuleDescriptorParserTester; +import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser; import org.apache.ivy.util.XMLHelper; -import org.apache.ivy.xml.XmlModuleDescriptorParser; /** Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.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.plugins.parser.xml; import java.io.BufferedReader; import java.io.File; @@ -24,12 +24,12 @@ import java.io.InputStreamReader; import java.util.GregorianCalendar; -import org.apache.ivy.DefaultModuleDescriptor; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleDescriptor; +import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; +import org.apache.ivy.core.module.descriptor.ModuleDescriptor; +import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser; +import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter; import org.apache.ivy.util.FileUtil; -import org.apache.ivy.xml.XmlModuleDescriptorParser; -import org.apache.ivy.xml.XmlModuleDescriptorWriter; import junit.framework.TestCase; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.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.plugins.parser.xml; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -28,9 +28,9 @@ import java.util.Map; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleRevisionId; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorUpdater; import org.apache.ivy.util.FileUtil; -import org.apache.ivy.xml.XmlModuleDescriptorUpdater; import junit.framework.TestCase; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configextendsothers2.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configextendsothers2.xml?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configextendsothers2.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configextendsothers2.xml Tue Jan 30 03:51:55 2007 @@ -7,7 +7,7 @@ status="integration" publication="20041101110000"/> <configurations> - <include file="test/java/org/apache/ivy/xml/imported-configurations-with-wildcard.xml"/> + <include file="test/java/org/apache/ivy/plugins/parser/xml/imported-configurations-with-wildcard.xml"/> <conf name="priv" visibility="private" /> <conf name="extra" /> </configurations> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configextendsothers3.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configextendsothers3.xml?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configextendsothers3.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configextendsothers3.xml Tue Jan 30 03:51:55 2007 @@ -7,7 +7,7 @@ status="integration" publication="20041101110000"/> <configurations> - <include file="test/java/org/apache/ivy/xml/imported-configurations-with-wildcard.xml"/> + <include file="test/java/org/apache/ivy/plugins/parser/xml/imported-configurations-with-wildcard.xml"/> <conf name="priv" visibility="private" /> <conf name="extra" /> </configurations> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import1.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import1.xml?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import1.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import1.xml Tue Jan 30 03:51:55 2007 @@ -6,7 +6,7 @@ publication="20041101110000" /> <configurations> - <include file="test/java/org/apache/ivy/xml/imported-configurations.xml"/> + <include file="test/java/org/apache/ivy/plugins/parser/xml/imported-configurations.xml"/> </configurations> <dependencies> <dependency name="mymodule1" rev="1.0"/> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import2.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import2.xml?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import2.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import2.xml Tue Jan 30 03:51:55 2007 @@ -6,7 +6,7 @@ publication="20041101110000" /> <configurations> - <include file="test/java/org/apache/ivy/xml/imported-configurations.xml"/> + <include file="test/java/org/apache/ivy/plugins/parser/xml/imported-configurations.xml"/> <conf name="conf3"/> </configurations> <dependencies> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import3.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import3.xml?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import3.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import3.xml Tue Jan 30 03:51:55 2007 @@ -6,7 +6,7 @@ publication="20041101110000" /> <configurations> - <include file="test/java/org/apache/ivy/xml/imported-configurations-with-mapping.xml"/> + <include file="test/java/org/apache/ivy/plugins/parser/xml/imported-configurations-with-mapping.xml"/> </configurations> <dependencies> <dependency name="mymodule1" rev="1.0"/> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import4.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import4.xml?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import4.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-configurations-import4.xml Tue Jan 30 03:51:55 2007 @@ -6,7 +6,7 @@ publication="20041101110000" /> <configurations> - <include file="test/java/org/apache/ivy/xml/imported-configurations-with-mappingoverride.xml"/> + <include file="test/java/org/apache/ivy/plugins/parser/xml/imported-configurations-with-mappingoverride.xml"/> </configurations> <dependencies> <dependency name="mymodule1" rev="1.0" conf="conf1"/> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml Tue Jan 30 03:51:55 2007 @@ -22,7 +22,7 @@ </description> </info> <configurations> - <include file="test/java/org/apache/ivy/xml/imported-configurations-with-mapping.xml"/> + <include file="test/java/org/apache/ivy/plugins/parser/xml/imported-configurations-with-mapping.xml"/> <conf name="${myvar}" description="desc 1"/> <conf name="myconf2" description="desc 2" visibility="public"/> <conf name="myconf3" description="desc 3" visibility="private"/> Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportOutputterTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportOutputterTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportOutputterTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportOutputterTest.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.plugins.report; import java.io.ByteArrayOutputStream; import java.io.File; @@ -23,8 +23,8 @@ import junit.framework.TestCase; import org.apache.ivy.Ivy; -import org.apache.ivy.report.ResolveReport; -import org.apache.ivy.report.XmlReportOutputter; +import org.apache.ivy.core.report.ResolveReport; +import org.apache.ivy.plugins.report.XmlReportOutputter; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java Tue Jan 30 03:51:55 2007 @@ -15,13 +15,13 @@ * limitations under the License. * */ -package org.apache.ivy.repository.vfs; +package org.apache.ivy.plugins.repository.vfs; import java.io.File; import java.io.IOException; import java.util.Iterator; -import org.apache.ivy.repository.vfs.VfsRepository; +import org.apache.ivy.plugins.repository.vfs.VfsRepository; import org.apache.ivy.util.FileUtil; import junit.framework.TestCase; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java Tue Jan 30 03:51:55 2007 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.ivy.repository.vfs; +package org.apache.ivy.plugins.repository.vfs; import java.net.URI; import java.util.ArrayList; @@ -24,7 +24,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.ivy.repository.vfs.VfsResource; +import org.apache.ivy.plugins.repository.vfs.VfsResource; import junit.framework.TestCase; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java Tue Jan 30 03:51:55 2007 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.ivy.repository.vfs; +package org.apache.ivy.plugins.repository.vfs; import java.io.File; import java.util.ArrayList; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java Tue Jan 30 03:51:55 2007 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.ivy.repository.vfs; +package org.apache.ivy.plugins.repository.vfs; import org.apache.ivy.Ivy; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java Tue Jan 30 03:51:55 2007 @@ -15,25 +15,25 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; import java.io.File; import java.util.Arrays; import java.util.GregorianCalendar; import java.util.List; -import org.apache.ivy.DefaultDependencyDescriptor; -import org.apache.ivy.DependencyDescriptor; -import org.apache.ivy.DependencyResolver; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.ResolveData; -import org.apache.ivy.ResolvedModuleRevision; -import org.apache.ivy.latest.LatestRevisionStrategy; -import org.apache.ivy.latest.LatestTimeStrategy; -import org.apache.ivy.resolver.ChainResolver; -import org.apache.ivy.resolver.FileSystemResolver; -import org.apache.ivy.xml.XmlIvyConfigurationParser; +import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; +import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolvedModuleRevision; +import org.apache.ivy.core.settings.XmlSettingsParser; +import org.apache.ivy.plugins.latest.LatestRevisionStrategy; +import org.apache.ivy.plugins.latest.LatestTimeStrategy; +import org.apache.ivy.plugins.resolver.ChainResolver; +import org.apache.ivy.plugins.resolver.DependencyResolver; +import org.apache.ivy.plugins.resolver.FileSystemResolver; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; @@ -63,7 +63,7 @@ } public void testOrderFromConf() throws Exception { - new XmlIvyConfigurationParser(_data.getIvy()).parse(ChainResolverTest.class.getResource("chainresolverconf.xml")); + new XmlSettingsParser(_data.getIvy()).parse(ChainResolverTest.class.getResource("chainresolverconf.xml")); DependencyResolver resolver = _data.getIvy().getResolver("chain"); assertNotNull(resolver); assertTrue(resolver instanceof ChainResolver); Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java Tue Jan 30 03:51:55 2007 @@ -15,21 +15,21 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; import java.util.Arrays; import java.util.GregorianCalendar; -import org.apache.ivy.DefaultDependencyDescriptor; -import org.apache.ivy.DependencyDescriptor; -import org.apache.ivy.DependencyResolver; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.ResolveData; -import org.apache.ivy.ResolvedModuleRevision; -import org.apache.ivy.resolver.DualResolver; -import org.apache.ivy.resolver.IBiblioResolver; -import org.apache.ivy.xml.XmlIvyConfigurationParser; +import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; +import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolvedModuleRevision; +import org.apache.ivy.core.settings.XmlSettingsParser; +import org.apache.ivy.plugins.resolver.DependencyResolver; +import org.apache.ivy.plugins.resolver.DualResolver; +import org.apache.ivy.plugins.resolver.IBiblioResolver; import junit.framework.TestCase; @@ -41,7 +41,7 @@ public void testFromConf() throws Exception { Ivy ivy = new Ivy(); - new XmlIvyConfigurationParser(ivy).parse(DualResolverTest.class.getResource("dualresolverconf.xml")); + new XmlSettingsParser(ivy).parse(DualResolverTest.class.getResource("dualresolverconf.xml")); DependencyResolver resolver = ivy.getResolver("dualok"); assertNotNull(resolver); @@ -63,7 +63,7 @@ public void testFromBadConf() throws Exception { Ivy ivy = new Ivy(); try { - new XmlIvyConfigurationParser(ivy).parse(DualResolverTest.class.getResource("dualresolverconf-bad.xml")); + new XmlSettingsParser(ivy).parse(DualResolverTest.class.getResource("dualresolverconf-bad.xml")); fail("bad dual resolver configuration should raise exception"); } catch (Exception ex) { // ok -> bad conf has raised an exception Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java Tue Jan 30 03:51:55 2007 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; import java.io.BufferedReader; import java.io.File; @@ -25,22 +25,22 @@ import junit.framework.TestCase; -import org.apache.ivy.Artifact; -import org.apache.ivy.DefaultArtifact; -import org.apache.ivy.DefaultDependencyDescriptor; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.ResolveData; -import org.apache.ivy.ResolvedModuleRevision; -import org.apache.ivy.latest.LatestRevisionStrategy; -import org.apache.ivy.latest.LatestTimeStrategy; -import org.apache.ivy.report.ArtifactDownloadReport; -import org.apache.ivy.report.DownloadReport; -import org.apache.ivy.report.DownloadStatus; -import org.apache.ivy.resolver.FileSystemResolver; -import org.apache.ivy.resolver.ModuleEntry; -import org.apache.ivy.resolver.OrganisationEntry; -import org.apache.ivy.resolver.RevisionEntry; +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.DefaultArtifact; +import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.core.report.ArtifactDownloadReport; +import org.apache.ivy.core.report.DownloadReport; +import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolvedModuleRevision; +import org.apache.ivy.core.search.ModuleEntry; +import org.apache.ivy.core.search.OrganisationEntry; +import org.apache.ivy.core.search.RevisionEntry; +import org.apache.ivy.plugins.latest.LatestRevisionStrategy; +import org.apache.ivy.plugins.latest.LatestTimeStrategy; +import org.apache.ivy.plugins.resolver.FileSystemResolver; import org.apache.ivy.util.FileUtil; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java Tue Jan 30 03:51:55 2007 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; import java.net.URL; -import org.apache.ivy.url.URLHandler; -import org.apache.ivy.url.URLHandlerRegistry; +import org.apache.ivy.util.url.URLHandler; +import org.apache.ivy.util.url.URLHandlerRegistry; /** @@ -31,26 +31,20 @@ private static String _mirror = null; private static URLHandler handler = URLHandlerRegistry.getHttp(); public static String getIBiblioMirror() throws Exception { -// String[] mirrors = new String[] { -// "http://download.au.kde.org";, -// "http://ftp.up.ac.za";, -// "http://mirrors.sunsite.dk";, -// "http://planetmirror.com";, -// "http://www.ibiblio.org"; -// }; - String[] mirrors = new String[] { - "http://ftp.up.ac.za/pub/linux/maven";, - "http://mirrors.sunsite.dk/maven";, - "http://public.planetmirror.com/pub/maven";, - "http://www.ibiblio.org/maven"; - }; - String[] mirrorsRoot = new String[] { - "http://ftp.up.ac.za/pub/linux/maven";, - "http://mirrors.sunsite.dk/maven";, - "http://public.planetmirror.com/pub/maven";, - "http://www.ibiblio.org/maven"; - }; if (!_checked) { + String[] mirrors = new String[] { + "http://repo1.maven.org/maven/REPOSITORY-V1.txt";, + "http://mirrors.sunsite.dk/maven";, + "http://public.planetmirror.com/pub/maven";, + "http://www.ibiblio.org/maven"; + }; + String[] mirrorsRoot = new String[] { + "http://repo1.maven.org/maven/";, + "http://mirrors.sunsite.dk/maven";, + "http://public.planetmirror.com/pub/maven";, + "http://www.ibiblio.org/maven"; + }; + long best = -1; for (int i = 0; i < mirrors.length; i++) { long start = System.currentTimeMillis(); @@ -60,6 +54,10 @@ if (best == -1 || took < best) { best = took; _mirror = mirrorsRoot[i]; + if (took < 400) { + // this mirror is good enough + break; + } } } } Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java Tue Jan 30 03:51:55 2007 @@ -15,26 +15,26 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; import java.io.File; import java.util.List; import junit.framework.TestCase; -import org.apache.ivy.Artifact; -import org.apache.ivy.DefaultArtifact; -import org.apache.ivy.DefaultDependencyArtifactDescriptor; -import org.apache.ivy.DefaultDependencyDescriptor; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.ResolveData; -import org.apache.ivy.ResolvedModuleRevision; -import org.apache.ivy.matcher.ExactPatternMatcher; -import org.apache.ivy.report.ArtifactDownloadReport; -import org.apache.ivy.report.DownloadReport; -import org.apache.ivy.report.DownloadStatus; -import org.apache.ivy.resolver.IBiblioResolver; +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.DefaultArtifact; +import org.apache.ivy.core.module.descriptor.DefaultDependencyArtifactDescriptor; +import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.core.report.ArtifactDownloadReport; +import org.apache.ivy.core.report.DownloadReport; +import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolvedModuleRevision; +import org.apache.ivy.plugins.matcher.ExactPatternMatcher; +import org.apache.ivy.plugins.resolver.IBiblioResolver; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java Tue Jan 30 03:51:55 2007 @@ -15,27 +15,27 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; import java.io.File; import java.util.List; import junit.framework.TestCase; -import org.apache.ivy.Artifact; -import org.apache.ivy.DefaultArtifact; -import org.apache.ivy.DefaultDependencyDescriptor; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.ResolveData; -import org.apache.ivy.ResolvedModuleRevision; -import org.apache.ivy.report.ArtifactDownloadReport; -import org.apache.ivy.report.DownloadReport; -import org.apache.ivy.report.DownloadStatus; -import org.apache.ivy.resolver.IvyRepResolver; -import org.apache.ivy.resolver.ModuleEntry; -import org.apache.ivy.resolver.OrganisationEntry; -import org.apache.ivy.resolver.RevisionEntry; +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.DefaultArtifact; +import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.core.report.ArtifactDownloadReport; +import org.apache.ivy.core.report.DownloadReport; +import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolvedModuleRevision; +import org.apache.ivy.core.search.ModuleEntry; +import org.apache.ivy.core.search.OrganisationEntry; +import org.apache.ivy.core.search.RevisionEntry; +import org.apache.ivy.plugins.resolver.IvyRepResolver; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java Tue Jan 30 03:51:55 2007 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; import java.io.File; import java.io.IOException; @@ -25,17 +25,17 @@ import java.util.Date; import java.util.List; -import org.apache.ivy.Artifact; -import org.apache.ivy.DefaultModuleDescriptor; -import org.apache.ivy.DependencyDescriptor; -import org.apache.ivy.DependencyResolver; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleDescriptor; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.ResolveData; -import org.apache.ivy.ResolvedModuleRevision; -import org.apache.ivy.report.DownloadReport; -import org.apache.ivy.resolver.AbstractResolver; +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; +import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.descriptor.ModuleDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.core.report.DownloadReport; +import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolvedModuleRevision; +import org.apache.ivy.plugins.resolver.AbstractResolver; +import org.apache.ivy.plugins.resolver.DependencyResolver; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java Tue Jan 30 03:51:55 2007 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; -import org.apache.ivy.DependencyResolver; -import org.apache.ivy.resolver.ModuleEntry; -import org.apache.ivy.resolver.OrganisationEntry; -import org.apache.ivy.resolver.RevisionEntry; +import org.apache.ivy.core.search.ModuleEntry; +import org.apache.ivy.core.search.OrganisationEntry; +import org.apache.ivy.core.search.RevisionEntry; +import org.apache.ivy.plugins.resolver.DependencyResolver; import junit.framework.Assert; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java Tue Jan 30 03:51:55 2007 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; import java.io.File; import java.util.Date; @@ -23,19 +23,19 @@ import junit.framework.TestCase; -import org.apache.ivy.Artifact; -import org.apache.ivy.DefaultArtifact; -import org.apache.ivy.DefaultDependencyArtifactDescriptor; -import org.apache.ivy.DefaultDependencyDescriptor; import org.apache.ivy.Ivy; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.ResolveData; -import org.apache.ivy.ResolvedModuleRevision; -import org.apache.ivy.matcher.ExactPatternMatcher; -import org.apache.ivy.report.ArtifactDownloadReport; -import org.apache.ivy.report.DownloadReport; -import org.apache.ivy.report.DownloadStatus; -import org.apache.ivy.resolver.URLResolver; +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.DefaultArtifact; +import org.apache.ivy.core.module.descriptor.DefaultDependencyArtifactDescriptor; +import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.core.report.ArtifactDownloadReport; +import org.apache.ivy.core.report.DownloadReport; +import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolvedModuleRevision; +import org.apache.ivy.plugins.matcher.ExactPatternMatcher; +import org.apache.ivy.plugins.resolver.URLResolver; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Delete; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java Tue Jan 30 03:51:55 2007 @@ -15,9 +15,9 @@ * limitations under the License. * */ -package org.apache.ivy.resolver; +package org.apache.ivy.plugins.resolver; -import org.apache.ivy.resolver.VfsResolver; +import org.apache.ivy.plugins.resolver.VfsResolver; import junit.framework.TestCase; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java Tue Jan 30 03:51:55 2007 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.ivy.version; +package org.apache.ivy.plugins.version; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.version.AbstractVersionMatcher; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.plugins.version.AbstractVersionMatcher; public class MockVersionMatcher extends AbstractVersionMatcher { Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java Tue Jan 30 03:51:55 2007 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.ivy.version; +package org.apache.ivy.plugins.version; -import org.apache.ivy.ModuleRevisionId; -import org.apache.ivy.latest.LatestRevisionStrategy; -import org.apache.ivy.version.VersionMatcher; -import org.apache.ivy.version.VersionRangeMatcher; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.plugins.latest.LatestRevisionStrategy; +import org.apache.ivy.plugins.version.VersionMatcher; +import org.apache.ivy.plugins.version.VersionRangeMatcher; import junit.framework.TestCase; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java?view=diff&rev=501379&r1=501378&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java Tue Jan 30 03:51:55 2007 @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.ivy.util.IvyPatternHelper; +import org.apache.ivy.core.IvyPatternHelper; import junit.framework.TestCase; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java Tue Jan 30 03:51:55 2007 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.ivy.url; +package org.apache.ivy.util.url; import junit.framework.TestCase; @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.ivy.url.ApacheURLLister; +import org.apache.ivy.util.url.ApacheURLLister; /** Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java Tue Jan 30 03:51:55 2007 @@ -15,13 +15,13 @@ * limitations under the License. * */ -package org.apache.ivy.url; +package org.apache.ivy.util.url; import java.io.File; import java.net.URL; -import org.apache.ivy.url.BasicURLHandler; -import org.apache.ivy.url.URLHandler; +import org.apache.ivy.util.url.BasicURLHandler; +import org.apache.ivy.util.url.URLHandler; import junit.framework.TestCase; Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java?view=diff&rev=501379&r1=501336&r2=501379 ============================================================================== --- incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java (original) +++ incubator/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java Tue Jan 30 03:51:55 2007 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.ivy.url; +package org.apache.ivy.util.url; import java.net.URL; -import org.apache.ivy.url.HttpClientHandler; -import org.apache.ivy.url.URLHandler; +import org.apache.ivy.util.url.HttpClientHandler; +import org.apache.ivy.util.url.URLHandler; import junit.framework.TestCase;
