svn commit: r563672 - in /maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging: AbstractWarPackagingTask.java WarProjectPackagingTask.java

[snicoll]

Author: snicoll
Date: Tue Aug  7 14:56:53 2007
New Revision: 563672

URL: http://svn.apache.org/viewvc?view=rev&rev=563672
Log:
- Integrated web.xml and container config to the main copy system.

Modified:
    
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
    
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java

Modified: 
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?view=diff&rev=563672&r1=563671&r2=563672
==============================================================================
--- 
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
 (original)
+++ 
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
 Tue Aug  7 14:56:53 2007
@@ -290,8 +290,8 @@
      * @throws IOException if <code>source</code> does not exist, 
<code>destination</code> cannot
      *                     be written to, or an IO error occurs during copying
      */
-    private boolean copyFile( WarPackagingContext context, File source, File 
destination, String targetFilename,
-                              boolean onlyIfModified )
+    protected boolean copyFile( WarPackagingContext context, File source, File 
destination, String targetFilename,
+                                boolean onlyIfModified )
         throws IOException
     {
         if ( onlyIfModified && destination.lastModified() >= 
source.lastModified() )

Modified: 
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?view=diff&rev=563672&r1=563671&r2=563672
==============================================================================
--- 
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
 (original)
+++ 
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
 Tue Aug  7 14:56:53 2007
@@ -187,15 +187,15 @@
                 }
 
                 //rename to web.xml
-                //TODO refactor this
-                copyFileIfModified( webXml, new File( webinfDir, "web.xml" ) );
+                copyFile( context, webXml, new File( webinfDir, "web.xml" ), 
"WEB-INF/web.xml", true );
                 context.getWebappStructure().getFullStructure().add( 
WEB_INF_PATH + "/web.xml" );
             }
 
             if ( containerConfigXML != null && StringUtils.isNotEmpty( 
containerConfigXML.getName() ) )
             {
                 String xmlFileName = containerConfigXML.getName();
-                copyFileIfModified( containerConfigXML, new File( metainfDir, 
xmlFileName ) );
+                copyFile( context, containerConfigXML, new File( metainfDir, 
xmlFileName ), "META-INF/" + xmlFileName,
+                          true );
                 context.getWebappStructure().getFullStructure().add( 
META_INF_PATH + "/" + xmlFileName );
             }
         }