You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2009/01/03 11:00:12 UTC
svn commit: r730956 - in /maven/plugins/trunk/maven-ear-plugin/src:
main/java/org/apache/maven/plugin/ear/EarMojo.java
main/java/org/apache/maven/plugin/ear/Ejb3Module.java site/apt/modules.apt
Author: snicoll
Date: Sat Jan 3 02:00:12 2009
New Revision: 730956
URL: http://svn.apache.org/viewvc?rev=730956&view=rev
Log:
ejb3 module deprecation warning.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java
maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=730956&r1=730955&r2=730956&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Sat Jan 3 02:00:12 2009
@@ -269,6 +269,10 @@
{
getLog().warn( "JavaModule is deprecated (" + module + "), please use JarModule instead." );
}
+ if ( module instanceof Ejb3Module )
+ {
+ getLog().warn( "Ejb3Module is deprecated (" + module + "), please use EjbModule instead." );
+ }
final File sourceFile = module.getArtifact().getFile();
final File destinationFile = buildDestinationFile( getWorkDirectory(), module.getUri() );
if ( !sourceFile.isFile() )
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java?rev=730956&r1=730955&r2=730956&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java Sat Jan 3 02:00:12 2009
@@ -27,6 +27,9 @@
* @author Stephane Nicoll <sn...@apache.org>
* @author $Author$ (last edit)
* @version $Revision$
+ *
+ * @deprecated ejb v3 is now properly handled by the standard
+ * ejb packaging type. use {@link EjbModule} instead
*/
public class Ejb3Module
extends EjbModule
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt?rev=730956&r1=730955&r2=730956&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt Sat Jan 3 02:00:12 2009
@@ -28,12 +28,12 @@
The EAR Plugin supports additional configurations of the following modules:
- * {{{#ejb3Module}ejb3Module}}
-
* {{{#ejbClientModule}ejbClientModule}}
* {{{#ejbModule}ejbModule}}
+ * {{{#ejbModule}ejb3Module}} (deprecated. ejbModule provides the same functionality)
+
* {{{#jarModule}jarModule}} (previously know as javaModule and deprecated)
* {{{#parModule}parModule}}
@@ -79,38 +79,6 @@
</project>
+-----
-* {ejb3Module} Properties
-
- The following configuration options are available for Ejb3Module:
-
- * <<groupId>> - sets the groupId of the ejb3 artifact you want to configure.
-
- * <<artifactId>> - sets the artifactId of the ejb3 artifact you want to
- configure.
-
- * <<classifier>> - sets the classifier of the ejb3 artifact you want to
- configure if multiple ejb3 artifacts matches the groupId/artifact. Use
- the mainArtifactId ('none' by default) to define the main artifact (e.g.
- the artifact without a classifier)
-
- * <<bundleDir>> - sets the location of this artifact inside the ear archive.
- If not set, this artifact will be packaged in the root of the archive.
-
- * <<bundleFileName>> - sets the new name of this artifact inside the ear
- archive. If not set, the artifact's filename in the repository is used.
-
- * <<excluded>> - set to true to exclude this artifact from being packaged into
- the ear archive. Default is false.
-
- * <<uri>> - sets the uri path of this artifact within the ear archive.
- Automatically determined when not set.
-
- * <<unpack>> - set to true to unpack this artifact into the ear archive according
- to its uri. Default is false.
-
- * <<altDeploymentDescriptor>> - sets the alternative deployment descriptor for
- this module. (Java EE5).
-
* {ejbClientModule} Properties