michal 2003/07/04 01:05:41
Modified: src/plugins-build/ejb/xdocs changes.xml properties.xml
src/plugins-build/ejb plugin.jelly project.xml
Log:
- finished a fix for MAVEN-518 (artifacts are used for path, not dependencies)
- renamed property ejb.bundle.jar to ejb.bundle
(old property is still supported but deprecated).
This is compatible with war and ear plugins
Revision Changes Path
1.2 +11 -0 maven/src/plugins-build/ejb/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ejb/xdocs/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 24 Jan 2003 03:45:10 -0000 1.1
+++ changes.xml 4 Jul 2003 08:05:39 -0000 1.2
@@ -5,6 +5,17 @@
<author email="[EMAIL PROTECTED]">Nathan Coast</author>
</properties>
<body>
+ <release version="1.1" date="in CVS">
+ <action dev="michal" type="fix">
+ Fixes for MAVEN-518.
+ Artifact processing in the plugin
+ was slightly changed and now it supports jar overriding mechanism
+ </action>
+ <action dev="michal" type="fix">
+ property ejb.bundle.jar was renamed to ejb.bundle
+ (old property is still supported, but deprecated)
+ </action>
+ </release>
<release version="1.0" date="2002-08-04">
<action dev="ncoast" type="add">
Initial plugin created
1.2 +1 -1 maven/src/plugins-build/ejb/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ejb/xdocs/properties.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- properties.xml 24 Jan 2003 03:45:10 -0000 1.1
+++ properties.xml 4 Jul 2003 08:05:40 -0000 1.2
@@ -64,7 +64,7 @@
<id>jarid</id>
<version>jarversion</version>
<properties>
- <ejb.bundle.jar>true</ejb.bundle.jar>
+ <ejb.bundle>true</ejb.bundle>
</properties>
</dependency>
]]></source>
1.7 +22 -5 maven/src/plugins-build/ejb/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ejb/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 4 Jul 2003 06:32:37 -0000 1.6
+++ plugin.jelly 4 Jul 2003 08:05:40 -0000 1.7
@@ -44,13 +44,30 @@
<ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar">
<!-- include marked dependencies -->
- <j:forEach var="dep" items="${pom.dependencies}">
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+
+ <!-- Just include jars-->
+ <!-- Probably we should also include uberjars -->
+ <j:if test="${dep.getProperty('ejb.bundle')=='true' and dep.type=='jar'}">
+ <ant:echo>Bundling: ${dep.type} - ${dep.id}</ant:echo>
+ <ant:fileset dir="${lib.file.parent}">
+ <ant:include name="${lib.file.name}"/>
+ </ant:fileset>
+ </j:if>
+
+ <!-- TO BE REMOVED -->
<j:if test="${dep.getProperty('ejb.bundle.jar')=='true'}">
- <!-- FIXME: This doesn't allow jar overrides to work -->
- <ant:fileset dir="${maven.repo.local}/${dep.artifactDirectory}/jars/">
- <ant:include name="${dep.artifact}"/>
+ <ant:echo>
+ <ant:echo>Bundling: ${dep.type} - ${dep.id}</ant:echo>
+ DEPRECATION WARNING:
+ Use : ejb.bundle instead of ejb.bundle.jar
+ </ant:echo>
+ <ant:fileset dir="${lib.file.parent}">
+ <ant:include name="${lib.file.name}"/>
</ant:fileset>
- </j:if>
+ </j:if>
+ <!-- END OF TO BE REMOVED -->
</j:forEach>
1.11 +1 -1 maven/src/plugins-build/ejb/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/ejb/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 9 Apr 2003 01:06:45 -0000 1.10
+++ project.xml 4 Jul 2003 08:05:40 -0000 1.11
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-ejb-plugin</id>
<name>Maven EJB Plugin</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<description>EJB Plugin for Maven</description>
<shortDescription>EJB Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/ejb/</url>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
