Author: hboutemy
Date: Thu Dec 30 16:21:08 2010
New Revision: 1053930
URL: http://svn.apache.org/viewvc?rev=1053930&view=rev
Log:
detect XML encoding when reading descriptor instead of platform encoding
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java?rev=1053930&r1=1053929&r2=1053930&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
Thu Dec 30 16:21:08 2010
@@ -41,6 +41,7 @@ import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.WriterFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.codehaus.plexus.velocity.VelocityComponent;
import org.dom4j.Document;
@@ -54,7 +55,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
@@ -188,7 +188,7 @@ public class DefaultOldArchetype
throw new ArchetypeDescriptorException( "The " +
ARCHETYPE_DESCRIPTOR + " descriptor cannot be found." );
}
- descriptor = builder.build( new InputStreamReader( is ) );
+ descriptor = builder.build( new XmlStreamReader( is ) );
}
catch ( IOException e )
{
