Author: dennisl
Date: Thu Dec 8 13:22:02 2011
New Revision: 1211869
URL: http://svn.apache.org/viewvc?rev=1211869&view=rev
Log:
[MEAR-48] Remove the deprecated resourcesDir parameter
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
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=1211869&r1=1211868&r2=1211869&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
Thu Dec 8 13:22:02 2011
@@ -210,14 +210,6 @@ public class EarMojo
private String packagingIncludes;
/**
- * The directory to get the resources from.
- *
- * @parameter
- * @deprecated Please use earSourceDirectory instead.
- */
- private File resourcesDir;
-
- /**
* Whether to create skinny WARs or not. A skinny WAR is a WAR that does
not
* have all of its dependencies in WEB-INF/lib. Instead those dependencies
* are shared between the WARs through the EAR.
@@ -430,26 +422,6 @@ public class EarMojo
throw new MojoExecutionException( "Error filtering EAR sources", e
);
}
- // Copy resources files
- try
- {
- if ( resourcesDir != null && resourcesDir.exists() )
- {
- getLog().warn( "resourcesDir is deprecated. Please use the
earSourceDirectory property instead." );
- getLog().info( "Copy ear resources to " +
getWorkDirectory().getAbsolutePath() );
- String[] fileNames = getEarFiles( resourcesDir );
- for ( int i = 0; i < fileNames.length; i++ )
- {
- FileUtils.copyFile( new File( resourcesDir, fileNames[i] ),
- new File( getWorkDirectory(),
fileNames[i] ) );
- }
- }
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error copying EAR resources", e
);
- }
-
// Check if deployment descriptor is there
File ddFile = new File( getWorkDirectory(), APPLICATION_XML_URI );
if ( !ddFile.exists() && ( javaEEVersion.lt( JavaEEVersion.Five ) ) )
