Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPIDEA-9

Browse Source 
Submitted by: Eirik Bjørsnøs
Reviewed by:  Brett Porter

don't hardcode the path to the ejb-jar.xml file


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@189902 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett 2005-06-10 05:36:46 +00:00
parent 462713080f
commit 5bb03594d4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
idea/src/plugin-resources/templates/v4/module.jelly
View File

@ -38,8 +38,8 @@
<setting name="JAR_ENABLED" value="true" />
</component>
<component name="EjbModuleProperties">
<!-- MPIDEA-15 -->
<deploymentDescriptor name="ejb-jar.xml" url="file://$$MODULE_DIR$$/src/ejb/META-INF/ejb-jar.xml" version="2.x" />
<maven:makeRelativePath var="value" basedir="${basedir}" path="${maven.ejb.src}" separator="/" />
<deploymentDescriptor name="ejb-jar.xml" url="file://$$MODULE_DIR$$/${value}/META-INF/ejb-jar.xml" version="2.x" />
<orderEntriesWatcher>
<pairs>
@ -174,7 +174,6 @@
<orderEntry type="sourceFolder" forTests="false"/>
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
<!-- MPIDEA-27: Depdencies of wars en ejb's should also be reffed -->
<j:choose>
<j:when test="${dep.groupId == pom.groupId}" >
@ -194,7 +193,6 @@
</orderEntry>
</j:otherwise>
</j:choose>
<!-- MPIDEA-27: Depdencies of wars en ejb's should also be reffed -->
</j:forEach>
</component>

1
idea/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in SVN">
<action dev="brett" type="fix" issue="MPIDEA-9" due-to="Eirik Bjorsnos">Deployment descriptor for ejb.jar hard-coded</action>
<action dev="brett" type="fix" issue="MPIDEA-15" due-to="Geoffrey De Smet">v4/module.jelly generates incorrect references to $MODULE_DIR$</action>
<action dev="brett" type="add" issue="MPIDEA-28" due-to="Geoffrey De Smet">Generate a module for the multiproject itself</action>
<action dev="brett" type="update" issue="MPIDEA-26" due-to="Geoffrey De Smet">idea:multiproject without idea:workspace so a local workspaces aren't lost</action>