Author: olamy
Date: Tue Oct 1 12:57:44 2013
New Revision: 1528073
URL: http://svn.apache.org/r1528073
Log:
[MTOMCAT-240] Artifacts with same artifactID but different groupID are skipped
Submitted by Petar Tahchiev
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1528073&r1=1528072&r2=1528073&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Tue Oct 1 12:57:44 2013
@@ -117,7 +117,7 @@ public class DefaultClassLoaderEntriesCa
// so artifact.getFile is a file not a directory and not
added when iterate on project.classPathElements
if ( !isInProjectReferences( artifact,
request.getMavenProject() ) || artifact.getFile().isFile() )
{
- String fileName = artifact.getFile().getName();
+ String fileName = artifact.getGroupId() + "-" +
artifact.getFile().getName();
if ( !fileInClassLoaderEntries.contains( fileName ) )
{
classLoaderEntries.add(
artifact.getFile().toURI().toString() );
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
