You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jt...@apache.org on 2006/11/06 04:07:11 UTC
svn commit: r471624 - in /maven/plugins/trunk/maven-war-plugin/src:
main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
test/java/org/apache/maven/plugin/war/stub/EJBClientArtifactStub.java
Author: jtolentino
Date: Sun Nov 5 19:07:10 2006
New Revision: 471624
URL: http://svn.apache.org/viewvc?view=rev&rev=471624
Log:
Use getClassifier instead of getType in resolving the artifact's default final name. Affects MWAR-58 and MWAR-59.
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/EJBClientArtifactStub.java
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?view=diff&rev=471624&r1=471623&r2=471624
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Sun Nov 5 19:07:10 2006
@@ -1025,18 +1025,16 @@
*/
private String getDefaultFinalName( Artifact artifact )
{
- String type = artifact.getType();
- if ( "ejb-client".equals( type ) )
- {
- return artifact.getArtifactId() + "-" + artifact.getVersion() + "-" + "client" + "." +
- artifact.getArtifactHandler().getExtension();
- }
- else
+ String finalName = artifact.getArtifactId() + "-" + artifact.getVersion();
+
+ String classifier = artifact.getClassifier();
+ if ( ( classifier != null ) && ! ( "".equals( classifier.trim() ) ) )
{
- return artifact.getArtifactId() + "-" + artifact.getVersion() + "." +
- artifact.getArtifactHandler().getExtension();
+ finalName += "-" + classifier;
}
- }
+ finalName = finalName + "." + artifact.getArtifactHandler().getExtension();
+ return finalName;
+ }
}
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/EJBClientArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/EJBClientArtifactStub.java?view=diff&rev=471624&r1=471623&r2=471624
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/EJBClientArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/EJBClientArtifactStub.java Sun Nov 5 19:07:10 2006
@@ -53,6 +53,11 @@
return "ejb-client";
}
+ public String getClassifier()
+ {
+ return "client";
+ }
+
public String getArtifactId()
{
return "ejbclientartifact";