Author: fgiust
Date: Wed Apr 5 08:33:13 2006
New Revision: 391639
URL: http://svn.apache.org/viewcvs?rev=391639&view=rev
Log:
partial fix for MECLIPSE-56 (wrong encoding in output files).
test 16 is failing due to MNG-2025 (the test is commented out at the moment)
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/project
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseProjectWriter.java?rev=391639&r1=391638&r2=391639&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
Wed Apr 5 08:33:13 2006
@@ -17,9 +17,11 @@
*/
import java.io.File;
+import java.io.FileOutputStream;
import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -139,11 +141,11 @@
buildCommands.add( iter.next() );
}
- FileWriter w;
+ Writer w;
try
{
- w = new FileWriter( dotProject );
+ w = new OutputStreamWriter( new FileOutputStream( dotProject ),
"UTF-8" );
}
catch ( IOException ex )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=391639&r1=391638&r2=391639&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Wed Apr 5 08:33:13 2006
@@ -140,4 +140,26 @@
props.put( "outputDirectory", "bin" );
testProject( "project-15", props );
}
+
+ //Commented out: failing due to MNG-2025
+ // /**
+ // * UTF8 encoding - MECLIPSE-56
+ // * @throws Exception any exception thrown during test
+ // */
+ // public void testProject16()
+ // throws Exception
+ // {
+ // testProject( "project-16" );
+ // }
+
+ /**
+ * ISO-8859-15 encoding - MECLIPSE-56
+ * @throws Exception any exception thrown during test
+ */
+ public void testProject17()
+ throws Exception
+ {
+ testProject( "project-17" );
+ }
+
}
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/classpath
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/classpath?rev=391639&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/classpath
Wed Apr 5 08:33:13 2006
@@ -0,0 +1,4 @@
+<classpath>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/pom.xml?rev=391639&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/pom.xml
Wed Apr 5 08:33:13 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>eclipse</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-16</artifactId>
+ <version>16</version>
+ <name>maven-eclipse-plugin-test-project-16</name>
+ <description>Test of special characters like ö ä ü à UTF-8
encoded</description>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/project
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/project?rev=391639&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-16/project
Wed Apr 5 08:33:13 2006
@@ -0,0 +1,28 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-16</name>
+ <comment>Test of special characters like ö ä ü à UTF-8 encoded</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilder</name>
+ <arguments/>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments/>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments/>
+ </buildCommand>
+ <buildCommand>
+
<name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver</name>
+ <arguments/>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/classpath
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/classpath?rev=391639&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/classpath
Wed Apr 5 08:33:13 2006
@@ -0,0 +1,4 @@
+<classpath>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/pom.xml?rev=391639&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/pom.xml
Wed Apr 5 08:33:13 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>eclipse</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-17</artifactId>
+ <version>17</version>
+ <name>maven-eclipse-plugin-test-project-17</name>
+ <description>Test of special characters like ö ä ü ß ISO-8859-15
encoded</description>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/projects/project-17/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
