You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/08/05 22:25:14 UTC
svn commit: r682928 - in
/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging:
AbstractWarPackagingTask.java WarProjectPackagingTask.java
Author: hboutemy
Date: Tue Aug 5 13:25:14 2008
New Revision: 682928
URL: http://svn.apache.org/viewvc?rev=682928&view=rev
Log:
o use fixed UTF-8 encoding when filtering XML files (TODO: encoding detection)
o added a TODO when filtering misc files (platform encoding actually used)
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=682928&r1=682927&r2=682928&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java Tue Aug 5 13:25:14 2008
@@ -210,6 +210,7 @@
{
// fix for MWAR-36, ensures that the parent dir are created first
targetFile.getParentFile().mkdirs();
+ // TODO: add encoding support (null mean platform encoding)
context.getMavenFileFilter().copyFile( file, targetFile, true, context.getFilterWrappers(), null );
}
catch ( MavenFilteringException e )
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=682928&r1=682927&r2=682928&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java Tue Aug 5 13:25:14 2008
@@ -220,8 +220,9 @@
}
if ( context.isFilteringDeploymentDescriptors() )
{
+ // TODO: web.xml encoding can be different from UTF-8
context.getMavenFileFilter().copyFile( webXml, new File( webinfDir, "web.xml" ), true,
- context.getFilterWrappers(), null );
+ context.getFilterWrappers(), "UTF-8" );
}
else
{
@@ -237,8 +238,9 @@
// if exists we can filter it
if ( defaultWebXml.exists() && context.isFilteringDeploymentDescriptors() )
{
+ // TODO: web.xml encoding can be different from UTF-8
context.getMavenFileFilter().copyFile( defaultWebXml, new File( webinfDir, "web.xml" ), true,
- context.getFilterWrappers(), null );
+ context.getFilterWrappers(), "UTF-8" );
context.getWebappStructure().getFullStructure().add( WEB_INF_PATH + "/web.xml" );
}
}
@@ -248,13 +250,14 @@
String xmlFileName = containerConfigXML.getName();
if ( context.isFilteringDeploymentDescriptors() )
{
+ // TODO: XML config file encoding can be different from UTF-8
context.getMavenFileFilter().copyFile( containerConfigXML, new File( metainfDir, xmlFileName ),
- true, context.getFilterWrappers(), null );
+ true, context.getFilterWrappers(), "UTF-8" );
}
else
{
- copyFile( context, containerConfigXML, new File( metainfDir, xmlFileName ), "META-INF/" + xmlFileName,
- true );
+ copyFile( context, containerConfigXML, new File( metainfDir, xmlFileName ),
+ "META-INF/" + xmlFileName, true );
}
context.getWebappStructure().getFullStructure().add( META_INF_PATH + "/" + xmlFileName );
}