Author: hboutemy
Date: Tue Oct 23 11:05:53 2007
New Revision: 587580
URL: http://svn.apache.org/viewvc?rev=587580&view=rev
Log:
use UTF-8 instead of platform encoding when writing XML files
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
Tue Oct 23 11:05:53 2007
@@ -19,8 +19,10 @@
package org.apache.maven.plugin.eclipse;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -406,7 +408,7 @@
private void writeArtifact( EclipseOsgiPlugin plugin, Model model,
ArtifactRepository remoteRepo )
throws MojoExecutionException
{
- FileWriter fw = null;
+ Writer fw = null;
ArtifactMetadata metadata = null;
File pomFile = null;
Artifact pomArtifact = artifactFactory.createArtifact(
model.getGroupId(), model.getArtifactId(), model
@@ -417,7 +419,9 @@
{
pomFile = File.createTempFile( "pom-", ".xml" );
- fw = new FileWriter( pomFile );
+ // TODO use WriterFactory.newXmlWriter() when plexus-utils is
upgraded to 1.4.5+
+ fw = new OutputStreamWriter( new FileOutputStream( pomFile ),
"UTF-8" );
+ model.setModelEncoding( "UTF-8" ); // to be removed when encoding
is detected instead of forced to UTF-8
pomFile.deleteOnExit();
new MavenXpp3Writer().write( fw, model );
metadata = new ProjectArtifactMetadata( pomArtifact, pomFile );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
Tue Oct 23 11:05:53 2007
@@ -19,8 +19,10 @@
package org.apache.maven.plugin.eclipse.writers;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -124,11 +126,11 @@
throws MojoExecutionException
{
- FileWriter w;
+ Writer w;
try
{
- w = new FileWriter( new File( config.getEclipseProjectDirectory(),
FILE_DOT_CLASSPATH ) );
+ w = new OutputStreamWriter( new FileOutputStream( new File(
config.getEclipseProjectDirectory(), FILE_DOT_CLASSPATH ) ), "UTF-8" );
}
catch ( IOException ex )
{
@@ -240,8 +242,9 @@
try
{
- FileWriter buildXmlWriter = new FileWriter( new File(
config.getEclipseProjectDirectory(),
-
"maven-eclipse.xml" ) );
+ Writer buildXmlWriter =
+ new OutputStreamWriter( new FileOutputStream( new File(
config.getEclipseProjectDirectory(),
+
"maven-eclipse.xml" ) ), "UTF-8" );
PrettyPrintXMLWriter buildXmlPrinter = new
PrettyPrintXMLWriter( buildXmlWriter );
buildXmlPrinter.startElement( "project" );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
Tue Oct 23 11:05:53 2007
@@ -17,7 +17,6 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.PrintWriter;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
@@ -25,8 +24,6 @@
import java.util.jar.Attributes;
import java.util.jar.Manifest;
-import org.apache.maven.archiver.ManifestConfiguration;
-import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.eclipse.Constants;
@@ -34,7 +31,6 @@
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.writers.wtp.AbstractWtpResourceWriter;
import org.apache.maven.plugin.ide.IdeDependency;
-import org.apache.maven.plugin.ide.IdeUtils;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
Tue Oct 23 11:05:53 2007
@@ -20,10 +20,13 @@
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.util.Arrays;
import org.apache.maven.plugin.MojoExecutionException;
@@ -89,11 +92,11 @@
}
StringBuffer manifestSb = rewriteManifest( config.getManifestFile() );
- FileWriter fos = null;
+ Writer out = null;
try
{
- fos = new FileWriter( config.getManifestFile() );
- fos.write( manifestSb.toString() );
+ out = new OutputStreamWriter( new FileOutputStream(
config.getManifestFile() ), "UTF-8" );
+ out.write( manifestSb.toString() );
}
catch ( FileNotFoundException e )
{
@@ -107,7 +110,7 @@
}
finally
{
- IOUtil.close( fos );
+ IOUtil.close( out );
}
}
@@ -120,7 +123,7 @@
StringBuffer manifestSb = new StringBuffer();
try
{
- BufferedReader in = new BufferedReader( new FileReader(
manifestFile ) );
+ BufferedReader in = new BufferedReader( new InputStreamReader( new
FileInputStream( manifestFile ), "UTF-8" ) );
String line;
while ( ( line = in.readLine() ) != null )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
Tue Oct 23 11:05:53 2007
@@ -19,10 +19,12 @@
package org.apache.maven.plugin.eclipse.writers;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.io.Reader;
import java.io.Writer;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -94,10 +96,10 @@
log.info( Messages.getString( "EclipsePlugin.keepexisting",
dotProject.getAbsolutePath() ) ); //$NON-NLS-1$
// parse existing file in order to keep manually-added entries
- FileReader reader = null;
+ Reader reader = null;
try
{
- reader = new FileReader( dotProject );
+ reader = new InputStreamReader( new FileInputStream(
dotProject ), "UTF-8" );
Xpp3Dom dom = Xpp3DomBuilder.build( reader );
Xpp3Dom naturesElement = dom.getChild( ELT_NATURES );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
Tue Oct 23 11:05:53 2007
@@ -19,10 +19,14 @@
package org.apache.maven.plugin.eclipse.writers.rad;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
@@ -376,8 +380,8 @@
{
try
{
- FileReader reader1 = new FileReader( xmlFile );
- Xpp3Dom applicationXmlDom = Xpp3DomBuilder.build( reader1 );
+ Reader reader = new InputStreamReader( new FileInputStream(
xmlFile ), "UTF-8" );
+ Xpp3Dom applicationXmlDom = Xpp3DomBuilder.build( reader );
return applicationXmlDom;
}
catch ( FileNotFoundException e )
@@ -506,7 +510,7 @@
}
/**
- * Find the contextRoot specified in the pom and convert it into
contectroot for the application.xml.
+ * Find the contextRoot specified in the pom and convert it into
contextroot for the application.xml.
*
* @param artifactId
* the artifactid to search
@@ -540,11 +544,11 @@
log.info( Messages.getString( "EclipseCleanMojo.unchanged",
xmlFile.getAbsolutePath() ) );
return;
}
- FileWriter w = null;
+ Writer w = null;
xmlFile.getParentFile().mkdirs();
try
{
- w = new FileWriter( xmlFile );
+ w = new OutputStreamWriter( new FileOutputStream( xmlFile ),
"UTF-8" );
}
catch ( IOException ex )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadEjbClasspathWriter.java
Tue Oct 23 11:05:53 2007
@@ -19,10 +19,14 @@
package org.apache.maven.plugin.eclipse.writers.rad;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
import java.util.Arrays;
import java.util.Comparator;
@@ -101,7 +105,6 @@
{
return;
}
- FileWriter w;
Xpp3Dom classpath = readXMLFile( classpathFile );
Xpp3Dom[] children = classpath.getChildren();
for ( int index = 0; index < children.length; index++ )
@@ -135,9 +138,10 @@
removeDupicateWAS6Libs( classpath );
classpath = orderClasspath( classpath );
+ Writer w;
try
{
- w = new FileWriter( classpathFile );
+ w = new OutputStreamWriter( new FileOutputStream(
classpathFile ), "UTF-8" );
}
catch ( IOException ex )
{
@@ -244,8 +248,8 @@
{
try
{
- FileReader reader1 = new FileReader( xmlFile );
- Xpp3Dom applicationXmlDom = Xpp3DomBuilder.build( reader1 );
+ Reader reader = new InputStreamReader( new FileInputStream(
xmlFile ), "UTF-8" );
+ Xpp3Dom applicationXmlDom = Xpp3DomBuilder.build( reader );
return applicationXmlDom;
}
catch ( FileNotFoundException e )
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadJ2EEWriter.java
Tue Oct 23 11:05:53 2007
@@ -19,8 +19,10 @@
package org.apache.maven.plugin.eclipse.writers.rad;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
@@ -66,7 +68,7 @@
*/
public void write() throws MojoExecutionException
{
- FileWriter w;
+ Writer w;
String packaging = config.getPackaging();
if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase( packaging )
@@ -75,7 +77,7 @@
{
try
{
- w = new FileWriter( new File(
config.getEclipseProjectDirectory(), J2EE_FILENAME ) );
+ w = new OutputStreamWriter( new FileOutputStream( new File(
config.getEclipseProjectDirectory(), J2EE_FILENAME ) ), "UTF-8" );
}
catch ( IOException ex )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
Tue Oct 23 11:05:53 2007
@@ -19,8 +19,10 @@
package org.apache.maven.plugin.eclipse.writers.rad;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.eclipse.Constants;
@@ -98,12 +100,12 @@
public void write()
throws MojoExecutionException
{
- FileWriter w;
+ Writer w;
if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase(
config.getPackaging() ) )
{
try
{
- w = new FileWriter( new File(
config.getEclipseProjectDirectory(), WEBSETTINGS_FILENAME ) );
+ w = new OutputStreamWriter( new FileOutputStream( new File(
config.getEclipseProjectDirectory(), WEBSETTINGS_FILENAME ) ), "UTF-8" );
}
catch ( IOException ex )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebsiteConfigWriter.java
Tue Oct 23 11:05:53 2007
@@ -19,8 +19,10 @@
package org.apache.maven.plugin.eclipse.writers.rad;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
@@ -29,7 +31,6 @@
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
import org.apache.maven.plugin.eclipse.writers.wtp.AbstractWtpResourceWriter;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
import org.codehaus.plexus.util.xml.XMLWriter;
@@ -65,12 +66,12 @@
*/
public void write() throws MojoExecutionException
{
- FileWriter w;
+ Writer w;
if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase(
config.getPackaging() ) )
{
try
{
- w = new FileWriter( new File(
config.getEclipseProjectDirectory(), WEBSITE_CONFIG_FILENAME ) );
+ w = new OutputStreamWriter( new FileOutputStream( new File(
config.getEclipseProjectDirectory(), WEBSITE_CONFIG_FILENAME ) ), "UTF-8" );
}
catch ( IOException ex )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
Tue Oct 23 11:05:53 2007
@@ -19,7 +19,6 @@
package org.apache.maven.plugin.eclipse.writers.wtp;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
@@ -28,11 +27,8 @@
import org.apache.maven.plugin.ide.JeeUtils;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.xml.XMLWriter;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
-import java.util.Iterator;
-import java.util.List;
/**
* Base class to hold common constants used by extending classes.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
Tue Oct 23 11:05:53 2007
@@ -1,10 +1,14 @@
package org.apache.maven.plugin.eclipse.writers.wtp;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
@@ -365,8 +369,8 @@
*/
private Xpp3Dom readXMLFile(File xmlFile) {
try {
- FileReader reader1 = new FileReader(xmlFile);
- Xpp3Dom applicationXmlDom =
Xpp3DomBuilder.build(reader1);
+ Reader reader = new InputStreamReader( new FileInputStream(
xmlFile ), "UTF-8" );
+ Xpp3Dom applicationXmlDom = Xpp3DomBuilder.build( reader );
return applicationXmlDom;
} catch (FileNotFoundException e) {
return null;
@@ -500,10 +504,10 @@
this.log.info("Rad6CleanMojo.unchanged" +
xmlFile.getAbsolutePath());
return;
}
- FileWriter w = null;
+ Writer w = null;
xmlFile.getParentFile().mkdirs();
try {
- w = new FileWriter(xmlFile);
+ w = new OutputStreamWriter( new
FileOutputStream(xmlFile), "UTF-8" );
} catch (IOException ex) {
throw new
MojoExecutionException("Rad6Plugin.erroropeningfile", ex); //$NON-NLS-1$
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpComponentWriter.java
Tue Oct 23 11:05:53 2007
@@ -28,8 +28,10 @@
import org.codehaus.plexus.util.xml.XMLWriter;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
/**
* Creates a .settings folder for Eclipse WTP 1.x release and writes out the
configuration under it.
@@ -81,10 +83,10 @@
File settingsDir = new File( config.getEclipseProjectDirectory(),
DIR_WTP_SETTINGS );
settingsDir.mkdirs();
- FileWriter w;
+ Writer w;
try
{
- w = new FileWriter( new File( settingsDir, getComponentFileName()
) );
+ w = new OutputStreamWriter( new FileOutputStream( new File(
settingsDir, getComponentFileName() ) ), "UTF-8" );
}
catch ( IOException ex )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpFacetsWriter.java
Tue Oct 23 11:05:53 2007
@@ -27,8 +27,10 @@
import org.codehaus.plexus.util.xml.XMLWriter;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.util.Iterator;
import java.util.Map.Entry;
@@ -84,14 +86,14 @@
File settingsDir = new File( config.getEclipseProjectDirectory(),
DIR_WTP_SETTINGS );
settingsDir.mkdirs();
- FileWriter w;
+ Writer w;
String packaging = config.getPackaging();
// Write out facet core xml
try
{
- w = new FileWriter( new File( settingsDir, FILE_FACET_CORE_XML ) );
+ w = new OutputStreamWriter( new FileOutputStream( new File(
settingsDir, FILE_FACET_CORE_XML ) ), "UTF-8" );
}
catch ( IOException ex )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpmodulesWriter.java
Tue Oct 23 11:05:53 2007
@@ -27,8 +27,10 @@
import org.codehaus.plexus.util.xml.XMLWriter;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
/**
* Writes eclipse .wtpmodules file.
@@ -48,11 +50,11 @@
public void write()
throws MojoExecutionException
{
- FileWriter w;
+ Writer w;
try
{
- w = new FileWriter( new File( config.getEclipseProjectDirectory(),
FILE_DOT_WTPMODULES ) );
+ w = new OutputStreamWriter( new FileOutputStream( new File(
config.getEclipseProjectDirectory(), FILE_DOT_WTPMODULES ) ), "UTF-8" );
}
catch ( IOException ex )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java?rev=587580&r1=587579&r2=587580&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Tue Oct 23 11:05:53 2007
@@ -19,7 +19,8 @@
package org.apache.maven.plugin.eclipse;
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -128,10 +129,10 @@
new File( basedir, "project-rad-1/maven-core-98.0.jar"
).exists() );
Xpp3Dom applicationXml =
- Xpp3DomBuilder.build( new FileReader( new File( basedir,
"project-rad-1/META-INF/application.xml" ) ) );
+ Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream(
new File( basedir, "project-rad-1/META-INF/application.xml" ) ), "UTF-8" ) );
Xpp3Dom modulesmapsXml =
- Xpp3DomBuilder.build( new FileReader( new File( basedir,
"project-rad-1/META-INF/.modulemaps" ) ) );
+ Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream(
new File( basedir, "project-rad-1/META-INF/.modulemaps" ) ), "UTF-8" ) );
assertNotNull( modulesmapsXml );
@@ -148,7 +149,7 @@
assertEquals( "project-rad-5_3.jar", ejbModule.getChild( "ejb"
).getValue() );
Xpp3Dom websettings =
- Xpp3DomBuilder.build( new FileReader( new File( basedir,
"project-rad-2/.websettings" ) ) );
+ Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream(
new File( basedir, "project-rad-2/.websettings" ) ), "UTF-8" ) );
assertEquals( "project-rad-5_4.jar",
websettings.getChild( "lib-modules" ).getChild(
"lib-module" ).getChild( "jar" ).getValue() );
@@ -215,7 +216,7 @@
File application = new File( basedir,
"project-rad-1/META-INF/application.xml" );
- Xpp3Dom applicationXml = Xpp3DomBuilder.build( new FileReader(
application ) );
+ Xpp3Dom applicationXml = Xpp3DomBuilder.build( new InputStreamReader(
new FileInputStream( application ), "UTF-8" ) );
Xpp3Dom[] children = applicationXml.getChildren( "module" );
