Author: epunzalan
Date: Sun Mar 19 22:00:57 2006
New Revision: 387143
URL: http://svn.apache.org/viewcvs?rev=387143&view=rev
Log:
Reverting MWAR-26
Maven 2.0.3 uses plexus-utils-1.1.jar in its lib. This overrides the version
used in maven-war-plugin (which is version 1.2-SNAPSHOT) for this patch.
Should be re-applied when Maven uses 1.2 already
Modified:
maven/plugins/trunk/maven-war-plugin/pom.xml
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=387143&r1=387142&r2=387143&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Sun Mar 19 22:00:57 2006
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=387143&r1=387142&r2=387143&view=diff
==============================================================================
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Sun Mar 19 22:00:57 2006
@@ -321,7 +321,7 @@
String[] fileNames = getWarFiles( sourceDirectory );
for ( int i = 0; i < fileNames.length; i++ )
{
- FileUtils.copyFileIfModified( new File( sourceDirectory,
fileNames[i] ),
+ FileUtils.copyFile( new File( sourceDirectory,
fileNames[i] ),
new File( webappDirectory,
fileNames[i] ) );
}
}
@@ -337,7 +337,7 @@
{
File metainfDir = new File( webappDirectory, META_INF );
String xmlFileName = new File( containerConfigXML ).getName();
- FileUtils.copyFileIfModified( new File( containerConfigXML ),
new File( metainfDir, xmlFileName ) );
+ FileUtils.copyFile( new File( containerConfigXML ), new File(
metainfDir, xmlFileName ) );
}
}
}
@@ -383,11 +383,11 @@
String type = artifact.getType();
if ( "tld".equals( type ) )
{
- FileUtils.copyFileToDirectoryIfModified(
artifact.getFile(), tldDirectory );
+ FileUtils.copyFileToDirectory( artifact.getFile(),
tldDirectory );
}
else if ( "jar".equals( type ) || "ejb".equals( type ) ||
"ejb-client".equals( type ) )
{
- FileUtils.copyFileToDirectoryIfModified(
artifact.getFile(), libDirectory );
+ FileUtils.copyFileToDirectory( artifact.getFile(),
libDirectory );
}
else if ( "par".equals( type ) )
{
@@ -396,7 +396,7 @@
getLog().debug( "Copying " + artifact.getFile() + " to " +
new File( libDirectory, newName ) );
- FileUtils.copyFileIfModified( artifact.getFile(), new
File( libDirectory, newName ) );
+ FileUtils.copyFile( artifact.getFile(), new File(
libDirectory, newName ) );
}
else if ( "war".equals( type ) )
{
@@ -528,7 +528,7 @@
try
{
targetFile.getParentFile().mkdirs();
- FileUtils.copyFileIfModified( new File( srcDir, files[j]
), targetFile );
+ FileUtils.copyFile( new File( srcDir, files[j] ),
targetFile );
}
catch ( IOException e )
{
