felipeal 2004/11/15 22:01:44
Modified: ear plugin.jelly
ear/xdocs changes.xml
Added: ear/src/plugin-test/test06 maven.xml project.properties
project.xml
Log:
fix for MPEAR-27: using lib.name instead of lib.file.name as the name of the
dependency (so it uses the right name when maven.jar.overrides is set to true
Revision Changes Path
1.29 +1 -1 maven-plugins/ear/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- plugin.jelly 16 Nov 2004 05:24:39 -0000 1.28
+++ plugin.jelly 16 Nov 2004 06:01:44 -0000 1.29
@@ -106,7 +106,7 @@
<!-- define the name of the dependency -->
<j:set var="bundleName"
value="${dep.getProperty('ear.bundle.name')}"/>
<j:if test="${empty(bundleName)}">
- <j:set var="bundleName" value="${lib.file.name}"/>
+ <j:set var="bundleName" value="${lib.name}"/>
</j:if>
<j:set var="bundlePath" value="${bundleDir}/${bundleName}"/>
1.1 maven-plugins/ear/src/plugin-test/test06/maven.xml
Index: maven.xml
===================================================================
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<project xmlns:assert="assert"
xmlns:util="jelly:util"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
default="testPlugin">
<goal name="testPlugin" prereqs="test-ear">
<attainGoal name="clean"/>
</goal>
<goal name="test-ear" prereqs="ear">
<!-- tests that the ear is generated -->
<assert:assertFileExists
file="${maven.build.dir}/${maven.final.name}.ear"/>
<!-- unzip the ear and look for the jars -->
<j:set var="earFile" value="${maven.build.dir}/${maven.final.name}.ear"/>
<j:set var="unzipDir" value= "${maven.build.dir}/eartest"/>
<mkdir dir="${unzipDir}"/>
<unzip src="${earFile}" dest="${unzipDir}"/>
<!-- check for commons-logging -->
<assert:assertFileExists file="${unzipDir}/fakeSar-1.0.sar"
msg="fakeSar-1.0.sar was not bundled"/>
</goal>
</project>
1.1
maven-plugins/ear/src/plugin-test/test06/project.properties
Index: project.properties
===================================================================
# -------------------------------------------------------------------
# Copyright 2001-2004 The Apache Software Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# -------------------------------------------------------------------
maven.jar.override=on
maven.jar.fakeSar=project.xml
1.1 maven-plugins/ear/src/plugin-test/test06/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<project>
<pomVersion>3</pomVersion>
<name>Test project for Maven Ear Plugin 06</name>
<artifactId>test-maven-ear-plugin-06</artifactId>
<inceptionYear>2004</inceptionYear>
<shortDescription>Makes sure a SAR dependency is bundled</shortDescription>
<description>Makes sure a SAR dependency is bundled (see issues MPEAR-3 and
MPEAR-10)</description>
<url/>
<developers>
<developer>
<name>Felipe Leme</name>
<id>felipeal</id>
<role>Jelly Developer</role>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>fakeSar</artifactId>
<version>1.0</version>
<type>sar</type>
<properties>
<ear.bundle>true</ear.bundle>
</properties>
</dependency>
</dependencies>
</project>
1.30 +1 -0 maven-plugins/ear/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ear/xdocs/changes.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- changes.xml 16 Nov 2004 05:24:39 -0000 1.29
+++ changes.xml 16 Nov 2004 06:01:44 -0000 1.30
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in CVS">
+ <action dev="felipeal" type="fix" issue="MPEAR-27">Fixed the name of
the bundled dependency when <code>maven.jar.overrides</code> is used.</action>
<action dev="felipeal" type="fix" issue="MPEAR-24">Properties
<code>maven.ear.src</code> and <code>maven.ear.resources</code> now cannot have
the same value.</action>
<action dev="felipeal" type="fix"
issue="MPEAR-7"><code>application.xml</code> is now generated at
<code>maven.build.dir</code></action>
<action dev="felipeal" type="add" issue="MPEAR-26">Add new property
dependency (<code>ear.bundle.name</code>) to define the name a dependency
should have the EAR.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
