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 09:22:03 UTC
svn commit: r189911 -
/maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly
Author: brett
Date: Fri Jun 10 00:22:01 2005
New Revision: 189911
URL: http://svn.apache.org/viewcvs?rev=189911&view=rev
Log:
o reformat
o don't write resources if they have includes or a target path - it wouldn't be correct. Unfortunately, IDEA has no concept of include/excludes on a library to use instead, nor a different target path
Modified:
maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly
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=189911&r1=189910&r2=189911&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 Fri Jun 10 00:22:01 2005
@@ -111,7 +111,7 @@
<component name="NewModuleRootManager">
<maven:makeRelativePath var="value" basedir="${basedir}" path="${maven.build.dest}" separator="/" />
<output url="file://$$MODULE_DIR$$/${value}"/>
- <maven:pluginVar var="testOutputDir" plugin='maven-test-plugin' property='maven.test.dest'/>
+ <maven:pluginVar var="testOutputDir" plugin='maven-test-plugin' property='maven.test.dest'/>
<maven:makeRelativePath var="value" basedir="${basedir}" path="${testOutputDir}" separator="/"/>
<output-test url="file://$$MODULE_DIR$$/${value}"/>
<content url="file://$MODULE_DIR$">
@@ -130,11 +130,10 @@
<!-- MPIDEA-28: Exclude the subprojects of a multiproject -->
<j:if test="${type == 'multiproject'}">
- <j:forEach var="project" items="${reactorProjects}">
- <maven:makeRelativePath var="value" basedir="${basedir}"
- path="${project.file.parentFile.canonicalFile}" separator="/" />
- <excludeFolder url="file://$$MODULE_DIR$$/${value}"/>
- </j:forEach>
+ <j:forEach var="project" items="${reactorProjects}">
+ <maven:makeRelativePath var="value" basedir="${basedir}" path="${project.file.parentFile.canonicalFile}" separator="/" />
+ <excludeFolder url="file://$$MODULE_DIR$$/${value}"/>
+ </j:forEach>
</j:if>
<j:forEach var="genSource" items="${context.getVariable('maven.idea.generated.source')}">
<sourceFolder url="file://$$MODULE_DIR$$/target/${genSource}" isTestSource="false"/>
@@ -144,35 +143,38 @@
<excludeFolder url="file://$$MODULE_DIR$$/${defaulttargetdir}/test-classes"/>
</content>
<orderEntry type="jdk" jdkName="${maven.idea.jdk}"/>
- <!-- MPIDEA-11 (duplicates MPIDEA-22): Reference resources directory -->
- <j:forEach var="res" items="${pom.build.resources}">
- <orderEntry type="module-library">
+ <j:forEach var="res" items="${pom.build.resources}">
+ <j:if test="${res.includes.isEmpty() and res.targetPath == ''}">
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <maven:makeRelativePath var="value" basedir="${basedir}" path="${res.directory}" separator="/"/>
+ <root url="file://$$MODULE_DIR$$/${value}"/>
+ </CLASSES>
+ <JAVADOC/>
+ <SOURCES/>
+ </library>
+ </orderEntry>
+ </j:if>
+ </j:forEach>
+ <j:if test="${unitTestSourcesPresent == 'true'}"><!-- TODO should use a unitTestResourcesPresent -->
+ <j:if test="${pom.build.unitTest != null}">
+ <j:forEach var="res" items="${pom.build.unitTest.resources}">
+ <j:if test="${res.includes.isEmpty() and res.targetPath == ''}">
+ <orderEntry type="module-library">
<library>
- <CLASSES>
- <maven:makeRelativePath var="value" basedir="${basedir}" path="${res.directory}" separator="/"/>
- <root url="file://$$MODULE_DIR$$/${value}"/>
- </CLASSES>
- <JAVADOC/>
- <SOURCES/>
+ <CLASSES>
+ <maven:makeRelativePath var="value" basedir="${basedir}" path="${res.directory}" separator="/"/>
+ <root url="file://$$MODULE_DIR$$/${value}"/>
+ </CLASSES>
+ <JAVADOC/>
+ <SOURCES/>
</library>
- </orderEntry>
- </j:forEach>
- <j:if test="${unitTestSourcesPresent == 'true'}"><!-- TODO should use a unitTestResourcesPresent -->
- <j:if test="${pom.build.unitTest != null}">
- <j:forEach var="res" items="${pom.build.unitTest.resources}">
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <maven:makeRelativePath var="value" basedir="${basedir}" path="${res.directory}" separator="/"/>
- <root url="file://$$MODULE_DIR$$/${value}"/>
- </CLASSES>
- <JAVADOC/>
- <SOURCES/>
- </library>
- </orderEntry>
- </j:forEach>
+ </orderEntry>
</j:if>
+ </j:forEach>
</j:if>
+ </j:if>
<orderEntry type="sourceFolder" forTests="false"/>
<j:forEach var="lib" items="${pom.artifacts}">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org