You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/01/07 10:41:36 UTC
svn commit: r493695 [7/7] - in /incubator/ivy/trunk: ./ doc/ doc/doc/
doc/doc/configuration/ doc/doc/ivyfile/ doc/doc/releasenotes/ doc/doc/use/
doc/samples/ doc/samples/multi-project/ doc/schemas/ doc/test/
src/example/build-a-ivy-repository/ src/exam...
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/parser/ModuleDescriptorParserRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/parser/ModuleDescriptorParserRegistryTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/parser/ModuleDescriptorParserRegistryTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/parser/ModuleDescriptorParserRegistryTest.java Sun Jan 7 02:41:19 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.parser;
+package org.apache.ivy.parser;
import java.io.File;
import java.io.IOException;
@@ -23,12 +23,15 @@
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 junit.framework.TestCase;
-import fr.jayasoft.ivy.DefaultModuleDescriptor;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleDescriptor;
-import fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.repository.Resource;
public class ModuleDescriptorParserRegistryTest extends TestCase {
public static class MyParser extends AbstractModuleDescriptorParser {
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/report/XmlReportOutputterTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/report/XmlReportOutputterTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/report/XmlReportOutputterTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/report/XmlReportOutputterTest.java Sun Jan 7 02:41:19 2007
@@ -15,17 +15,19 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.report;
+package org.apache.ivy.report;
import java.io.ByteArrayOutputStream;
import java.io.File;
import junit.framework.TestCase;
+import org.apache.ivy.Ivy;
+import org.apache.ivy.report.ResolveReport;
+import org.apache.ivy.report.XmlReportOutputter;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-import fr.jayasoft.ivy.Ivy;
public class XmlReportOutputterTest extends TestCase {
private final Ivy _ivy;
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsRepositoryTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsRepositoryTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsRepositoryTest.java Sun Jan 7 02:41:19 2007
@@ -15,14 +15,16 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.repository.vfs;
+package org.apache.ivy.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.util.FileUtil;
+
import junit.framework.TestCase;
-import fr.jayasoft.ivy.util.FileUtil;
/**
* Testing
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsResourceTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsResourceTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsResourceTest.java Sun Jan 7 02:41:19 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.repository.vfs;
+package org.apache.ivy.repository.vfs;
import java.net.URI;
import java.util.ArrayList;
@@ -23,6 +23,8 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+
+import org.apache.ivy.repository.vfs.VfsResource;
import junit.framework.TestCase;
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsTestHelper.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsTestHelper.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsTestHelper.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsTestHelper.java Sun Jan 7 02:41:19 2007
@@ -15,16 +15,16 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.repository.vfs;
+package org.apache.ivy.repository.vfs;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.vfs.impl.StandardFileSystemManager;
+import org.apache.ivy.Ivy;
+import org.apache.ivy.util.FileUtil;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.util.FileUtil;
public class VfsTestHelper {
private Ivy ivy = null;
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsURI.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsURI.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsURI.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/repository/vfs/VfsURI.java Sun Jan 7 02:41:19 2007
@@ -15,9 +15,9 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.repository.vfs;
+package org.apache.ivy.repository.vfs;
-import fr.jayasoft.ivy.Ivy;
+import org.apache.ivy.Ivy;
public class VfsURI {
private String host;
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/ChainResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/ChainResolverTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/ChainResolverTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/ChainResolverTest.java Sun Jan 7 02:41:19 2007
@@ -15,27 +15,29 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.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.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
import junit.framework.TestCase;
-import fr.jayasoft.ivy.DefaultDependencyDescriptor;
-import fr.jayasoft.ivy.DependencyDescriptor;
-import fr.jayasoft.ivy.DependencyResolver;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.ResolveData;
-import fr.jayasoft.ivy.ResolvedModuleRevision;
-import fr.jayasoft.ivy.latest.LatestRevisionStrategy;
-import fr.jayasoft.ivy.latest.LatestTimeStrategy;
-import fr.jayasoft.ivy.xml.XmlIvyConfigurationParser;
/**
* Tests ChainResolver
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/DualResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/DualResolverTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/DualResolverTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/DualResolverTest.java Sun Jan 7 02:41:19 2007
@@ -15,19 +15,22 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.resolver;
import java.util.Arrays;
import java.util.GregorianCalendar;
-import fr.jayasoft.ivy.DefaultDependencyDescriptor;
-import fr.jayasoft.ivy.DependencyDescriptor;
-import fr.jayasoft.ivy.DependencyResolver;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.ResolveData;
-import fr.jayasoft.ivy.ResolvedModuleRevision;
-import fr.jayasoft.ivy.xml.XmlIvyConfigurationParser;
+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 junit.framework.TestCase;
/**
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/FileSystemResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/FileSystemResolverTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/FileSystemResolverTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/FileSystemResolverTest.java Sun Jan 7 02:41:19 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.resolver;
import java.io.BufferedReader;
import java.io.File;
@@ -25,22 +25,26 @@
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.util.FileUtil;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-import fr.jayasoft.ivy.Artifact;
-import fr.jayasoft.ivy.DefaultArtifact;
-import fr.jayasoft.ivy.DefaultDependencyDescriptor;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.ResolveData;
-import fr.jayasoft.ivy.ResolvedModuleRevision;
-import fr.jayasoft.ivy.latest.LatestRevisionStrategy;
-import fr.jayasoft.ivy.latest.LatestTimeStrategy;
-import fr.jayasoft.ivy.report.ArtifactDownloadReport;
-import fr.jayasoft.ivy.report.DownloadReport;
-import fr.jayasoft.ivy.report.DownloadStatus;
-import fr.jayasoft.ivy.util.FileUtil;
/**
*
@@ -137,11 +141,11 @@
resolver.addIvyPattern("test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
resolver.addArtifactPattern("test/repositories/m2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]");
- ModuleRevisionId mrid = ModuleRevisionId.newInstance("fr.jayasoft", "test", "1.0");
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance("org.apache", "test", "1.0");
ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
assertNotNull(rmr);
- mrid = ModuleRevisionId.newInstance("fr.jayasoft.unknown", "test", "1.0");
+ mrid = ModuleRevisionId.newInstance("org.apache.unknown", "test", "1.0");
rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), _data);
assertNull(rmr);
resolver.reportFailure();
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IBiblioHelper.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IBiblioHelper.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IBiblioHelper.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IBiblioHelper.java Sun Jan 7 02:41:19 2007
@@ -15,12 +15,13 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.resolver;
import java.net.URL;
-import fr.jayasoft.ivy.url.URLHandler;
-import fr.jayasoft.ivy.url.URLHandlerRegistry;
+import org.apache.ivy.url.URLHandler;
+import org.apache.ivy.url.URLHandlerRegistry;
+
/**
* TODO write javadoc
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IBiblioResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IBiblioResolverTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IBiblioResolverTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IBiblioResolverTest.java Sun Jan 7 02:41:19 2007
@@ -15,28 +15,29 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.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.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-import fr.jayasoft.ivy.Artifact;
-import fr.jayasoft.ivy.DefaultArtifact;
-import fr.jayasoft.ivy.DefaultDependencyArtifactDescriptor;
-import fr.jayasoft.ivy.DefaultDependencyDescriptor;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.ResolveData;
-import fr.jayasoft.ivy.ResolvedModuleRevision;
-import fr.jayasoft.ivy.matcher.ExactPatternMatcher;
-import fr.jayasoft.ivy.report.ArtifactDownloadReport;
-import fr.jayasoft.ivy.report.DownloadReport;
-import fr.jayasoft.ivy.report.DownloadStatus;
/**
*
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IvyRepResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IvyRepResolverTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IvyRepResolverTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/IvyRepResolverTest.java Sun Jan 7 02:41:19 2007
@@ -15,26 +15,30 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.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.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-import fr.jayasoft.ivy.Artifact;
-import fr.jayasoft.ivy.DefaultArtifact;
-import fr.jayasoft.ivy.DefaultDependencyDescriptor;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.ResolveData;
-import fr.jayasoft.ivy.ResolvedModuleRevision;
-import fr.jayasoft.ivy.report.ArtifactDownloadReport;
-import fr.jayasoft.ivy.report.DownloadReport;
-import fr.jayasoft.ivy.report.DownloadStatus;
/**
*
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/MockResolver.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/MockResolver.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/MockResolver.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/MockResolver.java Sun Jan 7 02:41:19 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.resolver;
import java.io.File;
import java.io.IOException;
@@ -25,16 +25,18 @@
import java.util.Date;
import java.util.List;
-import fr.jayasoft.ivy.Artifact;
-import fr.jayasoft.ivy.DefaultModuleDescriptor;
-import fr.jayasoft.ivy.DependencyDescriptor;
-import fr.jayasoft.ivy.DependencyResolver;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleDescriptor;
-import fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.ResolveData;
-import fr.jayasoft.ivy.ResolvedModuleRevision;
-import fr.jayasoft.ivy.report.DownloadReport;
+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;
+
public class MockResolver extends AbstractResolver {
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/ResolverTestHelper.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/ResolverTestHelper.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/ResolverTestHelper.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/ResolverTestHelper.java Sun Jan 7 02:41:19 2007
@@ -15,10 +15,14 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.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 junit.framework.Assert;
-import fr.jayasoft.ivy.DependencyResolver;
/**
*
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/URLResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/URLResolverTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/URLResolverTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/URLResolverTest.java Sun Jan 7 02:41:19 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.resolver;
import java.io.File;
import java.util.Date;
@@ -23,21 +23,22 @@
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.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Delete;
-import fr.jayasoft.ivy.Artifact;
-import fr.jayasoft.ivy.DefaultArtifact;
-import fr.jayasoft.ivy.DefaultDependencyArtifactDescriptor;
-import fr.jayasoft.ivy.DefaultDependencyDescriptor;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.ResolveData;
-import fr.jayasoft.ivy.ResolvedModuleRevision;
-import fr.jayasoft.ivy.matcher.ExactPatternMatcher;
-import fr.jayasoft.ivy.report.ArtifactDownloadReport;
-import fr.jayasoft.ivy.report.DownloadReport;
-import fr.jayasoft.ivy.report.DownloadStatus;
/**
* Tests URLResolver. Http tests are based upon ibiblio site.
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/resolver/VfsResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/resolver/VfsResolverTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/resolver/VfsResolverTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/resolver/VfsResolverTest.java Sun Jan 7 02:41:19 2007
@@ -15,7 +15,9 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.resolver;
+package org.apache.ivy.resolver;
+
+import org.apache.ivy.resolver.VfsResolver;
import junit.framework.TestCase;
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/url/ApacheURLListerTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/url/ApacheURLListerTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/url/ApacheURLListerTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/url/ApacheURLListerTest.java Sun Jan 7 02:41:19 2007
@@ -15,13 +15,15 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.url;
+package org.apache.ivy.url;
import junit.framework.TestCase;
import java.net.URL;
import java.util.Iterator;
import java.util.List;
+
+import org.apache.ivy.url.ApacheURLLister;
/**
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/url/BasicURLHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/url/BasicURLHandlerTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/url/BasicURLHandlerTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/url/BasicURLHandlerTest.java Sun Jan 7 02:41:19 2007
@@ -15,10 +15,13 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.url;
+package org.apache.ivy.url;
import java.io.File;
import java.net.URL;
+
+import org.apache.ivy.url.BasicURLHandler;
+import org.apache.ivy.url.URLHandler;
import junit.framework.TestCase;
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/url/HttpclientURLHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/url/HttpclientURLHandlerTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/url/HttpclientURLHandlerTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/url/HttpclientURLHandlerTest.java Sun Jan 7 02:41:19 2007
@@ -15,9 +15,12 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.url;
+package org.apache.ivy.url;
import java.net.URL;
+
+import org.apache.ivy.url.HttpClientHandler;
+import org.apache.ivy.url.URLHandler;
import junit.framework.TestCase;
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java Sun Jan 7 02:41:19 2007
@@ -15,12 +15,13 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.util;
+package org.apache.ivy.util;
import java.util.ArrayList;
import java.util.List;
-import fr.jayasoft.ivy.util.Configurator;
+import org.apache.ivy.util.Configurator;
+
import junit.framework.TestCase;
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java Sun Jan 7 02:41:19 2007
@@ -15,19 +15,21 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.util;
+package org.apache.ivy.util;
import java.util.HashMap;
import java.util.Map;
+import org.apache.ivy.util.IvyPatternHelper;
+
import junit.framework.TestCase;
public class IvyPatternHelperTest extends TestCase {
public void testSubstitute() {
String pattern = "[organisation]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]";
assertEquals(
- "jayasoft/Test/build/archives/jars/test-1.0.jar",
- IvyPatternHelper.substitute(pattern, "jayasoft", "Test", "1.0", "test", "jar", "jar"));
+ "apache/Test/build/archives/jars/test-1.0.jar",
+ IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar"));
}
public void testCyclicSubstitute() {
@@ -57,8 +59,8 @@
public void testOrganization() {
String pattern = "[organization]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]";
assertEquals(
- "jayasoft/Test/build/archives/jars/test-1.0.jar",
- IvyPatternHelper.substitute(pattern, "jayasoft", "Test", "1.0", "test", "jar", "jar"));
+ "apache/Test/build/archives/jars/test-1.0.jar",
+ IvyPatternHelper.substitute(pattern, "apache", "Test", "1.0", "test", "jar", "jar"));
}
}
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java Sun Jan 7 02:41:19 2007
@@ -15,15 +15,17 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.util;
+package org.apache.ivy.util;
+
+import org.apache.ivy.util.StringUtils;
import junit.framework.TestCase;
public class StringUtilsTest extends TestCase {
public void testEncryption() {
- assertEquals("jayasoft", StringUtils.decrypt(StringUtils.encrypt("jayasoft")));
+ assertEquals("apache", StringUtils.decrypt(StringUtils.encrypt("apache")));
assertEquals("yet another string with 126 digits and others :;%_-$& characters", StringUtils.decrypt(StringUtils.encrypt("yet another string with 126 digits and others :;%_-$& characters")));
- assertFalse("jayasoft".equals(StringUtils.encrypt("jayasoft")));
+ assertFalse("apache".equals(StringUtils.encrypt("apache")));
}
}
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/version/MockVersionMatcher.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/version/MockVersionMatcher.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/version/MockVersionMatcher.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/version/MockVersionMatcher.java Sun Jan 7 02:41:19 2007
@@ -15,9 +15,10 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.version;
+package org.apache.ivy.version;
-import fr.jayasoft.ivy.ModuleRevisionId;
+import org.apache.ivy.ModuleRevisionId;
+import org.apache.ivy.version.AbstractVersionMatcher;
public class MockVersionMatcher extends AbstractVersionMatcher {
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/version/VersionRangeMatcherTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/version/VersionRangeMatcherTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/version/VersionRangeMatcherTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/version/VersionRangeMatcherTest.java Sun Jan 7 02:41:19 2007
@@ -15,10 +15,13 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.version;
+package org.apache.ivy.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 fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.latest.LatestRevisionStrategy;
import junit.framework.TestCase;
public class VersionRangeMatcherTest extends TestCase {
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/OnlineXmlIvyConfigurationParserTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/OnlineXmlIvyConfigurationParserTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/OnlineXmlIvyConfigurationParserTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/OnlineXmlIvyConfigurationParserTest.java Sun Jan 7 02:41:19 2007
@@ -15,17 +15,19 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.xml;
+package org.apache.ivy.xml;
import java.net.URL;
+import org.apache.ivy.DependencyResolver;
+import org.apache.ivy.Ivy;
+import org.apache.ivy.resolver.IvyRepResolver;
+import org.apache.ivy.url.URLHandler;
+import org.apache.ivy.url.URLHandlerDispatcher;
+import org.apache.ivy.url.URLHandlerRegistry;
+import org.apache.ivy.xml.XmlIvyConfigurationParser;
+
import junit.framework.TestCase;
-import fr.jayasoft.ivy.DependencyResolver;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.resolver.IvyRepResolver;
-import fr.jayasoft.ivy.url.URLHandler;
-import fr.jayasoft.ivy.url.URLHandlerDispatcher;
-import fr.jayasoft.ivy.url.URLHandlerRegistry;
/**
* split from XmlIvyConfigurationParserTest due to dependency on network resource
@@ -37,7 +39,7 @@
configureURLHandler();
Ivy ivy = new Ivy();
XmlIvyConfigurationParser parser = new XmlIvyConfigurationParser(ivy);
- parser.parse(new URL("http://www.jayasoft.org/misc/ivy/test/ivyconf-include-http-url.xml"));
+ parser.parse(new URL("http://incubator.apache.org/ivy/test/ivyconf-include-http-url.xml"));
DependencyResolver resolver = ivy.getResolver("ivyrep");
assertNotNull(resolver);
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlIvyConfigurationParserTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlIvyConfigurationParserTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlIvyConfigurationParserTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlIvyConfigurationParserTest.java Sun Jan 7 02:41:19 2007
@@ -15,27 +15,29 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.xml;
+package org.apache.ivy.xml;
import java.io.File;
import java.util.List;
+import org.apache.ivy.DependencyResolver;
+import org.apache.ivy.Ivy;
+import org.apache.ivy.LatestStrategy;
+import org.apache.ivy.ModuleId;
+import org.apache.ivy.latest.LatestRevisionStrategy;
+import org.apache.ivy.latest.LatestTimeStrategy;
+import org.apache.ivy.parser.ModuleDescriptorParserRegistry;
+import org.apache.ivy.report.ReportOutputter;
+import org.apache.ivy.report.ResolveReport;
+import org.apache.ivy.resolver.ChainResolver;
+import org.apache.ivy.resolver.FileSystemResolver;
+import org.apache.ivy.resolver.MockResolver;
+import org.apache.ivy.version.ChainVersionMatcher;
+import org.apache.ivy.version.MockVersionMatcher;
+import org.apache.ivy.version.VersionMatcher;
+import org.apache.ivy.xml.XmlIvyConfigurationParser;
+
import junit.framework.TestCase;
-import fr.jayasoft.ivy.DependencyResolver;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.LatestStrategy;
-import fr.jayasoft.ivy.ModuleId;
-import fr.jayasoft.ivy.latest.LatestRevisionStrategy;
-import fr.jayasoft.ivy.latest.LatestTimeStrategy;
-import fr.jayasoft.ivy.parser.ModuleDescriptorParserRegistry;
-import fr.jayasoft.ivy.report.ReportOutputter;
-import fr.jayasoft.ivy.report.ResolveReport;
-import fr.jayasoft.ivy.resolver.ChainResolver;
-import fr.jayasoft.ivy.resolver.FileSystemResolver;
-import fr.jayasoft.ivy.resolver.MockResolver;
-import fr.jayasoft.ivy.version.ChainVersionMatcher;
-import fr.jayasoft.ivy.version.MockVersionMatcher;
-import fr.jayasoft.ivy.version.VersionMatcher;
/**
* TODO write javadoc
@@ -95,9 +97,9 @@
assertTrue(strategy instanceof LatestTimeStrategy);
assertEquals("libraries", ivy.getResolver(new ModuleId("unknown", "lib")).getName());
- assertEquals("internal", ivy.getResolver(new ModuleId("jayasoft", "swtbinding")).getName());
- assertEquals("int1", ivy.getResolver(new ModuleId("jayasoft", "ivy")).getName());
- assertEquals("int1", ivy.getResolver(new ModuleId("jayasoft", "ivycruise")).getName());
+ assertEquals("internal", ivy.getResolver(new ModuleId("apache", "ant")).getName());
+ assertEquals("int1", ivy.getResolver(new ModuleId("apache", "ivy")).getName());
+ assertEquals("int1", ivy.getResolver(new ModuleId("apache", "ivyde")).getName());
}
public void testTypedef() throws Exception {
@@ -142,8 +144,8 @@
XmlIvyConfigurationParser parser = new XmlIvyConfigurationParser(ivy);
parser.parse(XmlIvyConfigurationParserTest.class.getResource("ivyconf-conflict-manager.xml"));
- assertEquals("latest-time", ivy.getConflictManager(new ModuleId("jayasoft", "ivyde")).getName());
- assertEquals("all", ivy.getConflictManager(new ModuleId("jayasoft", "uistate")).getName());
+ assertEquals("latest-time", ivy.getConflictManager(new ModuleId("apache", "ivyde")).getName());
+ assertEquals("all", ivy.getConflictManager(new ModuleId("apache", "ant")).getName());
}
public void testVersionMatchers1() throws Exception {
@@ -324,7 +326,7 @@
Ivy ivy = new Ivy();
XmlIvyConfigurationParser parser = new XmlIvyConfigurationParser(ivy);
parser.parse(XmlIvyConfigurationParserTest.class.getResource("ivyconf-parser.xml"));
- assertEquals("fr.jayasoft.ivy.parser.ModuleDescriptorParserRegistryTest$MyParser", ModuleDescriptorParserRegistry.getInstance().getParsers()[0].getClass().getName());
+ assertEquals("org.apache.ivy.parser.ModuleDescriptorParserRegistryTest$MyParser", ModuleDescriptorParserRegistry.getInstance().getParsers()[0].getClass().getName());
}
public void testOutputter() throws Exception {
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleDescriptorParserTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleDescriptorParserTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleDescriptorParserTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleDescriptorParserTest.java Sun Jan 7 02:41:19 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.xml;
+package org.apache.ivy.xml;
import java.io.IOException;
import java.text.ParseException;
@@ -24,20 +24,22 @@
import java.util.GregorianCalendar;
import java.util.HashSet;
-import fr.jayasoft.ivy.Artifact;
-import fr.jayasoft.ivy.Configuration;
-import fr.jayasoft.ivy.ConflictManager;
-import fr.jayasoft.ivy.DependencyDescriptor;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.License;
-import fr.jayasoft.ivy.ModuleDescriptor;
-import fr.jayasoft.ivy.ModuleId;
-import fr.jayasoft.ivy.Configuration.Visibility;
-import fr.jayasoft.ivy.conflict.FixedConflictManager;
-import fr.jayasoft.ivy.conflict.NoConflictManager;
-import fr.jayasoft.ivy.matcher.PatternMatcher;
-import fr.jayasoft.ivy.parser.AbstractModuleDescriptorParserTester;
-import fr.jayasoft.ivy.util.XMLHelper;
+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.util.XMLHelper;
+import org.apache.ivy.xml.XmlModuleDescriptorParser;
+
/**
*
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleDescriptorWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleDescriptorWriterTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleDescriptorWriterTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleDescriptorWriterTest.java Sun Jan 7 02:41:19 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.xml;
+package org.apache.ivy.xml;
import java.io.BufferedReader;
import java.io.File;
@@ -24,11 +24,14 @@
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.util.FileUtil;
+import org.apache.ivy.xml.XmlModuleDescriptorParser;
+import org.apache.ivy.xml.XmlModuleDescriptorWriter;
+
import junit.framework.TestCase;
-import fr.jayasoft.ivy.DefaultModuleDescriptor;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleDescriptor;
-import fr.jayasoft.ivy.util.FileUtil;
public class XmlModuleDescriptorWriterTest extends TestCase {
private File _dest = new File("build/test/test-write.xml");
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleUpdaterTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleUpdaterTest.java?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleUpdaterTest.java (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/XmlModuleUpdaterTest.java Sun Jan 7 02:41:19 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package fr.jayasoft.ivy.xml;
+package org.apache.ivy.xml;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
@@ -27,10 +27,12 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.ivy.Ivy;
+import org.apache.ivy.ModuleRevisionId;
+import org.apache.ivy.util.FileUtil;
+import org.apache.ivy.xml.XmlModuleDescriptorUpdater;
+
import junit.framework.TestCase;
-import fr.jayasoft.ivy.Ivy;
-import fr.jayasoft.ivy.ModuleRevisionId;
-import fr.jayasoft.ivy.util.FileUtil;
public class XmlModuleUpdaterTest extends TestCase {
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-conflict-manager.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-conflict-manager.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-conflict-manager.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-conflict-manager.xml Sun Jan 7 02:41:19 2007
@@ -1,6 +1,6 @@
<ivyconf>
<modules>
- <module organisation="jayasoft" name="ivy*" matcher="glob" conflict-manager="latest-time"/>
- <module organisation="jayasoft" name=".*" conflict-manager="all"/>
+ <module organisation="apache" name="ivy*" matcher="glob" conflict-manager="latest-time"/>
+ <module organisation="apache" name=".*" conflict-manager="all"/>
</modules>
</ivyconf>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-include.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-include.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-include.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-include.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivyconf>
- <include file="test/java/fr/jayasoft/ivy/xml/ivyconf-macro.xml"/>
+ <include file="test/java/org/apache/ivy/xml/ivyconf-macro.xml"/>
<resolvers>
<mymacro name="includeworks" mymainrep="included/myrep" mysecondrep="included/secondrep"/>
</resolvers>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-outputter.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-outputter.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-outputter.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-outputter.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivyconf>
- <typedef name="myoutputter" classname="fr.jayasoft.ivy.xml.XmlIvyConfigurationParserTest$MyOutputter"/>
+ <typedef name="myoutputter" classname="org.apache.ivy.xml.XmlIvyConfigurationParserTest$MyOutputter"/>
<outputters>
<myoutputter />
</outputters>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-parser.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-parser.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-parser.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-parser.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivyconf>
- <typedef name="myparser" classname="fr.jayasoft.ivy.parser.ModuleDescriptorParserRegistryTest$MyParser"/>
+ <typedef name="myparser" classname="org.apache.ivy.parser.ModuleDescriptorParserRegistryTest$MyParser"/>
<parsers>
<myparser />
</parsers>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-ref.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-ref.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-ref.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-ref.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivyconf>
- <properties file="test/java/fr/jayasoft/ivy/xml/ivyconf.properties"/>
+ <properties file="test/java/org/apache/ivy/xml/ivyconf.properties"/>
<conf defaultCache="mycache"/>
<resolvers>
<filesystem name="fs" latest="latest-time">
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-test.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-test.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-test.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-test.xml Sun Jan 7 02:41:19 2007
@@ -1,6 +1,6 @@
<ivyconf>
<property name="shared" value="sharedrep"/>
- <properties file="test/java/fr/jayasoft/ivy/xml/ivyconf.properties"/>
+ <properties file="test/java/org/apache/ivy/xml/ivyconf.properties"/>
<conf defaultCache="mycache"
defaultResolver="libraries"
validate="false"
@@ -27,7 +27,7 @@
</filesystem>
</resolvers>
<modules>
- <module organisation="jayasoft" name="ivy*" matcher="glob" resolver="int1"/>
- <module organisation="jayasoft" name=".*" resolver="internal"/>
+ <module organisation="apache" name="ivy*" matcher="glob" resolver="int1"/>
+ <module organisation="apache" name=".*" resolver="internal"/>
</modules>
</ivyconf>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-typedef.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-typedef.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-typedef.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-typedef.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivyconf>
- <typedef name="mock" classname="fr.jayasoft.ivy.resolver.MockResolver"/>
+ <typedef name="mock" classname="org.apache.ivy.resolver.MockResolver"/>
<resolvers>
<chain name="internal">
<mock name="mock1"/>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-vmatcher1.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-vmatcher1.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-vmatcher1.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-vmatcher1.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivyconf>
- <typedef name="mock" classname="fr.jayasoft.ivy.version.MockVersionMatcher"/>
+ <typedef name="mock" classname="org.apache.ivy.version.MockVersionMatcher"/>
<version-matchers>
<latest-vm name="latest"/>
<mock name="vmock"/>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-vmatcher2.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-vmatcher2.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-vmatcher2.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/ivyconf-vmatcher2.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivyconf>
- <typedef name="mock" classname="fr.jayasoft.ivy.version.MockVersionMatcher"/>
+ <typedef name="mock" classname="org.apache.ivy.version.MockVersionMatcher"/>
<version-matchers usedefaults="true">
<mock name="vmock"/>
</version-matchers>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configextendsothers2.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configextendsothers2.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configextendsothers2.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configextendsothers2.xml Sun Jan 7 02:41:19 2007
@@ -7,7 +7,7 @@
status="integration"
publication="20041101110000"/>
<configurations>
- <include file="test/java/fr/jayasoft/ivy/xml/imported-configurations-with-wildcard.xml"/>
+ <include file="test/java/org/apache/ivy/xml/imported-configurations-with-wildcard.xml"/>
<conf name="priv" visibility="private" />
<conf name="extra" />
</configurations>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configextendsothers3.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configextendsothers3.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configextendsothers3.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configextendsothers3.xml Sun Jan 7 02:41:19 2007
@@ -7,7 +7,7 @@
status="integration"
publication="20041101110000"/>
<configurations>
- <include file="test/java/fr/jayasoft/ivy/xml/imported-configurations-with-wildcard.xml"/>
+ <include file="test/java/org/apache/ivy/xml/imported-configurations-with-wildcard.xml"/>
<conf name="priv" visibility="private" />
<conf name="extra" />
</configurations>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import1.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import1.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import1.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import1.xml Sun Jan 7 02:41:19 2007
@@ -6,7 +6,7 @@
publication="20041101110000"
/>
<configurations>
- <include file="test/java/fr/jayasoft/ivy/xml/imported-configurations.xml"/>
+ <include file="test/java/org/apache/ivy/xml/imported-configurations.xml"/>
</configurations>
<dependencies>
<dependency name="mymodule1" rev="1.0"/>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import2.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import2.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import2.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import2.xml Sun Jan 7 02:41:19 2007
@@ -6,7 +6,7 @@
publication="20041101110000"
/>
<configurations>
- <include file="test/java/fr/jayasoft/ivy/xml/imported-configurations.xml"/>
+ <include file="test/java/org/apache/ivy/xml/imported-configurations.xml"/>
<conf name="conf3"/>
</configurations>
<dependencies>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import3.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import3.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import3.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import3.xml Sun Jan 7 02:41:19 2007
@@ -6,7 +6,7 @@
publication="20041101110000"
/>
<configurations>
- <include file="test/java/fr/jayasoft/ivy/xml/imported-configurations-with-mapping.xml"/>
+ <include file="test/java/org/apache/ivy/xml/imported-configurations-with-mapping.xml"/>
</configurations>
<dependencies>
<dependency name="mymodule1" rev="1.0"/>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import4.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import4.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import4.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-configurations-import4.xml Sun Jan 7 02:41:19 2007
@@ -6,7 +6,7 @@
publication="20041101110000"
/>
<configurations>
- <include file="test/java/fr/jayasoft/ivy/xml/imported-configurations-with-mappingoverride.xml"/>
+ <include file="test/java/org/apache/ivy/xml/imported-configurations-with-mappingoverride.xml"/>
</configurations>
<dependencies>
<dependency name="mymodule1" rev="1.0" conf="conf1"/>
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-update.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-update.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-update.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/test-update.xml Sun Jan 7 02:41:19 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://www.jayasoft.fr/org/ivyrep/ivy-doc.xsl"?>
<!-- A comment before the first tag -->
-<ivy-module version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://jayasoft.org/ivy/ivy.xsd">
+<ivy-module version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
<!-- A comment with accent é & special characters -->
<info organisation="myorg"
module="mymodule"
@@ -22,7 +22,7 @@
</description>
</info>
<configurations>
- <include file="test/java/fr/jayasoft/ivy/xml/imported-configurations-with-mapping.xml"/>
+ <include file="test/java/org/apache/ivy/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/trunk/test/java/org/apache/ivy/xml/test.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/test.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/test.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/test.xml Sun Jan 7 02:41:19 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="http://www.jayasoft.fr/org/ivyrep/ivy-doc.xsl"?>
-<ivy-module version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://jayasoft.org/ivy/ivy.xsd">
+<ivy-module version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
<info organisation="myorg"
module="mymodule"
revision="myrev"
Modified: incubator/ivy/trunk/test/java/org/apache/ivy/xml/updated.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/java/org/apache/ivy/xml/updated.xml?view=diff&rev=493695&r1=493681&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/java/org/apache/ivy/xml/updated.xml (original)
+++ incubator/ivy/trunk/test/java/org/apache/ivy/xml/updated.xml Sun Jan 7 02:41:19 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="http://www.jayasoft.fr/org/ivyrep/ivy-doc.xsl"?>
<!-- A comment before the first tag -->
-<ivy-module version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://jayasoft.org/ivy/ivy.xsd">
+<ivy-module version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
<!-- A comment with accent é & special characters -->
<info organisation="myorg" module="mymodule" revision="mynewrev" status="release" publication="20050322143254">
Modified: incubator/ivy/trunk/test/repositories/badfile/ivys/ ivy-badmodule.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/badfile/ivys/%20ivy-badmodule.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/badfile/ivys/ ivy-badmodule.xml (original)
+++ incubator/ivy/trunk/test/repositories/badfile/ivys/ ivy-badmodule.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivy-module version="1.0">
- <info organisation="jayasoft" name="test-badorg"/>
+ <info organisation="apache" name="test-badorg"/>
<dependencies>
<dependency org="myorg" name="mymodule" rev="badorg"/>
</dependencies>
Modified: incubator/ivy/trunk/test/repositories/badfile/ivys/ivy-badorg.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/badfile/ivys/ivy-badorg.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/badfile/ivys/ivy-badorg.xml (original)
+++ incubator/ivy/trunk/test/repositories/badfile/ivys/ivy-badorg.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivy-module version="1.0">
- <info organisation="jayasoft" name="test-badorg"/>
+ <info organisation="apache" name="test-badorg"/>
<dependencies>
<dependency org="myorg" name="mymodule" rev="badorg"/>
</dependencies>
Modified: incubator/ivy/trunk/test/repositories/badfile/ivys/ivy-badrevision.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/badfile/ivys/ivy-badrevision.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/badfile/ivys/ivy-badrevision.xml (original)
+++ incubator/ivy/trunk/test/repositories/badfile/ivys/ivy-badrevision.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivy-module version="1.0">
- <info organisation="jayasoft" name="test-badorg"/>
+ <info organisation="apache" name="test-badorg"/>
<dependencies>
<dependency org="myorg" name="mymodule" rev="badorg"/>
</dependencies>
Modified: incubator/ivy/trunk/test/repositories/external-artifacts/A/ivy-1.0.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/external-artifacts/A/ivy-1.0.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/external-artifacts/A/ivy-1.0.xml (original)
+++ incubator/ivy/trunk/test/repositories/external-artifacts/A/ivy-1.0.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivy-module version="1.4">
- <info organisation="jayasoft" module="A" revision="1.0" />
+ <info organisation="apache" module="A" revision="1.0" />
<publications>
<artifact name="a" url="${test.base.url}/elsewhere/mya-1.1-windows.zip" />
</publications>
Modified: incubator/ivy/trunk/test/repositories/external-artifacts/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/external-artifacts/ivy.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/external-artifacts/ivy.xml (original)
+++ incubator/ivy/trunk/test/repositories/external-artifacts/ivy.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivy-module version="1.4">
- <info organisation="jayasoft" module="test" />
+ <info organisation="apache" module="test" />
<dependencies>
<dependency name="A" rev="latest.integration" />
<dependency name="B" rev="2.0">
Modified: incubator/ivy/trunk/test/repositories/extra-attributes/mymodule/task1/1854/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/extra-attributes/mymodule/task1/1854/ivy.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/extra-attributes/mymodule/task1/1854/ivy.xml (original)
+++ incubator/ivy/trunk/test/repositories/extra-attributes/mymodule/task1/1854/ivy.xml Sun Jan 7 02:41:19 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<ivy-module version="1.0">
<info
- organisation="jayasoft"
+ organisation="apache"
module="mymodule"
eatt="task1"
revision="1854"
Added: incubator/ivy/trunk/test/repositories/m2/org/apache/test/1.0/test-1.0.jar
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/m2/org/apache/test/1.0/test-1.0.jar?view=auto&rev=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/m2/org/apache/test/1.0/test-1.0.jar (added)
+++ incubator/ivy/trunk/test/repositories/m2/org/apache/test/1.0/test-1.0.jar Sun Jan 7 02:41:19 2007
@@ -0,0 +1 @@
+
Added: incubator/ivy/trunk/test/repositories/m2/org/apache/test/1.0/test-1.0.pom
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/m2/org/apache/test/1.0/test-1.0.pom?view=auto&rev=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/m2/org/apache/test/1.0/test-1.0.pom (added)
+++ incubator/ivy/trunk/test/repositories/m2/org/apache/test/1.0/test-1.0.pom Sun Jan 7 02:41:19 2007
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache</groupId>
+ <artifactId>test</artifactId>
+ <name>Test Module for Ivy M2 parsing</name>
+ <version>1.0</version>
+ <url>http://ivy.jayasoft.org/</url>
+ <organization>
+ <name>Jayasoft</name>
+ <url>http://www.jayasoft.org/</url>
+ </organization>
+</project>
\ No newline at end of file
Added: incubator/ivy/trunk/test/repositories/m2/org/apache/test2/1.0/test2-1.0.jar
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/m2/org/apache/test2/1.0/test2-1.0.jar?view=auto&rev=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/m2/org/apache/test2/1.0/test2-1.0.jar (added)
+++ incubator/ivy/trunk/test/repositories/m2/org/apache/test2/1.0/test2-1.0.jar Sun Jan 7 02:41:19 2007
@@ -0,0 +1 @@
+
Added: incubator/ivy/trunk/test/repositories/m2/org/apache/test2/1.0/test2-1.0.pom
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/m2/org/apache/test2/1.0/test2-1.0.pom?view=auto&rev=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/m2/org/apache/test2/1.0/test2-1.0.pom (added)
+++ incubator/ivy/trunk/test/repositories/m2/org/apache/test2/1.0/test2-1.0.pom Sun Jan 7 02:41:19 2007
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache</groupId>
+ <artifactId>test2</artifactId>
+ <name>Test Module for Ivy M2 parsing</name>
+ <version>1.0</version>
+ <url>http://ivy.jayasoft.org/</url>
+ <organization>
+ <name>Jayasoft</name>
+ <url>http://www.jayasoft.org/</url>
+ </organization>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: incubator/ivy/trunk/test/repositories/m2/org/apache/test3/1.0/test3-1.0.jar
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/m2/org/apache/test3/1.0/test3-1.0.jar?view=auto&rev=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/m2/org/apache/test3/1.0/test3-1.0.jar (added)
+++ incubator/ivy/trunk/test/repositories/m2/org/apache/test3/1.0/test3-1.0.jar Sun Jan 7 02:41:19 2007
@@ -0,0 +1 @@
+
Added: incubator/ivy/trunk/test/repositories/m2/org/apache/test3/1.0/test3-1.0.pom
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/repositories/m2/org/apache/test3/1.0/test3-1.0.pom?view=auto&rev=493695
==============================================================================
--- incubator/ivy/trunk/test/repositories/m2/org/apache/test3/1.0/test3-1.0.pom (added)
+++ incubator/ivy/trunk/test/repositories/m2/org/apache/test3/1.0/test3-1.0.pom Sun Jan 7 02:41:19 2007
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache</groupId>
+ <artifactId>test3</artifactId>
+ <name>Test Module for Ivy M2 parsing</name>
+ <version>1.0</version>
+ <url>http://ivy.jayasoft.org/</url>
+ <organization>
+ <name>Jayasoft</name>
+ <url>http://www.jayasoft.org/</url>
+ </organization>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>test2</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Modified: incubator/ivy/trunk/test/triggers/ant-build/A/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/triggers/ant-build/A/build.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/triggers/ant-build/A/build.xml (original)
+++ incubator/ivy/trunk/test/triggers/ant-build/A/build.xml Sun Jan 7 02:41:19 2007
@@ -1,4 +1,4 @@
-<project xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project xmlns:ivy="antlib:org.apache.ivy.ant">
<property environment="env"/>
<!-- =================================================================
@@ -18,8 +18,8 @@
<path id="ivy.lib.path">
<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
</path>
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
- uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
<target name="publish">
<tstamp><format property="tstamp" pattern="yyyyMMDDHHmmss"/></tstamp>
Modified: incubator/ivy/trunk/test/triggers/ant-build/A/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/triggers/ant-build/A/ivy.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/triggers/ant-build/A/ivy.xml (original)
+++ incubator/ivy/trunk/test/triggers/ant-build/A/ivy.xml Sun Jan 7 02:41:19 2007
@@ -1,3 +1,3 @@
<ivy-module version="1.2">
- <info organisation="jayasoft" module="A"/>
+ <info organisation="apache" module="A"/>
</ivy-module>
Modified: incubator/ivy/trunk/test/triggers/ant-build/B/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/triggers/ant-build/B/ivy.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/triggers/ant-build/B/ivy.xml (original)
+++ incubator/ivy/trunk/test/triggers/ant-build/B/ivy.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivy-module version="1.2">
- <info organisation="jayasoft" module="B"/>
+ <info organisation="apache" module="B"/>
<dependencies>
<dependency name="A" rev="latest.integration"/>
<dependency name="foo" rev="1.0"/>
Modified: incubator/ivy/trunk/test/triggers/ant-call/A/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/triggers/ant-call/A/build.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/triggers/ant-call/A/build.xml (original)
+++ incubator/ivy/trunk/test/triggers/ant-call/A/build.xml Sun Jan 7 02:41:19 2007
@@ -1,4 +1,4 @@
-<project xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+<project xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- =================================================================
IVY AUTO INSTALL
works if Ivy is already installed either in ivy home or in ant lib
@@ -16,8 +16,8 @@
<path id="ivy.lib.path">
<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
</path>
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
- uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
<target name="resolve">
<ivy:configure file="../ivyconf.xml"/>
Modified: incubator/ivy/trunk/test/triggers/ant-call/A/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/triggers/ant-call/A/ivy.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/triggers/ant-call/A/ivy.xml (original)
+++ incubator/ivy/trunk/test/triggers/ant-call/A/ivy.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivy-module version="1.2">
- <info organisation="jayasoft" module="A"/>
+ <info organisation="apache" module="A"/>
<dependencies>
<dependency name="foo" rev="1.0"/>
Modified: incubator/ivy/trunk/test/triggers/ant-call/local/foo/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/trunk/test/triggers/ant-call/local/foo/ivy.xml?view=diff&rev=493695&r1=493694&r2=493695
==============================================================================
--- incubator/ivy/trunk/test/triggers/ant-call/local/foo/ivy.xml (original)
+++ incubator/ivy/trunk/test/triggers/ant-call/local/foo/ivy.xml Sun Jan 7 02:41:19 2007
@@ -1,5 +1,5 @@
<ivy-module version="1.2">
- <info organisation="jayasoft" module="foo" revision="1.0"/>
+ <info organisation="apache" module="foo" revision="1.0"/>
<publications>
<artifact />