brett 2004/04/03 18:48:03
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtils.java
Log:
PR: MAVEN-1050
Submitted by: Shinsuke SUGAYA
Use system file encoding for POM
Revision Changes Path
No revision
No revision
1.107.4.17 +3 -11 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.107.4.16
retrieving revision 1.107.4.17
diff -u -r1.107.4.16 -r1.107.4.17
--- MavenUtils.java 2 Apr 2004 23:37:19 -0000 1.107.4.16
+++ MavenUtils.java 4 Apr 2004 02:48:03 -0000 1.107.4.17
@@ -81,9 +81,6 @@
/** Log. */
private static final Log log = LogFactory.getLog( MavenUtils.class );
- /** Internal encoding used for Jelly interpolation. */
- private static final String INTERNAL_ENCODING = "ISO-8859-1";
-
/** we want to parse something */
private static final ThreadLocal xmlReaderPool = new ThreadLocal();
@@ -423,10 +420,7 @@
beanWriter.setWriteIDs( true );
beanWriter.write( project );
- // We do not care what the original encoding was originally. This
- // is all completely internal. Our StringInputStream requires
- // everything to be encoded in "ISO-8859-1".
- return projectStream.toString( INTERNAL_ENCODING );
+ return projectStream.toString( System.getProperty( "file.encoding" ) );
}
/**
@@ -718,7 +712,7 @@
* @return The generated maven based on the contents of the standard maven
* properties files.
*/
- public static MavenJellyContext createContext( File descriptorDirectory,
+ public static MavenJellyContext createContext( File descriptorDirectory,
MavenJellyContext parentContext )
{
// System properties
@@ -758,8 +752,6 @@
// child's context values into the jelly context because we want the
// child values to win and only use the parent in the event the
// child cannot provide the value.
-
- // TODO: need an exception for those specified on the command line
if ( parentContext != null )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
