Author: aheritier
Date: Tue Sep 2 23:56:08 2008
New Revision: 691526
URL: http://svn.apache.org/viewvc?rev=691526&view=rev
Log:
[MECLIPSE-445] myeclipse target doesn't generate spring bean files for
hierarchical projects.
Submitted by: Joe Freeman
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springbeans
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/java/DummyClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicaitonContext-foo.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicationContext-bar.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/test/applicationContext-baz.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/java/DummyTestClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/resources/dummy
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springbeans
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/java/DummyClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicaitonContext-foo.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicationContext-bar.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/org/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/org/apache/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/org/apache/maven/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/org/apache/maven/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/org/apache/maven/test/applicationContext-baz.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/java/DummyTestClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/resources/dummy
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/pom.xml
(with props)
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/main/resources/org/apache/maven/plugin/eclipse/messages.properties
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java
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=691526&r1=691525&r2=691526&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
Tue Sep 2 23:56:08 2008
@@ -66,10 +66,10 @@
public void write()
throws MojoExecutionException
{
- FileWriter w;
+ FileWriter sprintFileWriter;
try
{
- w =
+ sprintFileWriter =
new FileWriter( new File( config.getEclipseProjectDirectory(),
MYECLIPSE_SPRING_CONFIGURATION_FILENAME ) );
}
catch ( IOException ex )
@@ -77,7 +77,7 @@
throw new MojoExecutionException( Messages.getString(
"EclipsePlugin.erroropeningfile" ), ex ); //$NON-NLS-1$
}
- XMLWriter writer = new PrettyPrintXMLWriter( w, "UTF-8", null );
+ XMLWriter writer = new PrettyPrintXMLWriter( sprintFileWriter,
"UTF-8", null );
writer.startElement( MYECLIPSE_SPRING_BEANS_PROJECT_DESCRIPTION );
// Configuration extension
@@ -90,13 +90,23 @@
// Configuration files
writer.startElement( MYECLIPSE_SPRING_CONFIGS );
+ // maven's cwd stays at the top of hierarchical projects so we
+ // do this with full path so it works as we descend through various
modules (projects)
+ String absolutePrefix = config.getEclipseProjectDirectory() + "/";
+ // convert hem all to forward slashes
+ absolutePrefix = StringUtils.replace( absolutePrefix, "\\", "/" );
+ int absolutePrefixLength = absolutePrefix.length();
Iterator onConfigFiles =
- getConfigurationFilesList( (String) springConfig.get( "basedir" ),
+ getConfigurationFilesList( absolutePrefix + (String)
springConfig.get( "basedir" ),
(String) springConfig.get(
"file-pattern" ) ).iterator();
+
while ( onConfigFiles.hasNext() )
{
writer.startElement( MYECLIPSE_SPRING_CONFIG );
- writer.writeText( StringUtils.replace( (String)
onConfigFiles.next(), "\\", "/" ) );
+ // convert out any back slashes
+ String processedFileName = StringUtils.replace( (String)
onConfigFiles.next(), "\\", "/" );
+ // write out the file name minus the absolute path to get to the
top of the project
+ writer.writeText( processedFileName.substring(
absolutePrefixLength ) );
writer.endElement();
}
writer.endElement();
@@ -112,7 +122,7 @@
writer.endElement();
- IOUtil.close( w );
+ IOUtil.close( sprintFileWriter );
}
/**
@@ -130,21 +140,34 @@
try
{
File directory = new File( basedir );
-
- File[] subdirs = directory.listFiles( new FileFilter()
+ if ( directory.exists() )
{
- public boolean accept( File pathname )
+ log.debug( "Scanning " + basedir + " for spring definition
files" );
+ File[] subdirs = directory.listFiles( new FileFilter()
+ {
+ public boolean accept( File pathname )
+ {
+ return pathname.isDirectory();
+ }
+ } );
+
+ if ( subdirs != null )
{
- return pathname.isDirectory();
+ for ( int i = 0; i < subdirs.length; i++ )
+ {
+ configFiles.addAll( getConfigurationFilesList(
subdirs[i].getPath(), pattern ) );
+ }
}
- } );
- for ( int i = 0; i < subdirs.length; i++ )
+ configFiles.addAll( FileUtils.getFileNames( directory,
pattern, null, true ) );
+ }
+ else
{
- configFiles.addAll( getConfigurationFilesList(
subdirs[i].getPath(), pattern ) );
+ // This isn't fatal because sometimes we run this in a nested
set of
+ // projects where some of the projects may not have spring
configuration
+ log.warn( Messages.getString(
"MyEclipseSpringBeansWriter.baseDirDoesNotExist",
+ new Object[] { basedir } ) );
}
-
- configFiles.addAll( FileUtils.getFileNames( directory, pattern,
null, true ) );
}
catch ( IOException ioe )
{
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties?rev=691526&r1=691525&r2=691526&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
Tue Sep 2 23:56:08 2008
@@ -44,3 +44,4 @@
Rad6LibCopier.cantdeletefile=Failed to delete file: {0}
MyEclipseSpringBeansWriter.springVersionNotFound=Spring must be declared in
the project's dependencies to generate .springBeans file.
+MyEclipseSpringBeansWriter.baseDirDoesNotExist=The (basedir) path declared in
the project's dependencies doesn't exist: {0}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java?rev=691526&r1=691525&r2=691526&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java
Tue Sep 2 23:56:08 2008
@@ -13,10 +13,10 @@
*
* @throws Exception
*/
- public void testMyEclipseProject01()
+ public void testProject01()
throws Exception
{
- testMyEclipseProject( "project-myeclipse-01" );
+ testProject( "project-myeclipse-01", null, "myeclipse-clean",
"myeclipse" );
}
/**
@@ -24,10 +24,10 @@
*
* @throws Exception
*/
- public void testMyEclipseProject02()
+ public void testProject02()
throws Exception
{
- testMyEclipseProject( "project-myeclipse-02" );
+ testProject( "project-myeclipse-02", null, "myeclipse-clean",
"myeclipse" );
}
/**
@@ -35,10 +35,10 @@
*
* @throws Exception
*/
- public void testMyEclipseProject03()
+ public void testProject03()
throws Exception
{
- testMyEclipseProject( "project-myeclipse-03" );
+ testProject( "project-myeclipse-03", null, "myeclipse-clean",
"myeclipse" );
}
/**
@@ -46,10 +46,10 @@
*
* @throws Exception
*/
- public void testMyEclipseProject04()
+ public void testProject04()
throws Exception
{
- testMyEclipseProject( "project-myeclipse-04" );
+ testProject( "project-myeclipse-04", null, "myeclipse-clean",
"myeclipse" );
}
/**
@@ -57,15 +57,22 @@
*
* @throws Exception
*/
- public void testMyEclipseProject05()
+ public void testProject05()
throws Exception
{
- testMyEclipseProject( "project-myeclipse-05" );
+ testProject( "project-myeclipse-05", null, "myeclipse-clean",
"myeclipse" );
}
- private void testMyEclipseProject( String project )
+ /**
+ * Verifies spring files created with sub-projects (modules) module-1
should have spring bean files in the
+ * .springBeans file. module-2 should not have spring bean files in the
.springBeans file.
+ *
+ * @throws Exception
+ */
+ public void testProject07MECLIPSE445()
throws Exception
{
- testProject( project, null, "myeclipse-clean", "myeclipse" );
+ testProject( "project-myeclipse-07-MECLIPSE-445", null,
"myeclipse-clean", "myeclipse" );
}
+
}
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath?rev=691526&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
Tue Sep 2 23:56:08 2008
@@ -0,0 +1,8 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java"
output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+ <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/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project?rev=691526&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project
Tue Sep 2 23:56:08 2008
@@ -0,0 +1,17 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-myeclipse-06-MECLIPSE-427</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>com.genuitec.eclipse.springframework.springbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.genuitec.eclipse.springframework.springnature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springbeans
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springbeans?rev=691526&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springbeans
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springbeans
Tue Sep 2 23:56:08 2008
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+ <configExtensions>
+ <configExtension>xml</configExtension>
+ </configExtensions>
+ <configs>
+ <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>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml?rev=691526&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml
Tue Sep 2 23:56:08 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>project-myeclipse-07-MECLIPSE-445</artifactId>
+ <version>1.0</version>
+ </parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-1</artifactId>
+ <version>99.0</version>
+ <packaging>jar</packaging>
+ <name>multymodule-1</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <spring>
+ <version>2.0</version>
+ <file-pattern>applicationContext-*.xml</file-pattern>
+ <basedir>src/main/resources</basedir>
+ </spring>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/java/DummyClass.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/java/DummyClass.txt?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicaitonContext-foo.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicaitonContext-foo.xml?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicaitonContext-foo.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicaitonContext-foo.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicationContext-bar.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicationContext-bar.xml?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicationContext-bar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicationContext-bar.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/test/applicationContext-baz.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/test/applicationContext-baz.xml?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/test/applicationContext-baz.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/test/applicationContext-baz.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/java/DummyTestClass.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/java/DummyTestClass.txt?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/java/DummyTestClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/java/DummyTestClass.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/resources/dummy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/resources/dummy?rev=691526&view=auto
==============================================================================
(empty)
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath?rev=691526&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
Tue Sep 2 23:56:08 2008
@@ -0,0 +1,8 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java"
output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+ <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/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project?rev=691526&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project
Tue Sep 2 23:56:08 2008
@@ -0,0 +1,17 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-myeclipse-06-MECLIPSE-427</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>com.genuitec.eclipse.springframework.springbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.genuitec.eclipse.springframework.springnature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springbeans
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springbeans?rev=691526&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springbeans
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springbeans
Tue Sep 2 23:56:08 2008
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+ <configExtensions>
+ <configExtension>xml</configExtension>
+ </configExtensions>
+ <configs/>
+ <configSets/>
+ <springVersion>2.0</springVersion>
+</beansProjectDescription>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml?rev=691526&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml
Tue Sep 2 23:56:08 2008
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>project-myeclipse-07-MECLIPSE-445</artifactId>
+ <version>1.0</version>
+ </parent>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-2</artifactId>
+ <version>99.0</version>
+ <packaging>jar</packaging>
+ <name>multymodule-2</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <spring>
+ <version>2.0</version>
+ <file-pattern>applicationContext-*.xml</file-pattern>
+ <basedir>src/main/doesnt-exist</basedir>
+ </spring>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/java/DummyClass.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/java/DummyClass.txt?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicaitonContext-foo.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicaitonContext-foo.xml?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicaitonContext-foo.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicaitonContext-foo.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicationContext-bar.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicationContext-bar.xml?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicationContext-bar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicationContext-bar.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/org/apache/maven/test/applicationContext-baz.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/org/apache/maven/test/applicationContext-baz.xml?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/org/apache/maven/test/applicationContext-baz.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/org/apache/maven/test/applicationContext-baz.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/java/DummyTestClass.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/java/DummyTestClass.txt?rev=691526&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/java/DummyTestClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/java/DummyTestClass.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/resources/dummy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/test/resources/dummy?rev=691526&view=auto
==============================================================================
(empty)
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/pom.xml?rev=691526&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/pom.xml
Tue Sep 2 23:56:08 2008
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <packaging>pom</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>project-myeclipse-07-MECLIPSE-445</artifactId>
+ <version>1.0</version>
+ <name>Project MyEclipse 07</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <workspace>${basedir}</workspace>
+ <projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
+ <wtpmanifest>true</wtpmanifest>
+ <wtpapplicationxml>true</wtpapplicationxml>
+ <wtpversion>2.0</wtpversion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>multymodule-1</module>
+ <module>multymodule-2</module>
+ </modules>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
