Benjamin Bentmann wrote: > Hi Dennis, Hi
>> Author: dennisl >> Date: Wed Feb 25 23:32:52 2009 >> New Revision: 747966 >> >> URL: http://svn.apache.org/viewvc?rev=747966&view=rev >> Log: >> [MEJB-32] Add set classifier to client classifier >> Submitted by: David Siefert >> Reviewed by: Dennis Lundberg >> >> o Patch applied with modifications (code style) >> >> Modified: >> >> maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java >> >> >> maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/EjbMojoTest.java >> >> >> Modified: >> maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java >> >> URL: >> http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=747966&r1=747965&r2=747966&view=diff >> >> ============================================================================== >> >> --- >> maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java >> (original) >> +++ >> maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java >> Wed Feb 25 23:32:52 2009 >> @@ -260,7 +260,13 @@ >> >> if ( generateClient ) >> { >> - getLog().info( "Building EJB client " + jarName + >> "-client" ); >> + String clientJarName = jarName; >> + if ( classifier != null ) >> + { >> + clientJarName += "-" + classifier; >> + } >> + >> + getLog().info( "Building EJB client " + clientJarName + >> "-client" ); >> >> String[] excludes = DEFAULT_EXCLUDES; >> String[] includes = DEFAULT_INCLUDES; > > A few lines below this code there's still > >> projectHelper.attachArtifact( project, "ejb-client", "client", >> clientJarFile ); > > i.e. the attached client artifact has the hard-coded classifier > "client". I think the classifier parameter would need be prepended here, > too, to prevent the client JARs from clashing in the repo or do I miss > something? No, I think that sounds reasonable. Something like this instead then? - projectHelper.attachArtifact( project, "ejb-client", "client", clientJarFile ); + if ( classifier != null ) + { + projectHelper.attachArtifact( project, "ejb-client", classifier + "-client", clientJarFile ); + } + else + { + projectHelper.attachArtifact( project, "ejb-client", "client", clientJarFile ); + } > > > Benjamin > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > -- Dennis Lundberg --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
