Author: hboutemy
Date: Sun Sep 26 14:14:51 2010
New Revision: 1001434
URL: http://svn.apache.org/viewvc?rev=1001434&view=rev
Log:
[ARCHETYPE-327] added debug messages
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java?rev=1001434&r1=1001433&r2=1001434&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
Sun Sep 26 14:14:51 2010
@@ -182,6 +182,8 @@ public class DefaultArchetypeArtifactMan
ZipFile zipFile = null;
try
{
+ getLogger().debug( "checking fileset archetype status on " +
archetypeFile );
+
zipFile = getArchetypeZipFile( archetypeFile );
return isFileSetArchetype( zipFile );
@@ -212,6 +214,7 @@ public class DefaultArchetypeArtifactMan
{
File archetypeFile = getArchetypeFile( groupId, artifactId,
version, archetypeRepository,
localRepository,
repositories );
+
return isFileSetArchetype( archetypeFile );
}
catch ( UnknownArchetype e )
@@ -225,6 +228,8 @@ public class DefaultArchetypeArtifactMan
ZipFile zipFile = null;
try
{
+ getLogger().debug( "checking old archetype status on " +
archetypeFile );
+
zipFile = getArchetypeZipFile( archetypeFile );
return isOldArchetype( zipFile );
@@ -251,31 +256,17 @@ public class DefaultArchetypeArtifactMan
ArtifactRepository archetypeRepository,
ArtifactRepository localRepository,
List<ArtifactRepository> repositories )
{
- ZipFile zipFile = null;
try
{
- zipFile =
- getArchetypeZipFile( getArchetypeFile( groupId, artifactId,
version, archetypeRepository,
- localRepository,
repositories ) );
+ File archetypeFile = getArchetypeFile( groupId, artifactId,
version, archetypeRepository,
+ localRepository,
repositories );
- return isOldArchetype( zipFile );
- }
- catch ( XmlPullParserException e )
- {
- return false;
- }
- catch ( IOException e )
- {
- return false;
+ return isOldArchetype( archetypeFile );
}
catch ( UnknownArchetype e )
{
return false;
}
- finally
- {
- closeZipFile( zipFile );
- }
}
public boolean exists( String archetypeGroupId, String
archetypeArtifactId, String archetypeVersion,
