Author: brett
Date: Thu Jun 16 20:55:50 2005
New Revision: 191079
URL: http://svn.apache.org/viewcvs?rev=191079&view=rev
Log:
make the artifact type handlers configurable
Added:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
Removed:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/AbstractArtifactHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/EjbHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/GenericHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/JarHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/JavadocHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusApplicationHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusServiceHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PluginHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PomHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/SourceHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/WarHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
Modified:
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Modified:
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml?rev=191079&r1=191078&r2=191079&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
Thu Jun 16 20:55:50 2005
@@ -139,43 +139,58 @@
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>ejb</role-hint>
-
<implementation>org.apache.maven.artifact.handler.EjbHandler</implementation>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>plexus-service</role-hint>
-
<implementation>org.apache.maven.artifact.handler.PlexusServiceHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>ejb</type>
+ <extension>jar</extension>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>jar</role-hint>
-
<implementation>org.apache.maven.artifact.handler.JarHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>jar</type>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>maven-plugin</role-hint>
-
<implementation>org.apache.maven.artifact.handler.PluginHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>maven-plugin</type>
+ <extension>jar</extension>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>pom</role-hint>
-
<implementation>org.apache.maven.artifact.handler.PomHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>pom</type>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>source</role-hint>
-
<implementation>org.apache.maven.artifact.handler.SourceHandler</implementation>
+ <role-hint>java-source</role-hint>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>java-source</type>
+ <extension>jar</extension>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>war</role-hint>
-
<implementation>org.apache.maven.artifact.handler.WarHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>war</type>
+ </configuration>
</component>
<!--
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=191079&r1=191078&r2=191079&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
Thu Jun 16 20:55:50 2005
@@ -52,7 +52,7 @@
try
{
- String extension = artifactHandlerManager.getArtifactHandler(
artifact.getType() ).extension();
+ String extension = artifactHandlerManager.getArtifactHandler(
artifact.getType() ).getExtension();
source = new File( basedir, finalName + "." + extension );
}
catch ( ArtifactHandlerNotFoundException e )
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java?rev=191079&r1=191078&r2=191079&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
Thu Jun 16 20:55:50 2005
@@ -24,7 +24,11 @@
{
static String ROLE = ArtifactHandler.class.getName();
- String extension();
+ String getExtension();
- String directory();
+ String getDirectory();
+
+ String getClassifier();
+
+ String getPackaging();
}
Added:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java?rev=191079&view=auto
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
(added)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java
Thu Jun 16 20:55:50 2005
@@ -0,0 +1,81 @@
+package org.apache.maven.artifact.handler;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
+ * @version $Id: AbstractArtifactHandler.java 189871 2005-06-10 00:57:19Z
brett $
+ */
+public class DefaultArtifactHandler
+ implements ArtifactHandler
+{
+ private String extension;
+
+ private String type;
+
+ private String classifier;
+
+ private String directory;
+
+ private String packaging;
+
+ public DefaultArtifactHandler()
+ {
+ }
+
+ public DefaultArtifactHandler( String type )
+ {
+ this.type = type;
+ }
+
+ public String getExtension()
+ {
+ if ( extension == null )
+ {
+ extension = type;
+ }
+ return extension;
+ }
+
+ public String getType()
+ {
+ return type;
+ }
+
+ public String getClassifier()
+ {
+ return classifier;
+ }
+
+ public String getDirectory()
+ {
+ if ( directory == null )
+ {
+ directory = type + "s";
+ }
+ return directory;
+ }
+
+ public String getPackaging()
+ {
+ if ( packaging == null )
+ {
+ packaging = type;
+ }
+ return packaging;
+ }
+}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java?rev=191079&r1=191078&r2=191079&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
Thu Jun 16 20:55:50 2005
@@ -47,7 +47,7 @@
try
{
- String extension = artifactHandlerManager.getArtifactHandler(
artifact.getType() ).extension();
+ String extension = artifactHandlerManager.getArtifactHandler(
artifact.getType() ).getExtension();
source = new File( basedir, finalName + "." + extension );
}
catch ( ArtifactHandlerNotFoundException e )
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java?rev=191079&r1=191078&r2=191079&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
Thu Jun 16 20:55:50 2005
@@ -62,9 +62,9 @@
path.append( '-' ).append( artifact.getClassifier() );
}
- if ( artifactHandler.extension() != null &&
artifactHandler.extension().length() > 0 )
+ if ( artifactHandler.getExtension() != null &&
artifactHandler.getExtension().length() > 0 )
{
- path.append( '.' ).append( artifactHandler.extension() );
+ path.append( '.' ).append( artifactHandler.getExtension() );
}
return path.toString();
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java?rev=191079&r1=191078&r2=191079&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java
Thu Jun 16 20:55:50 2005
@@ -49,7 +49,7 @@
StringBuffer path = new StringBuffer();
path.append( artifact.getGroupId() ).append( '/' );
- path.append( artifactHandler.directory() ).append( '/' );
+ path.append( artifactHandler.getDirectory() ).append( '/' );
path.append( artifact.getArtifactId() ).append( '-' ).append(
artifact.getVersion() );
if ( artifact.hasClassifier() )
@@ -57,9 +57,9 @@
path.append( '-' ).append( artifact.getClassifier() );
}
- if ( artifactHandler.extension() != null &&
artifactHandler.extension().length() > 0 )
+ if ( artifactHandler.getExtension() != null &&
artifactHandler.getExtension().length() > 0 )
{
- path.append( '.' ).append( artifactHandler.extension() );
+ path.append( '.' ).append( artifactHandler.getExtension() );
}
return path.toString();
Modified:
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml?rev=191079&r1=191078&r2=191079&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
Thu Jun 16 20:55:50 2005
@@ -148,49 +148,58 @@
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>ejb</role-hint>
-
<implementation>org.apache.maven.artifact.handler.EjbHandler</implementation>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>plexus-application</role-hint>
-
<implementation>org.apache.maven.artifact.handler.PlexusApplicationHandler</implementation>
- </component>
-
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>plexus-service</role-hint>
-
<implementation>org.apache.maven.artifact.handler.PlexusServiceHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>ejb</type>
+ <extension>jar</extension>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>jar</role-hint>
-
<implementation>org.apache.maven.artifact.handler.JarHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>jar</type>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>maven-plugin</role-hint>
-
<implementation>org.apache.maven.artifact.handler.PluginHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>maven-plugin</type>
+ <extension>jar</extension>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>pom</role-hint>
-
<implementation>org.apache.maven.artifact.handler.PomHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>pom</type>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>source</role-hint>
-
<implementation>org.apache.maven.artifact.handler.SourceHandler</implementation>
+ <role-hint>java-source</role-hint>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>java-source</type>
+ <extension>jar</extension>
+ </configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>war</role-hint>
-
<implementation>org.apache.maven.artifact.handler.WarHandler</implementation>
+
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>war</type>
+ </configuration>
</component>
<component>
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=191079&r1=191078&r2=191079&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Thu Jun 16 20:55:50 2005
@@ -2,7 +2,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.handler.PluginHandler;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -531,7 +530,7 @@
throws PluginVersionResolutionException
{
Artifact releaseArtifact = artifactFactory.createArtifact( groupId,
artifactId, "RELEASE",
-
Artifact.SCOPE_RUNTIME, PluginHandler.PLUGIN_TYPE );
+
Artifact.SCOPE_RUNTIME, "maven-plugin" );
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
