Author: aheritier
Date: Fri Feb 15 03:57:07 2008
New Revision: 628030
URL: http://svn.apache.org/viewvc?rev=628030&view=rev
Log:
MECLIPSE-390 : myeclipse goal ignores additionalConfig
Patch submitted by Julien Jakubowski
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/checkstyle-config.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_content
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_file
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_url
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/java/DummyClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/test/applicationContext-persistence.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/java/DummyTestClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/resources/dummy
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=628030&r1=628029&r2=628030&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Fri Feb 15 03:57:07 2008
@@ -950,6 +950,15 @@
// So the .project file must be written AFTER those have run!
new EclipseProjectWriter().init( getLog(), config ).write();
+ writeAdditionalConfig();
+
+ getLog().info( Messages.getString( "EclipsePlugin.wrote", new Object[]
{ //$NON-NLS-1$
+ config.getEclipseProjectName(),
eclipseProjectDir.getAbsolutePath() } ) );
+ }
+
+ protected void writeAdditionalConfig()
+ throws MojoExecutionException
+ {
if ( additionalConfig != null )
{
for ( int j = 0; j < additionalConfig.length; j++ )
@@ -1006,9 +1015,6 @@
}
}
-
- getLog().info( Messages.getString( "EclipsePlugin.wrote", new Object[]
{ //$NON-NLS-1$
- config.getEclipseProjectName(),
eclipseProjectDir.getAbsolutePath() } ) );
}
protected EclipseWriterConfig createEclipseWriterConfig( IdeDependency[]
deps )
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java?rev=628030&r1=628029&r2=628030&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MyEclipsePlugin.java
Fri Feb 15 03:57:07 2008
@@ -139,6 +139,8 @@
new EclipseProjectWriter().init( getLog(), config ).write();
+ writeAdditionalConfig();
+
// the MyEclipse part ...
new MyEclipseMetadataWriter().init( getLog(), config ).write();
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java?rev=628030&r1=628029&r2=628030&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.java
Fri Feb 15 03:57:07 2008
@@ -52,6 +52,17 @@
testMyEclipseProject( "project-myeclipse-04" );
}
+ /**
+ * Simple project with additionalConfig
+ *
+ * @throws Exception
+ */
+ public void testMyEclipseProject05()
+ throws Exception
+ {
+ testMyEclipseProject( "project-myeclipse-05" );
+ }
+
private void testMyEclipseProject( String project )
throws Exception
{
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/checkstyle-config.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/checkstyle-config.xml?rev=628030&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/checkstyle-config.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/checkstyle-config.xml
Fri Feb 15 03:57:07 2008
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle-configurations file-format-version="5.0.0"/>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/checkstyle-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/checkstyle-config.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_content
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_content?rev=628030&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_content
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_content
Fri Feb 15 03:57:07 2008
@@ -0,0 +1,6 @@
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <fileset name="all" enabled="true" check-config-name="acme corporate style"
local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+ <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_file
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_file?rev=628030&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_file
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_file
Fri Feb 15 03:57:07 2008
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle-configurations file-format-version="5.0.0"/>
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_url
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_url?rev=628030&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_url
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_url
Fri Feb 15 03:57:07 2008
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle-configurations file-format-version="5.0.0"/>
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath?rev=628030&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath
Fri Feb 15 03:57:07 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-05/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.project?rev=628030&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.project
Fri Feb 15 03:57:07 2008
@@ -0,0 +1,13 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-myeclipse-05</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.project
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/pom.xml?rev=628030&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/pom.xml
Fri Feb 15 03:57:07 2008
@@ -0,0 +1,53 @@
+<?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>
+ <groupId>eclipse</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-myeclipse-05</artifactId>
+ <version>99.0</version>
+ <packaging>jar</packaging>
+ <name>Projet MyEclipse 05</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <additionalConfig>
+ <file>
+ <name>.checkstyle_content</name>
+ <content>
+ <![CDATA[<fileset-config file-format-version="1.2.0"
simple-config="true">
+ <fileset name="all" enabled="true" check-config-name="acme corporate style"
local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+ <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>]]>
+ </content>
+ </file>
+ <file>
+ <name>.checkstyle_file</name>
+ <location>/checkstyle-config.xml</location>
+ </file>
+ <file>
+ <name>.checkstyle_url</name>
+ <url>
+
https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/checkstyle-config.xml
+ </url>
+ </file>
+ </additionalConfig>
+ </configuration>
+ <dependencies>
+ <!-- Used to find the file from a location -->
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>checkstyle-config</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/java/DummyClass.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/java/DummyClass.txt?rev=628030&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/test/applicationContext-persistence.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/test/applicationContext-persistence.xml?rev=628030&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/test/applicationContext-persistence.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/test/applicationContext-persistence.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/java/DummyTestClass.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/java/DummyTestClass.txt?rev=628030&view=auto
==============================================================================
(empty)
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/java/DummyTestClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/java/DummyTestClass.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/resources/dummy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/resources/dummy?rev=628030&view=auto
==============================================================================
(empty)
