Author: aheritier
Date: Sat Oct 1 15:28:34 2005
New Revision: 293035
URL: http://svn.apache.org/viewcvs?rev=293035&view=rev
Log:
MPPLUGIN-3 : Resolve project.xml inheritance when installing plugin.
The project.xml is updated with the POM with all variables resolved.
Problem : All paths are resolved. It's not really clean but these ones aren't
used at runtime. Thus it's not blocking.
I can't replace the basedir to keep the compability with maven 1.0.2 (jelly
taglib util:replace doesn't support String replacement) and with jdk 1.3
(String.replaceAll() doesn't exist).
Modified:
maven/maven-1/plugins/trunk/plugin/plugin.jelly
maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/plugin/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/plugin.jelly?rev=293035&r1=293034&r2=293035&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/plugin/plugin.jelly Sat Oct 1 15:28:34 2005
@@ -222,6 +222,13 @@
<goal name="plugin:plugin" description="Build a plugin jar">
<!-- For some reason a prereq on this causes an internal error... -->
<attainGoal name="jar:jar" />
+ <j:file name="${maven.build.dir}/project.xml" escapeText="false"
outputMode="xml">${pom.projectAsString}</j:file>
+ <ant:jar
+ jarfile="${maven.build.dir}/${maven.jar.final.name}"
+ basedir="${maven.build.dir}"
+ update="true">
+ <ant:setProperty name="includes" value="project.xml" />
+ </ant:jar>
</goal>
<goal name="plugin:install" prereqs="plugin:plugin"
Modified: maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml?rev=293035&r1=293034&r2=293035&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml Sat Oct 1 15:28:34
2005
@@ -27,6 +27,7 @@
<action dev="ltheussl" type="add" issue="MPPLUGIN-33">Allow plugin-test
directory to be changed.</action>
<action dev="ltheussl" type="fix" issue="MPPLUGIN-25" due-to="Jamie
McCrindle, Barrie Treloar">NTLM Proxy Problem.</action>
<action dev="carlos" type="fix" issue="MPPLUGIN-26">plugin:download
didn't redownload SNAPSHOT plugins.</action>
+ <action dev="aheritier" type="add" issue="MPPLUGIN-3">Resolve
project.xml inheritance when installing plugin.</action>
<action dev="ltheussl" type="add">new plugin:validate-xml tag to
validate xml documents against a schema.</action>
<action dev="aheritier" type="add">new assert:assertPluginAvailable tag
to check if a minimal release of a plugin is present.</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
