felipeal 2004/11/15 18:45:56
Modified: ear plugin.jelly
ear/src/plugin-test/test02 project.xml
ear/xdocs changes.xml properties.xml
Log:
changed property ear.target.path (introduced by MPEAR-23) to ear.bundle.dir,
which is more coherent to property ear.bundle.name (which will be added by
MPEAR-26)
Revision Changes Path
1.24 +1 -1 maven-plugins/ear/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plugin.jelly 11 Nov 2004 03:28:41 -0000 1.23
+++ plugin.jelly 16 Nov 2004 02:45:56 -0000 1.24
@@ -85,7 +85,7 @@
</j:if>
<ant:echo>Bundling: ${dep.type} - ${dep.id} -
${dep.version}</ant:echo>
- <j:set var="targetPath"
value="${dep.getProperty('ear.target.path')}"/>
+ <j:set var="targetPath"
value="${dep.getProperty('ear.bundle.dir')}"/>
<!-- decide where to include the dependency -->
<j:choose>
<j:when test="${empty(targetPath)}">
1.3 +1 -1 maven-plugins/ear/src/plugin-test/test02/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ear/src/plugin-test/test02/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Nov 2004 02:10:32 -0000 1.2
+++ project.xml 16 Nov 2004 02:45:56 -0000 1.3
@@ -46,7 +46,7 @@
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<properties>
- <ear.target.path>APP-INF/lib</ear.target.path>
+ <ear.bundle.dir>APP-INF/lib</ear.bundle.dir>
<ear.module>true</ear.module>
</properties>
</dependency>
1.26 +1 -1 maven-plugins/ear/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ear/xdocs/changes.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- changes.xml 11 Nov 2004 11:55:45 -0000 1.25
+++ changes.xml 16 Nov 2004 02:45:56 -0000 1.26
@@ -26,7 +26,7 @@
<body>
<release version="1.6-SNAPSHOT" date="in CVS">
<action dev="felipeal" type="fix" issue="MPEAR-20">Changed the default
value of <code>maven.ear.displayname</code>.</action>
- <action dev="felipeal" type="add" issue="MPEAR-23" due-to="Wiley
Fuller">Add new property dependency(<code>ear.target.path</code>) to define
where a dependency should be added in the EAR.</action>
+ <action dev="felipeal" type="add" issue="MPEAR-23" due-to="Wiley
Fuller">Add new property dependency(<code>ear.bundle.dir</code>) to define
where a dependency should be added in the EAR.</action>
<action dev="felipeal" type="fix" issue="MPEAR-9" due-to="Sean
Timm">Build now fails in some cases were the dependencies are copied with wrong
case.</action>
<action dev="felipeal" type="add" issue="MPEAR-21">Added property
<code>maven.ear.appxml.encoding</code>.</action>
<action dev="vmassol" type="update" issue="MPEAR-19">
1.17 +2 -2 maven-plugins/ear/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ear/xdocs/properties.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- properties.xml 11 Nov 2004 11:55:45 -0000 1.16
+++ properties.xml 16 Nov 2004 02:45:56 -0000 1.17
@@ -173,7 +173,7 @@
]]></source>
<p>
- Note that by default the artifacts will be bundled in the EAR's
root directory. To change the location where an artifact is bundled, please use
the <code>ear.target.path</code> property:
+ Note that by default the artifacts will be bundled in the EAR's
root directory. To change the location where an artifact is bundled, please use
the <code>ear.bundle.dir</code> property:
</p>
<source><![CDATA[
<dependency>
@@ -183,7 +183,7 @@
<type>jar</type>
<properties>
<ear.bundle>true</ear.bundle>
- <ear.target.path>APP-INF/lib</ear.target.path>
+ <ear.bundle.dir>APP-INF/lib</ear.bundle.dir>
</properties>
</dependency>
]]></source>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
