You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2005/12/05 23:17:18 UTC
svn commit: r354206 -
/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
Author: ltheussl
Date: Mon Dec 5 14:17:15 2005
New Revision: 354206
URL: http://svn.apache.org/viewcvs?rev=354206&view=rev
Log:
PR: MPARTIFACT-63
Submitted by: Shinobu Kawai Yoshida
Reviewed by: Lukas Theussl
Bug introduced in fix for MPARTIFACT-57:
Cannot deploy artifacts with own ArtifactTypeHandler.
Modified:
maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
Modified: maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java?rev=354206&r1=354205&r2=354206&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java (original)
+++ maven/maven-1/plugins/trunk/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java Mon Dec 5 14:17:15 2005
@@ -19,6 +19,7 @@
import org.apache.maven.MavenException;
import org.apache.maven.project.Project;
+import org.apache.maven.repository.ArtifactTypeHandler;
/**
*
@@ -36,14 +37,14 @@
private String artifact;
private String type;
private String artifactIdOverride;
- private NamedArtifactTypeHandler typeHandler;
+ private ArtifactTypeHandler typeHandler;
public DeployBean()
{
artifactDeployer = new NamedArtifactDeployer();
}
- public NamedArtifactTypeHandler getTypeHandler()
+ public ArtifactTypeHandler getTypeHandler()
{
return typeHandler;
}
@@ -51,7 +52,7 @@
/**
* @param typeHandler
*/
- public void setTypeHandler(NamedArtifactTypeHandler typeHandler)
+ public void setTypeHandler(ArtifactTypeHandler typeHandler)
{
this.typeHandler = typeHandler;
}
@@ -134,7 +135,7 @@
typeHandler = new NamedArtifactTypeHandler();
if ( artifactIdOverride != null )
{
- typeHandler.setArtifactId( artifactIdOverride );
+ ((NamedArtifactTypeHandler) typeHandler).setArtifactId( artifactIdOverride );
}
}
}
@@ -145,7 +146,14 @@
public void deploy() throws MavenException
{
checkAttributes();
- artifactDeployer.deploy(artifact, type, project, typeHandler);
+ if ( artifactIdOverride != null )
+ {
+ artifactDeployer.deploy(artifact, type, project, (NamedArtifactTypeHandler) typeHandler);
+ }
+ else
+ {
+ artifactDeployer.deploy(artifact, type, project, typeHandler);
+ }
}
/**
@@ -154,7 +162,14 @@
public void deploySnapshot() throws MavenException
{
checkAttributes();
- artifactDeployer.deploySnapshot(artifact, type, project, typeHandler);
+ if ( artifactIdOverride != null )
+ {
+ artifactDeployer.deploySnapshot(artifact, type, project, (NamedArtifactTypeHandler) typeHandler);
+ }
+ else
+ {
+ artifactDeployer.deploySnapshot(artifact, type, project, typeHandler);
+ }
}
/**
@@ -163,7 +178,14 @@
public void install() throws MavenException
{
checkAttributes();
- artifactDeployer.install(artifact, type, project, typeHandler);
+ if ( artifactIdOverride != null )
+ {
+ artifactDeployer.install(artifact, type, project, (NamedArtifactTypeHandler) typeHandler);
+ }
+ else
+ {
+ artifactDeployer.install(artifact, type, project, typeHandler);
+ }
}
/**
@@ -172,7 +194,14 @@
public void installSnapshot() throws MavenException
{
checkAttributes();
- artifactDeployer.installSnapshot(artifact, type, project, typeHandler);
+ if ( artifactIdOverride != null )
+ {
+ artifactDeployer.installSnapshot(artifact, type, project, (NamedArtifactTypeHandler) typeHandler);
+ }
+ else
+ {
+ artifactDeployer.installSnapshot(artifact, type, project, typeHandler);
+ }
}
}