Author: hboutemy
Date: Sat Jan 5 10:48:05 2008
New Revision: 609198
URL: http://svn.apache.org/viewvc?rev=609198&view=rev
Log:
[MECLIPSE-56] added a testcase for non-ascii characters in pom.xml
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.wtpmodules
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=609198&r1=609197&r2=609198&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sat Jan 5 10:48:05 2008
@@ -103,44 +103,38 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.6</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.0.6</version>
+ <version>2.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.6</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0.6</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-embedder</artifactId>
- <version>2.0.1</version>
- <scope>test</scope>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.6</version>
+ <version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.2</version>
+ <version>1.4.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?rev=609198&r1=609197&r2=609198&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
Sat Jan 5 10:48:05 2008
@@ -426,6 +426,15 @@
testProject( "project-37" );
}
+ /**
+ * MECLIPSE-56 : problem with encoding of non-ascii characters in pom.xml
+ */
+ public void testMECLIPSE_56_encoding()
+ throws Exception
+ {
+ testProject( "MECLIPSE-56_encoding" );
+ }
+
public void testProject38()
throws Exception
{
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.classpath?rev=609198&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.classpath
Sat Jan 5 10:48:05 2008
@@ -0,0 +1,4 @@
+<classpath>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.project?rev=609198&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.project
Sat Jan 5 10:48:05 2008
@@ -0,0 +1,24 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-MECLIPSE-56_encoding</name>
+ <comment>Test of non-ascii characters like "ö ä ü Ã"</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ </buildCommand>
+ <buildCommand>
+
<name>org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver</name>
+ </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
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.wtpmodules
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.wtpmodules?rev=609198&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.wtpmodules
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/expected/.wtpmodules
Sat Jan 5 10:48:05 2008
@@ -0,0 +1,7 @@
+<project-modules id="moduleCoreId">
+ <wb-module deploy-name="maven-eclipse-plugin-test-MECLIPSE-56_encoding">
+ <module-type module-type-id="jst.utility">
+ <property name="java-output-path" value="/target/classes"/>
+ </module-type>
+ </wb-module>
+</project-modules>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/pom.xml?rev=609198&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/pom.xml
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
