You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by vm...@apache.org on 2004/07/15 12:08:14 UTC
cvs commit: maven-plugins/ejb/xdocs changes.xml properties.xml
vmassol 2004/07/15 03:08:14
Modified: ejb plugin.properties project.xml plugin.jelly
ejb/xdocs changes.xml properties.xml
Log:
- Added new <code>maven.ejb.build.dir</code> property that specifies the location where the EJBs are generated.
- Modified existing <code>maven.ejb.final.name</code> property (and exposed it as a public property) so that it doesn't include the path (the path is now provided by the new <code>maven.ejb.build.dir</code> property). This allows aligning the WAR and EJB plugin properties. Note: This is a breaking change for all those using the <code>maven.ejb.final.name</code> property (which was not a public property).
- Made the <code>maven.ejb.final.name</code> property public as it is required by several other plugins and before this change the only way is for these plugins was to call the non-public <code>ejb:init</code> goal.
Revision Changes Path
1.8 +8 -0 maven-plugins/ejb/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/ejb/plugin.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.properties 8 Apr 2004 00:54:55 -0000 1.7
+++ plugin.properties 15 Jul 2004 10:08:14 -0000 1.8
@@ -19,14 +19,22 @@
# -------------------------------------------------------------------
# ejb plugin.
# -------------------------------------------------------------------
+
maven.ejb.index=false
maven.ejb.client.index=false
# Location of where ejb sources (non-java) are located.
maven.ejb.src=${maven.src.dir}/ejb
+# Location where the generated EJB will be placed.
+maven.ejb.build.dir = ${maven.build.dir}
+
+# Name of the generated EJB file (without the path).
+maven.ejb.final.name = ${maven.final.name}.jar
+
# Location of ejb xml configs - not used atm due to using jar task not ejbjar
maven.ejb.descriptordir=${maven.ejb.src}/META-INF
+
maven.ejb.manifest=${maven.ejb.descriptordir}/MANIFEST.MF
# Exclude from the client jar those things that should only exist on the EJB server.
1.32 +1 -1 maven-plugins/ejb/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ejb/project.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- project.xml 9 Jul 2004 07:56:39 -0000 1.31
+++ project.xml 15 Jul 2004 10:08:14 -0000 1.32
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-ejb-plugin</id>
<name>Maven EJB Plugin</name>
- <currentVersion>1.5</currentVersion>
+ <currentVersion>1.6-SNAPSHOT</currentVersion>
<description>EJB Plugin for Maven</description>
<shortDescription>EJB Plugin for Maven</shortDescription>
<url>http://maven.apache.org/reference/plugins/ejb/</url>
1.20 +10 -14 maven-plugins/ejb/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/ejb/plugin.jelly,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plugin.jelly 11 Jun 2004 09:36:41 -0000 1.19
+++ plugin.jelly 15 Jul 2004 10:08:14 -0000 1.20
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +18,6 @@
*/
-->
-
<project xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:license="license"
@@ -32,11 +32,7 @@
<!--==================================================================-->
<!-- Initializations -->
<!--==================================================================-->
- <goal name="ejb:init"
- description="Initialize filesystem and other resources for an ejb build">
-
- <j:set var="maven.ejb.final.name"
- value="${maven.build.dir}/${maven.final.name}.jar"/>
+ <goal name="ejb:init">
<j:if test="${sourcesPresent == 'true'}">
<attainGoal name="test:test"/>
@@ -63,7 +59,7 @@
<!-- jar task used for now due to problems with ejb jar not including
files other than class files -->
<ant:jar
- jarfile="${maven.ejb.final.name}"
+ jarfile="${maven.ejb.build.dir}/${maven.ejb.final.name}"
index="${maven.ejb.index}">
<!-- include marked dependencies -->
@@ -140,7 +136,7 @@
<!-- Builds an ejb client jar file -->
<!--==================================================================-->
<goal name="ejb:ejb-client" prereqs="ejb:ejb" description="Build a client ejb file">
- <ant:jar jarfile="${maven.build.dir}/${maven.final.name}-client.jar"
+ <ant:jar jarfile="${maven.ejb.build.dir}/${maven.final.name}-client.jar"
basedir="${maven.build.dest}"
excludes="${maven.ejb.client.base.excludes},${maven.ejb.client.excludes}"
index="${maven.ejb.client.index}"
@@ -156,7 +152,7 @@
description="Install the ejb client in the local repository">
<artifact:install
- artifact="${maven.build.dir}/${maven.final.name}-client.jar"
+ artifact="${maven.ejb.build.dir}/${maven.final.name}-client.jar"
type="jar"
project="${pom}"/>
@@ -170,7 +166,7 @@
description="Install the ejb in the local repository">
<artifact:install
- artifact="${maven.ejb.final.name}"
+ artifact="${maven.ejb.build.dir}/${maven.ejb.final.name}"
type="ejb"
project="${pom}"/>
@@ -184,7 +180,7 @@
description="Install the snapshot version of the ejb in the local repository">
<artifact:install-snapshot
- artifact="${maven.ejb.final.name}"
+ artifact="${maven.ejb.build.dir}/${maven.ejb.final.name}"
type="ejb"
project="${pom}"/>
@@ -198,7 +194,7 @@
description="Deploys the ejb to the remote repository">
<artifact:deploy
- artifact="${maven.ejb.final.name}"
+ artifact="${maven.ejb.build.dir}/${maven.ejb.final.name}"
type="ejb"
project="${pom}"/>
@@ -212,7 +208,7 @@
description="Deploys the snapshot version of the ejb to remote repository">
<artifact:deploy-snapshot
- artifact="${maven.ejb.final.name}"
+ artifact="${maven.ejb.build.dir}/${maven.ejb.final.name}"
type="ejb"
project="${pom}"/>
@@ -226,7 +222,7 @@
description="Deploys the ejb client to the remote repository">
<artifact:deploy
- artifact="${maven.build.dir}/${maven.final.name}-client.jar"
+ artifact="${maven.ejb.build.dir}/${maven.final.name}-client.jar"
type="jar"
project="${pom}"/>
</goal>
1.20 +21 -0 maven-plugins/ejb/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ejb/xdocs/changes.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- changes.xml 9 Jul 2004 07:56:39 -0000 1.19
+++ changes.xml 15 Jul 2004 10:08:14 -0000 1.20
@@ -24,6 +24,27 @@
<author email="nathan.coast@blueyonder.co.uk">Nathan Coast</author>
</properties>
<body>
+ <release version="1.6-SNAPSHOT" date="in CVS">
+ <action dev="vmassol" type="add">
+ Added new <code>maven.ejb.build.dir</code> property that specifies the
+ location where the EJBs are generated.
+ </action>
+ <action dev="vmassol" type="update">
+ Modified existing <code>maven.ejb.final.name</code> property (and
+ exposed it as a public property) so that it doesn't include the path
+ (the path is now provided by the new <code>maven.ejb.build.dir</code>
+ property). This allows aligning the WAR and EJB plugin properties.
+ Note: This is a breaking change for all those using the
+ <code>maven.ejb.final.name</code> property (which was not a public
+ property).
+ </action>
+ <action dev="vmassol" type="update">
+ Made the <code>maven.ejb.final.name</code> property public as it is
+ required by several other plugins and before this change the only
+ way is for these plugins was to call the non-public
+ <code>ejb:init</code> goal.
+ </action>
+ </release>
<release version="1.5" date="2004-07-09">
<action dev="evenisse" type="fix" due-to="Martin van den Bemt" issue="MPJAR-29">Replace Apache Jakarta Maven by Apache Maven in Manifest</action>
<action dev="evenisse" type="add">Add ejb:install-client and ejb:deploy-client goals.</action>
1.10 +22 -0 maven-plugins/ejb/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ejb/xdocs/properties.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- properties.xml 2 Apr 2004 03:48:56 -0000 1.9
+++ properties.xml 15 Jul 2004 10:08:14 -0000 1.10
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -22,6 +23,7 @@
<properties>
<title>Properties</title>
<author email="nathan.coast@blueyonder.co.uk">Nathan Coast</author>
+ <author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
@@ -52,6 +54,26 @@
</td>
<td>
src/ejb
+ </td>
+ </tr>
+ <tr>
+ <td>maven.ejb.build.dir</td>
+ <td>Yes</td>
+ <td>
+ Location where to place the generated EJB files.
+ </td>
+ <td>
+ ${maven.build.dir}
+ </td>
+ </tr>
+ <tr>
+ <td>maven.ejb.final.name</td>
+ <td>Yes</td>
+ <td>
+ Name of the generated EJB file.
+ </td>
+ <td>
+ ${maven.final.name}.jar
</td>
</tr>
<tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org