svn commit: r932742 - in /maven/archetype/trunk/archetype-common/src: main/java/org/apache/maven/archetype/creator/ main/java/org/apache/maven/archetype/creator/olddescriptor/ test/java/org/apache/maven/archetype/test/

[hboutemy]

Author: hboutemy
Date: Sat Apr 10 15:01:20 2010
New Revision: 932742

URL: http://svn.apache.org/viewvc?rev=932742&view=rev
Log:
[MARCHETYPE-292] avoid generating 1.0.x archetype.xml descriptor, 2.0.x 
archetype-metadata.xml descriptor is sufficient

Removed:
    
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/olddescriptor/
Modified:
    
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java

Modified: 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=932742&r1=932741&r2=932742&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
 Sat Apr 10 15:01:20 2010
@@ -27,8 +27,6 @@ import org.apache.maven.archetype.common
 import org.apache.maven.archetype.common.util.FileCharsetDetector;
 import org.apache.maven.archetype.common.util.ListScanner;
 import org.apache.maven.archetype.common.util.PathUtils;
-import org.apache.maven.archetype.creator.olddescriptor.OldArchetypeDescriptor;
-import 
org.apache.maven.archetype.creator.olddescriptor.OldArchetypeDescriptorXpp3Writer;
 import org.apache.maven.archetype.exception.TemplateCreationException;
 import org.apache.maven.archetype.metadata.ArchetypeDescriptor;
 import org.apache.maven.archetype.metadata.FileSet;
@@ -328,14 +326,6 @@ public class FilesetArchetypeCreator
                 IOUtil.close( out );
             }
 
-            OldArchetypeDescriptor oldDescriptor =
-                convertToOldDescriptor( archetypeDescriptor.getName(), 
packageName, basedir );
-            File oldDescriptorFile =
-                FileUtils.resolveFile( archetypeResourcesDirectory, 
Constants.OLD_ARCHETYPE_DESCRIPTOR );
-            archetypeDescriptorFile.getParentFile().mkdirs();
-            writeOldDescriptor( oldDescriptor, oldDescriptorFile );
-            getLogger().debug( "Archetype " + archetypeDescriptor.getName() + 
" old descriptor written" );
-
             InvocationRequest internalRequest = new DefaultInvocationRequest();
             internalRequest.setPomFile( archetypePomFile );
             internalRequest.setGoals( Collections.singletonList( 
request.getPostPhase() ) );
@@ -704,55 +694,6 @@ public class FilesetArchetypeCreator
         return result;
     }
 
-    private OldArchetypeDescriptor convertToOldDescriptor( String id, String 
packageName, File basedir )
-        throws IOException
-    {
-        getLogger().debug( "Resolving OldArchetypeDescriptor files in " + 
basedir );
-
-        String excludes = "pom.xml,archetype.properties*,**/target/**";
-
-        for ( Iterator defaultExcludes = Arrays.asList( 
ListScanner.DEFAULTEXCLUDES ).iterator();
-            defaultExcludes.hasNext(); )
-        {
-            excludes += "," + (String) defaultExcludes.next() + "/**";
-        }
-
-        List fileNames = FileUtils.getFileNames( basedir, "**", excludes, 
false );
-
-        getLogger().debug( "Resolved " + fileNames.size() + " files" );
-
-        String packageAsDirectory = StringUtils.replace( packageName, '.', '/' 
) + "/";
-
-        List sources = archetypeFilesResolver.findSourcesMainFiles( fileNames, 
"java/**" );
-        fileNames.removeAll( sources );
-        sources = removePackage( sources, packageAsDirectory );
-
-        List testSources = archetypeFilesResolver.findSourcesTestFiles( 
fileNames, "java/**" );
-        fileNames.removeAll( testSources );
-        testSources = removePackage( testSources, packageAsDirectory );
-
-        List resources = archetypeFilesResolver.findResourcesMainFiles( 
fileNames, "java/**" );
-        fileNames.removeAll( resources );
-
-        List testResources = archetypeFilesResolver.findResourcesTestFiles( 
fileNames, "java/**" );
-        fileNames.removeAll( testResources );
-
-        List siteResources = archetypeFilesResolver.findSiteFiles( fileNames, 
null );
-        fileNames.removeAll( siteResources );
-
-        resources.addAll( fileNames );
-
-        OldArchetypeDescriptor descriptor = new OldArchetypeDescriptor();
-        descriptor.setId( id );
-        descriptor.setSources( sources );
-        descriptor.setTestSources( testSources );
-        descriptor.setResources( resources );
-        descriptor.setTestResources( testResources );
-        descriptor.setSiteResources( siteResources );
-
-        return descriptor;
-    }
-
     private void copyFiles( File basedir, File archetypeFilesDirectory, String 
directory, List fileSetResources,
                             boolean packaged, String packageName )
         throws IOException
@@ -1735,24 +1676,6 @@ public class FilesetArchetypeCreator
         return createFileSet( excludes, false, filtered, group, includes, 
defaultEncoding );
     }
 
-    private void writeOldDescriptor( OldArchetypeDescriptor oldDescriptor, 
File oldDescriptorFile )
-        throws IOException
-    {
-        Writer out = null;
-        try
-        {
-            OldArchetypeDescriptorXpp3Writer writer = new 
OldArchetypeDescriptorXpp3Writer();
-
-            out = WriterFactory.newXmlWriter( oldDescriptorFile );
-
-            writer.write( out, oldDescriptor );
-        }
-        finally
-        {
-            IOUtil.close( out );
-        }
-    }
-
     private static final String MAVEN_PROPERTIES = 
"META-INF/maven/org.apache.maven.archetype/archetype-common/pom.properties";
 
     public String getArchetypeVersion()

Modified: 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java?rev=932742&r1=932741&r2=932742&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
 Sat Apr 10 15:01:20 2010
@@ -302,7 +302,6 @@ public class RoundtripMultiModuleTest
 
         assertExistDirectory( archetypeMetadataDirectory );
         assertExistFile( FileUtils.resolveFile( archetypeMetadataDirectory, 
"archetype-metadata.xml" ) );
-        assertExistFile( FileUtils.resolveFile( archetypeMetadataDirectory, 
"archetype.xml" ) );
         assertExistFile( FileUtils.resolveFile( archetypeSourcesDirectory, 
"pom.xml" ) );
 
     }