You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/08/25 23:32:31 UTC
svn commit: r1161762 - in
/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype:
exception/ generator/
Author: hboutemy
Date: Thu Aug 25 21:32:30 2011
New Revision: 1161762
URL: http://svn.apache.org/viewvc?rev=1161762&view=rev
Log:
o added ArchetypeException
o simplified archetype exceptions catch
Added:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeException.java (with props)
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationConfigurationFailure.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationFailure.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotConfigured.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotDefined.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeSelectionFailure.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/InvalidPackaging.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/OutputFileExists.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/PomFileExists.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ProjectDirectoryExists.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/TemplateCreationException.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownArchetype.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownGroup.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
Added: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeException.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeException.java?rev=1161762&view=auto
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeException.java (added)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeException.java Thu Aug 25 21:32:30 2011
@@ -0,0 +1,43 @@
+package org.apache.maven.archetype.exception;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class ArchetypeException
+ extends Exception
+{
+ public ArchetypeException()
+ {
+ }
+
+ public ArchetypeException( String msg )
+ {
+ super( msg );
+ }
+
+ public ArchetypeException( Throwable cause )
+ {
+ super( cause );
+ }
+
+ public ArchetypeException( String msg, Throwable cause )
+ {
+ super( msg, cause );
+ }
+}
Propchange: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeException.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationConfigurationFailure.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationConfigurationFailure.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationConfigurationFailure.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationConfigurationFailure.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class ArchetypeGenerationConfigurationFailure
- extends Exception
+ extends ArchetypeException
{
public ArchetypeGenerationConfigurationFailure()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationFailure.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationFailure.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationFailure.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeGenerationFailure.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class ArchetypeGenerationFailure
- extends Exception
+ extends ArchetypeException
{
public ArchetypeGenerationFailure()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotConfigured.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotConfigured.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotConfigured.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotConfigured.java Thu Aug 25 21:32:30 2011
@@ -22,7 +22,7 @@ package org.apache.maven.archetype.excep
import java.util.List;
public class ArchetypeNotConfigured
- extends Exception
+ extends ArchetypeException
{
private List<String> missingProperties;
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotDefined.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotDefined.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotDefined.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeNotDefined.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class ArchetypeNotDefined
- extends Exception
+ extends ArchetypeException
{
public ArchetypeNotDefined()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeSelectionFailure.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeSelectionFailure.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeSelectionFailure.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ArchetypeSelectionFailure.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class ArchetypeSelectionFailure
- extends Exception
+ extends ArchetypeException
{
public ArchetypeSelectionFailure()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/InvalidPackaging.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/InvalidPackaging.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/InvalidPackaging.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/InvalidPackaging.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class InvalidPackaging
- extends Exception
+ extends ArchetypeException
{
public InvalidPackaging()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/OutputFileExists.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/OutputFileExists.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/OutputFileExists.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/OutputFileExists.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class OutputFileExists
- extends Exception
+ extends ArchetypeException
{
public OutputFileExists()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/PomFileExists.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/PomFileExists.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/PomFileExists.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/PomFileExists.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class PomFileExists
- extends Exception
+ extends ArchetypeException
{
public PomFileExists()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ProjectDirectoryExists.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ProjectDirectoryExists.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ProjectDirectoryExists.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/ProjectDirectoryExists.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class ProjectDirectoryExists
- extends Exception
+ extends ArchetypeException
{
public ProjectDirectoryExists()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/TemplateCreationException.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/TemplateCreationException.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/TemplateCreationException.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/TemplateCreationException.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class TemplateCreationException
- extends Exception
+ extends ArchetypeException
{
public TemplateCreationException()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownArchetype.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownArchetype.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownArchetype.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownArchetype.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class UnknownArchetype
- extends Exception
+ extends ArchetypeException
{
public UnknownArchetype()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownGroup.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownGroup.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownGroup.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/exception/UnknownGroup.java Thu Aug 25 21:32:30 2011
@@ -20,7 +20,7 @@ package org.apache.maven.archetype.excep
*/
public class UnknownGroup
- extends Exception
+ extends ArchetypeException
{
public UnknownGroup()
{
Modified: maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java?rev=1161762&r1=1161761&r2=1161762&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java (original)
+++ maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultArchetypeGenerator.java Thu Aug 25 21:32:30 2011
@@ -24,13 +24,9 @@ import org.apache.maven.archetype.Archet
import org.apache.maven.archetype.ArchetypeGenerationResult;
import org.apache.maven.archetype.common.ArchetypeArtifactManager;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
+import org.apache.maven.archetype.exception.ArchetypeException;
import org.apache.maven.archetype.exception.ArchetypeGenerationFailure;
-import org.apache.maven.archetype.exception.ArchetypeNotConfigured;
import org.apache.maven.archetype.exception.ArchetypeNotDefined;
-import org.apache.maven.archetype.exception.InvalidPackaging;
-import org.apache.maven.archetype.exception.OutputFileExists;
-import org.apache.maven.archetype.exception.PomFileExists;
-import org.apache.maven.archetype.exception.ProjectDirectoryExists;
import org.apache.maven.archetype.exception.UnknownArchetype;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -61,9 +57,7 @@ public class DefaultArchetypeGenerator
private OldArchetype oldArchetype;
private File getArchetypeFile( ArchetypeGenerationRequest request, ArtifactRepository localRepository )
- throws IOException, ArchetypeNotDefined, UnknownArchetype, ArchetypeNotConfigured, ProjectDirectoryExists,
- PomFileExists, OutputFileExists, XmlPullParserException, DocumentException, InvalidPackaging,
- ArchetypeGenerationFailure
+ throws IOException, ArchetypeException, XmlPullParserException, DocumentException
{
if ( !isArchetypeDefined( request ) )
{
@@ -97,9 +91,7 @@ public class DefaultArchetypeGenerator
}
private void generateArchetype( ArchetypeGenerationRequest request, File archetypeFile )
- throws IOException, UnknownArchetype, ArchetypeNotConfigured, ProjectDirectoryExists,
- PomFileExists, OutputFileExists, XmlPullParserException, DocumentException, InvalidPackaging,
- ArchetypeGenerationFailure
+ throws IOException, ArchetypeException, XmlPullParserException, DocumentException
{
if ( archetypeArtifactManager.isFileSetArchetype( archetypeFile ) )
{
@@ -130,8 +122,7 @@ public class DefaultArchetypeGenerator
/** FileSetArchetype */
private void processFileSetArchetype( ArchetypeGenerationRequest request, File archetypeFile )
- throws UnknownArchetype, ArchetypeNotConfigured, ProjectDirectoryExists, PomFileExists, OutputFileExists,
- ArchetypeGenerationFailure
+ throws ArchetypeException
{
filesetGenerator.generateArchetype( request, archetypeFile );
}
@@ -153,27 +144,7 @@ public class DefaultArchetypeGenerator
getLogger().error( ex.getMessage(), ex );
result.setCause( ex );
}
- catch ( UnknownArchetype ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( ArchetypeNotConfigured ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( ProjectDirectoryExists ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( PomFileExists ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( OutputFileExists ex )
+ catch ( ArchetypeException ex )
{
getLogger().error( ex.getMessage(), ex );
result.setCause( ex );
@@ -188,16 +159,6 @@ public class DefaultArchetypeGenerator
getLogger().error( ex.getMessage(), ex );
result.setCause( ex );
}
- catch ( InvalidPackaging ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( ArchetypeGenerationFailure ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
}
public void generateArchetype( ArchetypeGenerationRequest request, ArchetypeGenerationResult result )
@@ -213,32 +174,7 @@ public class DefaultArchetypeGenerator
getLogger().error( ex.getMessage(), ex );
result.setCause( ex );
}
- catch ( ArchetypeNotDefined ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( UnknownArchetype ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( ArchetypeNotConfigured ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( ProjectDirectoryExists ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( PomFileExists ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( OutputFileExists ex )
+ catch ( ArchetypeException ex )
{
getLogger().error( ex.getMessage(), ex );
result.setCause( ex );
@@ -253,15 +189,5 @@ public class DefaultArchetypeGenerator
getLogger().error( ex.getMessage(), ex );
result.setCause( ex );
}
- catch ( InvalidPackaging ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
- catch ( ArchetypeGenerationFailure ex )
- {
- getLogger().error( ex.getMessage(), ex );
- result.setCause( ex );
- }
}
}