svn commit: r932601 - in /maven/archetype/trunk/archetype-common/src/test: java/org/apache/maven/archetype/source/ java/org/apache/maven/archetype/test/ resources/wiki/ sources/

[hboutemy]

Author: hboutemy
Date: Fri Apr  9 20:49:49 2010
New Revision: 932601

URL: http://svn.apache.org/viewvc?rev=932601&view=rev
Log:
moved files to better places

Added:
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
      - copied, changed from r932543, 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/WikiArchetypeDataSource.java
    maven/archetype/trunk/archetype-common/src/test/resources/wiki/
      - copied from r932543, 
maven/archetype/trunk/archetype-common/src/test/sources/wiki/
    
maven/archetype/trunk/archetype-common/src/test/resources/wiki/wiki-source.txt
      - copied unchanged from r932582, 
maven/archetype/trunk/archetype-common/src/test/sources/wiki/wiki-source.txt
Removed:
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/WikiArchetypeDataSource.java
    maven/archetype/trunk/archetype-common/src/test/sources/
Modified:
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java

Copied: 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
 (from r932543, 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/WikiArchetypeDataSource.java)
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java?p2=maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java&p1=maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/WikiArchetypeDataSource.java&r1=932543&r2=932601&rev=932601&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/WikiArchetypeDataSource.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
 Fri Apr  9 20:49:49 2010
@@ -1,4 +1,4 @@
-package org.apache.maven.archetype.test;
+package org.apache.maven.archetype.source;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java?rev=932601&r1=932600&r2=932601&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java
 Fri Apr  9 20:49:49 2010
@@ -21,7 +21,6 @@ package org.apache.maven.archetype.sourc
 
 import org.apache.maven.archetype.catalog.Archetype;
 import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.test.WikiArchetypeDataSource;
 import org.codehaus.plexus.PlexusTestCase;
 
 import java.io.File;
@@ -46,7 +45,7 @@ public class WikiArchetypeDataSourceTest
     public void testWikiArchetypeDataSource()
         throws Exception
     {
-        File wikiSource = new File( getBasedir(), 
"src/test/sources/wiki/wiki-source.txt" );
+        File wikiSource = new File( getBasedir(), 
"src/test/resources/wiki/wiki-source.txt" );
 
         assertTrue( wikiSource.exists() );
 

Modified: 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java?rev=932601&r1=932600&r2=932601&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java
 Fri Apr  9 20:49:49 2010
@@ -30,6 +30,7 @@ import org.apache.maven.archetype.metada
 import org.apache.maven.archetype.metadata.RequiredProperty;
 import org.apache.maven.archetype.source.ArchetypeDataSource;
 import org.apache.maven.archetype.source.ArchetypeDataSourceException;
+import org.apache.maven.archetype.source.WikiArchetypeDataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;