You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2009/04/28 01:05:36 UTC
svn commit: r769196 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component
Author: aheritier
Date: Mon Apr 27 23:05:36 2009
New Revision: 769196
URL: http://svn.apache.org/viewvc?rev=769196&view=rev
Log:
MECLIPSE-455 : Invalid dependent module archive name for EJB artifact
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java?rev=769196&r1=769195&r2=769196&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java Mon Apr 27 23:05:36 2009
@@ -171,15 +171,19 @@
// </dependent-module>
handle = "module:/resource/" + dep.getEclipseProjectName() + "/" + dep.getEclipseProjectName(); //$NON-NLS-1$ //$NON-NLS-2$
+
+ String archiveExtension = dep.getType();
if ( Constants.PROJECT_PACKAGING_EJB.equals( dep.getType() ) )
{
dependentObject = "EjbModule_";
+ // an EJB module is packed as a .jar file
+ archiveExtension = Constants.PROJECT_PACKAGING_JAR;
}
else if ( Constants.PROJECT_PACKAGING_WAR.equals( dep.getType() ) )
{
dependentObject = "WebModule_";
}
- archiveName = dep.getEclipseProjectName() + "." + dep.getType();
+ archiveName = dep.getEclipseProjectName() + "." + archiveExtension;
}
else
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component?rev=769196&r1=769195&r2=769196&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ear/expected/.settings/org.eclipse.wst.common.component Mon Apr 27 23:05:36 2009
@@ -1,11 +1,11 @@
<project-modules id="moduleCoreId" project-version="2.0">
<wb-module deploy-name="my-ear">
<wb-resource deploy-path="/" source-path="src/main/application"/>
- <dependent-module archiveName="my-ejb.ejb" deploy-path="/" handle="module:/resource/my-ejb/my-ejb">
+ <dependent-module archiveName="my-ejb.jar" deploy-path="/" handle="module:/resource/my-ejb/my-ejb">
<dependent-object>EjbModule_19673895</dependent-object>
<dependency-type>uses</dependency-type>
</dependent-module>
<wb-resource deploy-path="/" source-path="src/main/java"/>
<wb-resource deploy-path="/" source-path="src/main/resources"/>
</wb-module>
-</project-modules>
\ No newline at end of file
+</project-modules>