You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ra...@apache.org on 2007/11/21 22:48:25 UTC
svn commit: r597219 - in /maven/sandbox/trunk/archetypeng:
archetypeng-common/src/main/java/org/apache/maven/archetype/
archetypeng-common/src/main/java/org/apache/maven/archetype/common/
archetypeng-common/src/main/java/org/apache/maven/archetype/crea...
Author: rafale
Date: Wed Nov 21 13:48:23 2007
New Revision: 597219
URL: http://svn.apache.org/viewvc?rev=597219&view=rev
Log:
Commented some unused code for future removing
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/GavCalculator.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/Archetype.java Wed Nov 21 13:48:23 2007
@@ -49,14 +49,14 @@
*/
ArchetypeGenerationResult generateProjectFromArchetype( ArchetypeGenerationRequest request );
- /**
- * Get all available archetypes using the standard ~/.m2/archetype-catalog.properties as the
- * definition for the sources to be used and the configuration for each
- * {@org.apache.maven.archetype.source.ArchetypeDataSource} listed.
- *
- * @return A Map of available archetypes collected from all available source.
- */
- List getAvailableArchetypes();
+// /**
+// * Get all available archetypes using the standard ~/.m2/archetype-catalog.properties as the
+// * definition for the sources to be used and the configuration for each
+// * {@org.apache.maven.archetype.source.ArchetypeDataSource} listed.
+// *
+// * @return A Map of available archetypes collected from all available source.
+// */
+// List getAvailableArchetypes();
/**
* Get all available archetypes using a specified catalog properties as the
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetype.java Wed Nov 21 13:48:23 2007
@@ -76,36 +76,36 @@
return result;
}
- public Collection getArchetypes( ArchetypeDataSource source,
- Properties sourceConfiguration )
- throws ArchetypeDataSourceException
- {
- return source.getArchetypes( sourceConfiguration );
- }
+// public Collection getArchetypes( ArchetypeDataSource source,
+// Properties sourceConfiguration )
+// throws ArchetypeDataSourceException
+// {
+// return source.getArchetypes( sourceConfiguration );
+// }
- public Collection getArchetypeDataSources()
- {
- return archetypeSources.values();
- }
+// public Collection getArchetypeDataSources()
+// {
+// return archetypeSources.values();
+// }
- public List getAvailableArchetypes()
- {
- File archetypeCatalogPropertiesFile = new File( System.getProperty( "user.home" ),
- ".m2/archetype-catalog.properties" );
-
- Properties archetypeCatalogProperties;
-
- if ( archetypeCatalogPropertiesFile.exists() )
- {
- archetypeCatalogProperties = PropertyUtils.loadProperties( archetypeCatalogPropertiesFile );
- }
- else
- {
- archetypeCatalogProperties = new Properties();
- }
-
- return getAvailableArchetypes( archetypeCatalogProperties );
- }
+// public List getAvailableArchetypes()
+// {
+// File archetypeCatalogPropertiesFile = new File( System.getProperty( "user.home" ),
+// ".m2/archetype-catalog.properties" );
+//
+// Properties archetypeCatalogProperties;
+//
+// if ( archetypeCatalogPropertiesFile.exists() )
+// {
+// archetypeCatalogProperties = PropertyUtils.loadProperties( archetypeCatalogPropertiesFile );
+// }
+// else
+// {
+// archetypeCatalogProperties = new Properties();
+// }
+//
+// return getAvailableArchetypes( archetypeCatalogProperties );
+// }
public List getAvailableArchetypes( Properties archetypeCatalogProperties )
{
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeArtifactManager.java Wed Nov 21 13:48:23 2007
@@ -64,13 +64,13 @@
throws
UnknownArchetype;
- /**
- */
- List getArchetypes( String groupId,
- ArtifactRepository localRepository,
- List repositories )
- throws
- UnknownGroup;
+// /**
+// */
+// List getArchetypes( String groupId,
+// ArtifactRepository localRepository,
+// List repositories )
+// throws
+// UnknownGroup;
/**
*/
@@ -138,18 +138,18 @@
throws
UnknownArchetype;
- /**
- */
- List getFilesetArchetypeResources(
- String groupId,
- String artifactId,
- String version,
- ArtifactRepository archetypeRepository,
- ArtifactRepository localRepository,
- List repositories
- )
- throws
- UnknownArchetype;
+// /**
+// */
+// List getFilesetArchetypeResources(
+// String groupId,
+// String artifactId,
+// String version,
+// ArtifactRepository archetypeRepository,
+// ArtifactRepository localRepository,
+// List repositories
+// )
+// throws
+// UnknownArchetype;
/**
*/
@@ -175,25 +175,25 @@
throws
UnknownArchetype;
- /**
- */
- String getReleaseVersion(
- String groupId,
- String artifactId,
- ArtifactRepository localRepository,
- List repositories
- )
- throws
- UnknownArchetype;
-
- /**
- */
- List getVersions(
- String groupId,
- String artifactId,
- ArtifactRepository localRepository,
- List repositories
- )
- throws
- UnknownArchetype;
+// /**
+// */
+// String getReleaseVersion(
+// String groupId,
+// String artifactId,
+// ArtifactRepository localRepository,
+// List repositories
+// )
+// throws
+// UnknownArchetype;
+
+// /**
+// */
+// List getVersions(
+// String groupId,
+// String artifactId,
+// ArtifactRepository localRepository,
+// List repositories
+// )
+// throws
+// UnknownArchetype;
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeFilesResolver.java Wed Nov 21 13:48:23 2007
@@ -36,8 +36,8 @@
List getFilteredFiles( List files,
String filtered );
- List filterFiles( FileSet fileSet,
- List archetypeResources );
+// List filterFiles( FileSet fileSet,
+// List archetypeResources );
List filterFiles( String moduleOffset,
FileSet fileSet,
@@ -79,8 +79,8 @@
throws
IOException;
- List getUnfilteredFiles( List files,
- String filtered );
+// List getUnfilteredFiles( List files,
+// String filtered );
List getUnpackagedFiles( List files,
String packageName );
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/ArchetypeRegistryManager.java Wed Nov 21 13:48:23 2007
@@ -52,19 +52,19 @@
IOException,
XmlPullParserException;
- ArchetypeRegistry readArchetypeRegistry()
- throws
- IOException,
- XmlPullParserException;
+// ArchetypeRegistry readArchetypeRegistry()
+// throws
+// IOException,
+// XmlPullParserException;
- List getRepositories(
- List pomRemoteRepositories,
- String remoteRepositories,
- File archetypeRegistryFile
- )
- throws
- IOException,
- XmlPullParserException;
+// List getRepositories(
+// List pomRemoteRepositories,
+// String remoteRepositories,
+// File archetypeRegistryFile
+// )
+// throws
+// IOException,
+// XmlPullParserException;
void writeArchetypeRegistry( File archetypeRegistryFile,
ArchetypeRegistry archetypeRegistry )
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java Wed Nov 21 13:48:23 2007
@@ -134,54 +134,54 @@
}
}
- public List getArchetypes(
- String groupId,
- ArtifactRepository localRepository,
- List repositories
- )
- throws
- UnknownGroup
- {
- try
- {
- List archetypes = new ArrayList();
-
- RepositoryMetadata metadata = new GroupRepositoryMetadata( groupId );
-
- repositoryMetadataManager.resolve( metadata, repositories, localRepository );
-
- for ( Iterator iter = metadata.getMetadata().getPlugins().iterator(); iter.hasNext(); )
- {
- Plugin plugin = (Plugin) iter.next();
-
- Archetype archetype = new Archetype();
-
- archetype.setGroupId( groupId );
-
- archetype.setArtifactId( plugin.getArtifactId() );
-
- archetype.setName( plugin.getName() );
-
- archetype.setPrefix( plugin.getPrefix() );
-
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "plugin=" + groupId + ":" + plugin.getArtifactId() );
- }
-
- if ( !archetypes.contains( archetype ) )
- {
- archetypes.add( archetype );
- }
- } // end for
-
- return archetypes;
- }
- catch ( RepositoryMetadataResolutionException e )
- {
- throw new UnknownGroup( e );
- }
- }
+// public List getArchetypes(
+// String groupId,
+// ArtifactRepository localRepository,
+// List repositories
+// )
+// throws
+// UnknownGroup
+// {
+// try
+// {
+// List archetypes = new ArrayList();
+//
+// RepositoryMetadata metadata = new GroupRepositoryMetadata( groupId );
+//
+// repositoryMetadataManager.resolve( metadata, repositories, localRepository );
+//
+// for ( Iterator iter = metadata.getMetadata().getPlugins().iterator(); iter.hasNext(); )
+// {
+// Plugin plugin = (Plugin) iter.next();
+//
+// Archetype archetype = new Archetype();
+//
+// archetype.setGroupId( groupId );
+//
+// archetype.setArtifactId( plugin.getArtifactId() );
+//
+// archetype.setName( plugin.getName() );
+//
+// archetype.setPrefix( plugin.getPrefix() );
+//
+// if ( getLogger().isDebugEnabled() )
+// {
+// getLogger().debug( "plugin=" + groupId + ":" + plugin.getArtifactId() );
+// }
+//
+// if ( !archetypes.contains( archetype ) )
+// {
+// archetypes.add( archetype );
+// }
+// } // end for
+//
+// return archetypes;
+// }
+// catch ( RepositoryMetadataResolutionException e )
+// {
+// throw new UnknownGroup( e );
+// }
+// }
public ZipFile getArchetypeZipFile( File archetypeFile )
throws
@@ -387,43 +387,43 @@
return archetypeResources;
}
- public List getFilesetArchetypeResources(
- String groupId,
- String artifactId,
- String version,
- ArtifactRepository archetypeRepository,
- ArtifactRepository localRepository,
- List repositories
- )
- throws
- UnknownArchetype
- {
- List archetypeResources = new ArrayList();
-
- ZipFile zipFile =
- getArchetypeZipFile( groupId, artifactId, version, archetypeRepository, localRepository, repositories );
-
- Enumeration enumeration = zipFile.entries();
- while ( enumeration.hasMoreElements() )
- {
- ZipEntry entry = (ZipEntry) enumeration.nextElement();
-
- if ( !entry.isDirectory()
- && entry.getName().startsWith( Constants.ARCHETYPE_RESOURCES )
- )
- {
- // not supposed to be file.seperator
- archetypeResources.add(
- StringUtils.replace(
- entry.getName(),
- Constants.ARCHETYPE_RESOURCES + "/",
- ""
- )
- );
- }
- }
- return archetypeResources;
- }
+// public List getFilesetArchetypeResources(
+// String groupId,
+// String artifactId,
+// String version,
+// ArtifactRepository archetypeRepository,
+// ArtifactRepository localRepository,
+// List repositories
+// )
+// throws
+// UnknownArchetype
+// {
+// List archetypeResources = new ArrayList();
+//
+// ZipFile zipFile =
+// getArchetypeZipFile( groupId, artifactId, version, archetypeRepository, localRepository, repositories );
+//
+// Enumeration enumeration = zipFile.entries();
+// while ( enumeration.hasMoreElements() )
+// {
+// ZipEntry entry = (ZipEntry) enumeration.nextElement();
+//
+// if ( !entry.isDirectory()
+// && entry.getName().startsWith( Constants.ARCHETYPE_RESOURCES )
+// )
+// {
+// // not supposed to be file.seperator
+// archetypeResources.add(
+// StringUtils.replace(
+// entry.getName(),
+// Constants.ARCHETYPE_RESOURCES + "/",
+// ""
+// )
+// );
+// }
+// }
+// return archetypeResources;
+// }
public boolean isOldArchetype(
String groupId,
@@ -498,53 +498,53 @@
}
}
- public String getReleaseVersion(
- String groupId,
- String artifactId,
- ArtifactRepository localRepository,
- List repositories
- )
- throws
- UnknownArchetype
- {
- try
- {
- RepositoryMetadata metadata =
- new GroupRepositoryMetadata( groupId + "." + artifactId );
-
- repositoryMetadataManager.resolve( metadata, repositories, localRepository );
-
- return metadata.getMetadata().getVersioning().getRelease();
- }
- catch ( RepositoryMetadataResolutionException e )
- {
- throw new UnknownArchetype( e );
- }
- }
-
- public List getVersions(
- String groupId,
- String artifactId,
- ArtifactRepository localRepository,
- List repositories
- )
- throws
- UnknownArchetype
- {
- try
- {
- RepositoryMetadata metadata =
- new GroupRepositoryMetadata( groupId + "." + artifactId );
-
- repositoryMetadataManager.resolve( metadata, repositories, localRepository );
-
- return metadata.getMetadata().getVersioning().getVersions();
- }
- catch ( RepositoryMetadataResolutionException e )
- {
- throw new UnknownArchetype( e );
- }
- }
+// public String getReleaseVersion(
+// String groupId,
+// String artifactId,
+// ArtifactRepository localRepository,
+// List repositories
+// )
+// throws
+// UnknownArchetype
+// {
+// try
+// {
+// RepositoryMetadata metadata =
+// new GroupRepositoryMetadata( groupId + "." + artifactId );
+//
+// repositoryMetadataManager.resolve( metadata, repositories, localRepository );
+//
+// return metadata.getMetadata().getVersioning().getRelease();
+// }
+// catch ( RepositoryMetadataResolutionException e )
+// {
+// throw new UnknownArchetype( e );
+// }
+// }
+
+// public List getVersions(
+// String groupId,
+// String artifactId,
+// ArtifactRepository localRepository,
+// List repositories
+// )
+// throws
+// UnknownArchetype
+// {
+// try
+// {
+// RepositoryMetadata metadata =
+// new GroupRepositoryMetadata( groupId + "." + artifactId );
+//
+// repositoryMetadataManager.resolve( metadata, repositories, localRepository );
+//
+// return metadata.getMetadata().getVersioning().getVersions();
+// }
+// catch ( RepositoryMetadataResolutionException e )
+// {
+// throw new UnknownArchetype( e );
+// }
+// }
private Reader getArchetypeDescriptorReader( ClassLoader archetypeJarLoader )
throws
@@ -677,4 +677,4 @@
? Thread.currentThread().getContextClassLoader().getResourceAsStream( name )
: loader.getResourceAsStream( name );
}
- }
+}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java Wed Nov 21 13:48:23 2007
@@ -69,11 +69,11 @@
return result;
}
- public List filterFiles( FileSet fileSet,
- List archetypeResources )
- {
- return filterFiles( "", fileSet, archetypeResources );
- }
+// public List filterFiles( FileSet fileSet,
+// List archetypeResources )
+// {
+// return filterFiles( "", fileSet, archetypeResources );
+// }
public List filterFiles( String moduleOffset,
FileSet fileSet,
@@ -301,22 +301,22 @@
return resolvePackage( files );
}
- public List getUnfilteredFiles( List files,
- String filtered )
- {
- ListScanner scanner = new ListScanner();
- scanner.setBasedir( "" );
-
- scanner.setIncludes( "**" );
- scanner.setExcludes( filtered );
-
- List result = scanner.scan( files );
- getLogger().debug(
- "Scanned " + result.size() + " unfiltered files in " + files.size() + " files"
- );
-
- return result;
- }
+// public List getUnfilteredFiles( List files,
+// String filtered )
+// {
+// ListScanner scanner = new ListScanner();
+// scanner.setBasedir( "" );
+//
+// scanner.setIncludes( "**" );
+// scanner.setExcludes( filtered );
+//
+// List result = scanner.scan( files );
+// getLogger().debug(
+// "Scanned " + result.size() + " unfiltered files in " + files.size() + " files"
+// );
+//
+// return result;
+// }
public List getUnpackagedFiles( List files,
String packageName )
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeRegistryManager.java Wed Nov 21 13:48:23 2007
@@ -135,13 +135,13 @@
return languages;
}
- public ArchetypeRegistry readArchetypeRegistry()
- throws
- IOException,
- XmlPullParserException
- {
- return readArchetypeRegistry( DEFAULT_REGISTRY );
- }
+// public ArchetypeRegistry readArchetypeRegistry()
+// throws
+// IOException,
+// XmlPullParserException
+// {
+// return readArchetypeRegistry( DEFAULT_REGISTRY );
+// }
public ArchetypeRegistry readArchetypeRegistry( File archetypeRegistryFile )
throws
@@ -175,31 +175,31 @@
}
}
- public List getRepositories(
- List pomRemoteRepositories,
- String remoteRepositories,
- File archetypeRegistryFile
- )
- throws
- IOException,
- XmlPullParserException
- {
- List archetypeRemoteRepositories = new ArrayList( pomRemoteRepositories );
-
- if ( remoteRepositories != null )
- {
- archetypeRemoteRepositories = new ArrayList();
-
- String[] s = StringUtils.split( remoteRepositories, "," );
-
- for ( int i = 0; i < s.length; i++ )
- {
- archetypeRemoteRepositories.add( createRepository( s[i], "id" + i ) );
- }
- }
-
- return archetypeRemoteRepositories;
- }
+// public List getRepositories(
+// List pomRemoteRepositories,
+// String remoteRepositories,
+// File archetypeRegistryFile
+// )
+// throws
+// IOException,
+// XmlPullParserException
+// {
+// List archetypeRemoteRepositories = new ArrayList( pomRemoteRepositories );
+//
+// if ( remoteRepositories != null )
+// {
+// archetypeRemoteRepositories = new ArrayList();
+//
+// String[] s = StringUtils.split( remoteRepositories, "," );
+//
+// for ( int i = 0; i < s.length; i++ )
+// {
+// archetypeRemoteRepositories.add( createRepository( s[i], "id" + i ) );
+// }
+// }
+//
+// return archetypeRemoteRepositories;
+// }
public void writeArchetypeRegistry(
File archetypeRegistryFile,
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/GavCalculator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/GavCalculator.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/GavCalculator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/common/GavCalculator.java Wed Nov 21 13:48:23 2007
@@ -25,96 +25,96 @@
*/
public class GavCalculator
{
- public static Gav calculate( String s )
- {
- int n1 = s.lastIndexOf( '/' );
-
- if ( n1 == -1 )
- {
- return null;
- }
-
- int n2 = s.lastIndexOf( '/', n1 - 1 );
-
- if ( n2 == -1 )
- {
- return null;
- }
-
- int n3 = s.lastIndexOf( '/', n2 - 1 );
-
- if ( n3 == -1 )
- {
- return null;
- }
-
- String ext = s.substring( s.lastIndexOf( '.' ) + 1 );
- String g = s.substring( 0, n3 ).replace( '/', '.' );
- String a = s.substring( n3 + 1, n2 );
- String v = s.substring( n2 + 1, n1 );
- String n = s.substring( n1 + 1 );
- boolean primary = n.equals( a + "-" + v + "." + ext );
- String c = null;
- if (!primary) {
- c = s.substring( n1 + a.length() + v.length() + 3, s.lastIndexOf( '.' ) );
- }
-
- return new Gav( g, a, v, c, n, primary );
- }
-
- public static class Gav
- {
- private String groupId;
-
- private String artifactId;
-
- private String version;
-
- private String classifier;
-
- private String name;
-
- private boolean primary;
-
- public Gav( String groupId, String artifactId, String version, String classifier, String name, boolean primary )
- {
- this.groupId = groupId;
- this.artifactId = artifactId;
- this.version = version;
- this.classifier = classifier;
- this.name = name;
- this.primary = primary;
- }
-
- public String getGroupId()
- {
- return groupId;
- }
-
- public String getArtifactId()
- {
- return artifactId;
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public String getClassifier()
- {
- return classifier;
- }
-
- public String getName()
- {
- return name;
- }
-
- public boolean isPrimary()
- {
- return primary;
- }
-
- }
+// public static Gav calculate( String s )
+// {
+// int n1 = s.lastIndexOf( '/' );
+//
+// if ( n1 == -1 )
+// {
+// return null;
+// }
+//
+// int n2 = s.lastIndexOf( '/', n1 - 1 );
+//
+// if ( n2 == -1 )
+// {
+// return null;
+// }
+//
+// int n3 = s.lastIndexOf( '/', n2 - 1 );
+//
+// if ( n3 == -1 )
+// {
+// return null;
+// }
+//
+// String ext = s.substring( s.lastIndexOf( '.' ) + 1 );
+// String g = s.substring( 0, n3 ).replace( '/', '.' );
+// String a = s.substring( n3 + 1, n2 );
+// String v = s.substring( n2 + 1, n1 );
+// String n = s.substring( n1 + 1 );
+// boolean primary = n.equals( a + "-" + v + "." + ext );
+// String c = null;
+// if (!primary) {
+// c = s.substring( n1 + a.length() + v.length() + 3, s.lastIndexOf( '.' ) );
+// }
+//
+// return new Gav( g, a, v, c, n, primary );
+// }
+//
+// public static class Gav
+// {
+// private String groupId;
+//
+// private String artifactId;
+//
+// private String version;
+//
+// private String classifier;
+//
+// private String name;
+//
+// private boolean primary;
+//
+// public Gav( String groupId, String artifactId, String version, String classifier, String name, boolean primary )
+// {
+// this.groupId = groupId;
+// this.artifactId = artifactId;
+// this.version = version;
+// this.classifier = classifier;
+// this.name = name;
+// this.primary = primary;
+// }
+//
+// public String getGroupId()
+// {
+// return groupId;
+// }
+//
+// public String getArtifactId()
+// {
+// return artifactId;
+// }
+//
+// public String getVersion()
+// {
+// return version;
+// }
+//
+// public String getClassifier()
+// {
+// return classifier;
+// }
+//
+// public String getName()
+// {
+// return name;
+// }
+//
+// public boolean isPrimary()
+// {
+// return primary;
+// }
+//
+// }
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java Wed Nov 21 13:48:23 2007
@@ -1510,19 +1510,19 @@
return groups;
}
- private Properties initialiseArchetypeProperties( File propertyFile )
- throws
- IOException
- {
- Properties properties = new Properties();
-
- if ( propertyFile != null && propertyFile.exists() )
- {
- archetypePropertiesManager.readProperties( properties, propertyFile );
- }
-
- return properties;
- }
+// private Properties initialiseArchetypeProperties( File propertyFile )
+// throws
+// IOException
+// {
+// Properties properties = new Properties();
+//
+// if ( propertyFile != null && propertyFile.exists() )
+// {
+// archetypePropertiesManager.readProperties( properties, propertyFile );
+// }
+//
+// return properties;
+// }
private FileSet getPackagedFileSet(
final boolean filtered,
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java?rev=597219&r1=597218&r2=597219&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java Wed Nov 21 13:48:23 2007
@@ -21,7 +21,6 @@
import org.apache.maven.archetype.common.ArchetypeConfiguration;
import org.apache.maven.archetype.common.ArchetypeDefinition;
-import org.apache.maven.archetype.ui.ArchetypeFactory;
import org.apache.maven.archetype.common.ArchetypeFilesResolver;
import org.apache.maven.archetype.common.ArchetypePropertiesManager;
import org.apache.maven.archetype.common.Constants;