You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/06/10 07:36:47 UTC
svn commit: r189902 - in /maven/maven-1/plugins/trunk/idea:
src/plugin-resources/templates/v4/module.jelly xdocs/changes.xml
Author: brett
Date: Thu Jun 9 22:36:46 2005
New Revision: 189902
URL: http://svn.apache.org/viewcvs?rev=189902&view=rev
Log:
PR: MPIDEA-9
Submitted by: Eirik Bjørsnøs
Reviewed by: Brett Porter
don't hardcode the path to the ejb-jar.xml file
Modified:
maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly
maven/maven-1/plugins/trunk/idea/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly?rev=189902&r1=189901&r2=189902&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly (original)
+++ maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly Thu Jun 9 22:36:46 2005
@@ -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>
Modified: maven/maven-1/plugins/trunk/idea/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/idea/xdocs/changes.xml?rev=189902&r1=189901&r2=189902&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/idea/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/idea/xdocs/changes.xml Thu Jun 9 22:36:46 2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org