Author: aheritier
Date: Fri Nov 30 10:28:07 2007
New Revision: 599894
URL: http://svn.apache.org/viewvc?rev=599894&view=rev
Log:
MECLIPSE-359 : Add support for MyEclipse
Sort spring files to have the same behaviour everywhere to fix tests
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/
(props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.springBeans
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java?rev=599894&r1=599893&r2=599894&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
Fri Nov 30 10:28:07 2007
@@ -6,6 +6,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
@@ -124,7 +125,7 @@
*/
private Collection getConfigurationFilesList( String basedir, String
pattern )
{
- Collection configFiles = new ArrayList();
+ ArrayList configFiles = new ArrayList();
try
{
@@ -149,7 +150,8 @@
{
log.error( "Error while retrieving Spring configuration files.
Returning list in current state" );
}
-
+ // Sort them to have something constant
+ Collections.sort( configFiles );
return configFiles;
}
}
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 30 10:28:07 2007
@@ -0,0 +1,4 @@
+.classpath
+.project
+.springBeans
+target
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.springBeans
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.springBeans?rev=599894&r1=599893&r2=599894&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.springBeans
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/expected/.springBeans
Fri Nov 30 10:28:07 2007
@@ -4,10 +4,10 @@
<configExtension>xml</configExtension>
</configExtensions>
<configs>
-
<config>src/main/resources/org/apache/maven/test/applicationContext-baz.xml</config>
<config>src/main/resources/applicationContext-bar.xml</config>
<config>src/main/resources/applicationContext-foo.xml</config>
+
<config>src/main/resources/org/apache/maven/test/applicationContext-baz.xml</config>
</configs>
<configSets/>
<springVersion>2.0</springVersion>
-</beansProjectDescription>
+</beansProjectDescription>
\ No newline at end of file
