svn commit: r779828 - in /maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting: ./ jdk-being-used-is-different-than-expected.apt
Author: baerrach Date: Fri May 29 03:40:03 2009 New Revision: 779828 URL: http://svn.apache.org/viewvc?rev=779828&view=rev Log: (empty) Added: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt (with props) Added: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt?rev=779828&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt Fri May 29 03:40:03 2009 @@ -0,0 +1,53 @@ + -- + The JDK is being used is different than expected. + -- + Barrie Treloar + -- + 24 April 2009 + -- + +Summary + + After running <<>> your project's are using a different JDK than expected. + +Checklist + +* Correct version of Java source specified in <<>>? + + For example, setting the source to 1.6 compliance? + ++--- + + maven-compiler-plugin + + 1.6 + 1.6 + + ++--- + +* The default JDK defined in eclipse matches what you expect? + + In eclipse's preferences check Java > Installed JREs and that the selected one is the version you expect. + +* The Execution Environment for the expected version is bound in eclipse preferences? + + In eclipse's preferences check Java > Installed JREs > Execution Environment has a bound value for compatible JREs. + + For example, JavaSE-1.6 should have "perfect match" or an Installed JRE selected as being compatible. + +* The <<<.claspath>>> specifies the correct Java container? + + Open the <<<.classpath>>> file and look for the <<<>> entry. + + It should either be using the default JRE: + ++--- + ++--- + + Or it should be a specified execution environment: + ++--- + ++--- \ No newline at end of file Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt -- svn:keywords = Author Date Id Revision
svn commit: r779831 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.j
Author: baerrach
Date: Fri May 29 04:00:14 2009
New Revision: 779831
URL: http://svn.apache.org/viewvc?rev=779831&view=rev
Log:
[MECLIPSE-551] regression - Resources are excluded if resource dir equals
source dir
Added unit tests for merging of include/exclude.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java?rev=779831&r1=779830&r2=779831&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
Fri May 29 04:00:14 2009
@@ -265,8 +265,8 @@
buffer.append( path );
buffer.append( ": " );
buffer.append( "output=" ).append( output ).append( ", " );
-buffer.append( "include=" ).append( include ).append( ", " );
-buffer.append( "exclude=" ).append( exclude ).append( ", " );
+buffer.append( "include=[" ).append( getIncludeAsString() ).append(
"], " );
+buffer.append( "exclude=[" ).append( getExcludeAsString() ).append(
"], " );
buffer.append( "test=" ).append( test ).append( ", " );
buffer.append( "filtering=" ).append( filtering );
return buffer.toString();
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java?rev=779831&r1=779830&r2=779831&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseSourceDirTest.java
Fri May 29 04:00:14 2009
@@ -72,9 +72,43 @@
src_main_java.merge( src_main_resources );
assertEquals( "source /src/main/java: output=null, include=[],
exclude=[], test=false, filtering=false", src_main_java.toString());
+}
+
+public void testMerge_two_resource_directories() throws Exception {
+EclipseSourceDir resource1 = testFixture_src_main_resources();
+EclipseSourceDir resource2 = testFixture_src_main_resources();
+
+resource1.getInclude().add( "**/*.txt" );
+resource1.getExclude().add( "**/*.svn" );
+
+resource2.getInclude().add( "**/*.xml" );
+resource2.getExclude().add( "**/*.cvs" );
+
+resource1.merge( resource2 );
+
+assertEquals( "resource /src/main/resources: output=target/classes,
include=[**/*.txt|**/*.xml], exclude=[**/*.java|**/*.svn|**/*.cvs], test=false,
filtering=false", resource1.toString());
+}
+
+public void testMerge_two_resource_directories_with_duplicates() throws
Exception {
+EclipseSourceDir resource1 = testFixture_src_main_resources();
+EclipseSourceDir resource2 = testFixture_src_main_resources();
+
+resource1.getInclude().add( "**/*.dup" );
+resource1.getInclude().add( "**/*.txt" );
+resource1.getExclude().add( "**/*.svn" );
+resource1.getExclude().add( "**/*~" );
+
+resource2.getInclude().add( "**/*.xml" );
+resource2.getInclude().add( "**/*.dup" );
+resource2.getExclude().add( "**/*.cvs" );
+resource2.getExclude().add( "**/*~" );
+resource1.merge( resource2 );
+
+assertEquals( "resource /src/main/resources: output=target/classes,
include=[**/*.dup|**/*.txt|**/*.xml],
exclude=[**/*.java|**/*.svn|**/*~|**/*.cvs], test=false, filtering=false",
resource1.toString());
}
+
public void testToString_src_main_java()
{
EclipseSourceDir objectUnderTest = testFixture_src_main_java();
svn commit: r781192 - in /maven/plugins/trunk/maven-eclipse-plugin/src/site: apt/index.apt apt/trouble-shooting/index.apt apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt site.xml
Author: baerrach
Date: Tue Jun 2 22:35:04 2009
New Revision: 781192
URL: http://svn.apache.org/viewvc?rev=781192&view=rev
Log:
Added trouble shooting guide to documentationt
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/index.apt
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt
maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt?rev=781192&r1=781191&r2=781192&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt Tue Jun 2
22:35:04 2009
@@ -107,4 +107,8 @@
* {{{examples/ajdt-projects.html}AJDT projects}}
- *
{{{examples/specifying-source-path-inclusions-and-exclusions.html}Specifying
source path inclusions and exclusions}}
\ No newline at end of file
+ *
{{{examples/specifying-source-path-inclusions-and-exclusions.html}Specifying
source path inclusions and exclusions}}
+
+* Trouble Shooting
+
+ See {{{trouble-shooting/index.html}Trouble Shooting}} for more details.
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/index.apt?rev=781192&view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/index.apt
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/index.apt
Tue Jun 2 22:35:04 2009
@@ -0,0 +1,18 @@
+ --
+ Trouble Shooting
+ --
+ Barrie Treloar
+ --
+ 03 June 2009
+ --
+
+Trouble Shooting
+
+ A list of more in-depth trouble shooting guides
+
+* The JDK being used is different than you expected.
+
+ After running mvn eclipse:eclipse your project's are using a different JDK
than expected.
+
+ See {{{jdk-being-used-is-different-than-expected.html}jdk being used is
different than expected}}.
+
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/index.apt
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/index.apt
--
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt?rev=781192&r1=781191&r2=781192&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/trouble-shooting/jdk-being-used-is-different-than-expected.apt
Tue Jun 2 22:35:04 2009
@@ -8,46 +8,46 @@
Summary
- After running <<>> your project's are using a
different JDK than expected.
-
+ After running <<>> your project's are using a different
JDK than expected.
+
Checklist
* Correct version of Java source specified in <<>>?
- For example, setting the source to 1.6 compliance?
-
+ For example, setting the source to 1.6 compliance?
+
+---
maven-compiler-plugin
- 1.6
- 1.6
+ 1.6
+ 1.6
+---
* The default JDK defined in eclipse matches what you expect?
- In eclipse's preferences check Java > Installed JREs and that the
selected one is the version you expect.
-
+ In eclipse's preferences check Java > Installed JREs and that the selected
one is the version you expect.
+
* The Execution Environment for the expected version is bound in eclipse
preferences?
- In eclipse's preferences check Java > Installed JREs > Execution
Environment has a bound value for compatible JREs.
-
- For example, JavaSE-1.6 should have "perfect match" or an Installed JRE
selected as being compatible.
+ In eclipse's preferences check Java > Installed JREs > Execution Environment
has a bound value for compatible JREs.
+
+ For example, JavaSE-1.6 should ha
svn commit: r781249 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Wed Jun 3 03:35:39 2009 New Revision: 781249 URL: http://svn.apache.org/viewvc?rev=781249&view=rev Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.7 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=781249&r1=781248&r2=781249&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Wed Jun 3 03:35:39 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7-SNAPSHOT + 2.7 maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 JIRA
svn commit: r781251 - /maven/plugins/tags/maven-eclipse-plugin-2.7/
Author: baerrach Date: Wed Jun 3 03:42:25 2009 New Revision: 781251 URL: http://svn.apache.org/viewvc?rev=781251&view=rev Log: [maven-release-plugin] copy for tag maven-eclipse-plugin-2.7 Added: maven/plugins/tags/maven-eclipse-plugin-2.7/ - copied from r781250, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r781252 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Wed Jun 3 03:42:33 2009 New Revision: 781252 URL: http://svn.apache.org/viewvc?rev=781252&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=781252&r1=781251&r2=781252&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Wed Jun 3 03:42:33 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7 + 2.8-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r782350 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/pom.xml
Author: baerrach Date: Sun Jun 7 09:09:08 2009 New Revision: 782350 URL: http://svn.apache.org/viewvc?rev=782350&view=rev Log: Fixed failing IT - it needs workspace defined in configuration or else it picks up the maven-eclipse-plugin workspace Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/MECLIPSE-56_encoding/pom.xml Modified: 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=782350&r1=782349&r2=782350&view=diff == Binary files - no diff available.
svn commit: r782351 - /maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt
Author: baerrach
Date: Sun Jun 7 09:09:48 2009
New Revision: 782351
URL: http://svn.apache.org/viewvc?rev=782351&view=rev
Log:
Altered text to indicate default behavior and links to how to change.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt?rev=782351&r1=782350&r2=782351&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt Sun Jun 7
09:09:48 2009
@@ -12,8 +12,10 @@
The Eclipse Plugin is used to generate Eclipse IDE files (*.classpath,
*.wtpmodules and the .settings folder) for use with a project.
- Note: Starting at version 2.6 the generated .classpath now includes
"**/*.java" for source directories
- and excludes "**/*.java" for resource directories. See
{{{http://jira.codehaus.org/browse/MECLIPSE-443}MECLIPSE-443}}.
+ Note: Starting at version 2.6, by default, the generated .classpath now
includes "**/*.java" for source directories
+ and excludes "**/*.java" for resource directories. See the example on
+ {{{examples/specifying-source-path-inclusions-and-exclusions.html}specifying
source path inclusions and exclusions}}
+ for more details on how to change this behavior.
* Goals Overview
svn commit: r782352 - in /maven/plugins/trunk/maven-eclipse-plugin: pom.xml src/assemble/ src/assemble/source-release.xml
Author: baerrach Date: Sun Jun 7 09:10:35 2009 New Revision: 782352 URL: http://svn.apache.org/viewvc?rev=782352&view=rev Log: added assembly for source-release Added: maven/plugins/trunk/maven-eclipse-plugin/src/assemble/ maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml (with props) Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=782352&r1=782351&r2=782352&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 7 09:10:35 2009 @@ -205,6 +205,22 @@ +maven-assembly-plugin + + + + single + +package + + +src/assemble/source-release.xml + + + + + + maven-enforcer-plugin Added: maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml?rev=782352&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml Sun Jun 7 09:10:35 2009 @@ -0,0 +1,41 @@ + + + +http://maven.apache.org/xsd/assembly-1.1.1"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/xsd/assembly-1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd";> + source-release + +tar.gz +zip + + + + . + + true + +target/** +.classpath +.project +.settings/** + + + + Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml -- svn:keywords = Author Date Id Revision
svn commit: r782366 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sun Jun 7 11:07:54 2009 New Revision: 782366 URL: http://svn.apache.org/viewvc?rev=782366&view=rev Log: rolling back version to fix release issues Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=782366&r1=782365&r2=782366&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 7 11:07:54 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.8-SNAPSHOT + 2.7-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM.
svn commit: r782368 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sun Jun 7 11:14:40 2009 New Revision: 782368 URL: http://svn.apache.org/viewvc?rev=782368&view=rev Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.7 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=782368&r1=782367&r2=782368&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 7 11:14:40 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7-SNAPSHOT + 2.7 maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 JIRA
svn commit: r782369 - /maven/plugins/tags/maven-eclipse-plugin-2.7/
Author: baerrach Date: Sun Jun 7 11:17:11 2009 New Revision: 782369 URL: http://svn.apache.org/viewvc?rev=782369&view=rev Log: re-running release Removed: maven/plugins/tags/maven-eclipse-plugin-2.7/
svn commit: r782370 - /maven/plugins/tags/maven-eclipse-plugin-2.7/
Author: baerrach Date: Sun Jun 7 11:20:50 2009 New Revision: 782370 URL: http://svn.apache.org/viewvc?rev=782370&view=rev Log: [maven-release-plugin] copy for tag maven-eclipse-plugin-2.7 Added: maven/plugins/tags/maven-eclipse-plugin-2.7/ - copied from r782369, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r782372 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sun Jun 7 11:21:08 2009 New Revision: 782372 URL: http://svn.apache.org/viewvc?rev=782372&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=782372&r1=782371&r2=782372&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 7 11:21:08 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7 + 2.8-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r782373 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt
Author: baerrach
Date: Sun Jun 7 11:49:33 2009
New Revision: 782373
URL: http://svn.apache.org/viewvc?rev=782373&view=rev
Log:
Added to Prerequisites GPG client, Subversion client, JDK 1.4.2 and MAVEN_OPTS
environment variable
Added a verification section before running the release process
Fixed the snapshot repository url used to verify the snapshot deploy
Updated [[5]] Close the staging repository to the new UI.
TODO: take new snapshots.
Updated the JIRA link to use Oustanding issues since this will include
re-opened issues.
Added commit your changes to [[13]] Update the maven site
Added a trouble shooting section.
Modified:
maven/site/trunk/src/site/apt/developers/release/releasing.apt
Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=782373&r1=782372&r2=782373&view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Sun Jun 7
11:49:33 2009
@@ -36,6 +36,16 @@
{{{../committer-settings.html}Committer settings}}.
* you have created your GPG keys. For more information, please refer to
{{{pmc-gpg-keys.html}Making GPG Keys}}.
+
+ * you have a GPG client installed and on your shell's path. See
{{{http://www.gnupg.org/}http://www.gnupg.org/}}.
+
+ * you have a Subversion 1.5+ client installed and on your shell's path. See
{{{http://subversion.tigris.org/}http://subversion.tigris.org/}}.
+
+ * you have a Java 1.4.2 JDK installed and on your shell's path. See
{{{http://java.sun.com/j2se/1.4.2/download.html}http://java.sun.com/j2se/1.4.2/download.html}}.
+
+ * you have set the environment variable MAVEN_OPTS=-Xmx512m
+
+ []
Formerly, a <<>> profile was required in the
<<<$\{user.home\}/.m2/settings.xml>>> to define the staging
repository. As of inheritance from the Apache parent POM version 5, a
repository manager will automatically handle
@@ -68,6 +78,17 @@
%{snippet|id=release-profile|url=http://svn.apache.org/repos/asf/maven/pom/trunk/asf/pom.xml}
+* Verify you are using JDK 1.4.2
+
+ Maven 2.0.X and its plugins should be built with JDK 1.4.2.
+
++-+
+>mvn --version
+...
+Maven version: 2.0.X
+Java version: 1.4.2_18
++-+
+
* Release Process for Part Of Maven
[[1]] Prepare your POMs for release:
@@ -114,7 +135,7 @@
<> You should verify the deployment under Maven Snapshot repository on
Apache.
+-+
-https://repository.apache.org/content/groups/snapshots/org/apache/maven/plugins/maven-XXX-plugin/Y.Z-SNAPSHOT/
+https://repository.apache.org/content/repositories/snapshots/org/apache/maven/plugins/maven-XXX-plugin/Y.Z-SNAPSHOT/
+-+
[[3]] Prepare the release
@@ -137,9 +158,9 @@
[[5]] Close the staging repository
- Login to <<<{{https://repository.apache.org}}>>> using your Apache SVN
credentials. Click on "Staging Repositories". Then click
+ Login to <<<{{https://repository.apache.org}}>>> using your Apache SVN
credentials. Click on "Staging". Then click
on "org.apache.maven" in the list of repositories. In the panel below you
should see an open repository that is linked
- to your username and ip. Right click on this repository and select "Finish".
This will close the repository from future
+ to your username and ip. Right click on this repository and select "Close".
This will close the repository from future
deployments and make it available for others to view. If you are staging
multiple releases together, skip this step
until you have staged everything.
@@ -230,8 +251,8 @@
To get the JIRA release notes link, browse to the plugin's JIRA page, select
the link,
and use the link to that is next to the version being
released.
- To get the list of issues left in JIRA, browse to the plugin's JIRA page, and
from the
- on the right, use the link for issues.
+ To get the list of issues left in JIRA, browse to the plugin's JIRA page, and
from the
+ on the right, use the link for issues.
[[9]] Check the vote results
@@ -320,6 +341,8 @@
If this is a shared component release, update the version number for the
component on the page.
+
+ Commit your changes.
[[14]] Update JIRA
@@ -389,3 +412,37 @@
<> If you don't have access to edit this page email <<<"Jason van Zyl"
>>>
[[18]] Celebrate :o)
+
+Trouble Shooting
+
+* mvn release:prepare "commit failed" during <<>>
+
+ If you get an error message similar to:
+
++-+
+[INFO] Unable to tag SCM
+Provider message:
+The svn tag command failed.
+Command output:
+svn: Commit failed (de
svn commit: r782453 - /maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml
Author: baerrach Date: Sun Jun 7 20:32:23 2009 New Revision: 782453 URL: http://svn.apache.org/viewvc?rev=782453&view=rev Log: Added extras similar to http://svn.apache.org/repos/asf/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/main/assembly/source-release.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml?rev=782453&r1=782452&r2=782453&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml Sun Jun 7 20:32:23 2009 @@ -23,12 +23,13 @@ source-release tar.gz +tar.bz2 zip . - + / true target/** @@ -37,5 +38,9 @@ .settings/** + + target/maven-shared-archive-resources/META-INF + / +
svn commit: r782454 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sun Jun 7 20:32:52 2009 New Revision: 782454 URL: http://svn.apache.org/viewvc?rev=782454&view=rev Log: rolling back for release take 3 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=782454&r1=782453&r2=782454&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 7 20:32:52 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.8-SNAPSHOT + 2.7-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM.
svn commit: r782455 - /maven/plugins/tags/maven-eclipse-plugin-2.7/
Author: baerrach Date: Sun Jun 7 20:35:13 2009 New Revision: 782455 URL: http://svn.apache.org/viewvc?rev=782455&view=rev Log: re-releasing build Removed: maven/plugins/tags/maven-eclipse-plugin-2.7/
svn commit: r782456 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sun Jun 7 20:36:55 2009 New Revision: 782456 URL: http://svn.apache.org/viewvc?rev=782456&view=rev Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.7 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=782456&r1=782455&r2=782456&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 7 20:36:55 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7-SNAPSHOT + 2.7 maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 JIRA
svn commit: r782457 - /maven/plugins/tags/maven-eclipse-plugin-2.7/
Author: baerrach Date: Sun Jun 7 20:38:28 2009 New Revision: 782457 URL: http://svn.apache.org/viewvc?rev=782457&view=rev Log: [maven-release-plugin] copy for tag maven-eclipse-plugin-2.7 Added: maven/plugins/tags/maven-eclipse-plugin-2.7/ - copied from r782456, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r782458 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sun Jun 7 20:38:44 2009 New Revision: 782458 URL: http://svn.apache.org/viewvc?rev=782458&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=782458&r1=782457&r2=782458&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 7 20:38:44 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7 + 2.8-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r782461 - /maven/plugins/tags/maven-eclipse-plugin-2.7/
Author: baerrach Date: Sun Jun 7 20:43:06 2009 New Revision: 782461 URL: http://svn.apache.org/viewvc?rev=782461&view=rev Log: re-releasing build Removed: maven/plugins/tags/maven-eclipse-plugin-2.7/
svn commit: r782462 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sun Jun 7 20:47:33 2009 New Revision: 782462 URL: http://svn.apache.org/viewvc?rev=782462&view=rev Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.7 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=782462&r1=782461&r2=782462&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 7 20:47:33 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.8-SNAPSHOT + 2.7 maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 JIRA
svn commit: r782463 - in /maven/plugins/tags/maven-eclipse-plugin-2.7: ./ pom.xml
Author: baerrach Date: Sun Jun 7 20:47:57 2009 New Revision: 782463 URL: http://svn.apache.org/viewvc?rev=782463&view=rev Log: [maven-release-plugin] copy for tag maven-eclipse-plugin-2.7 Added: maven/plugins/tags/maven-eclipse-plugin-2.7/ - copied from r782461, maven/plugins/trunk/maven-eclipse-plugin/ maven/plugins/tags/maven-eclipse-plugin-2.7/pom.xml - copied unchanged from r782462, maven/plugins/trunk/maven-eclipse-plugin/pom.xml
svn commit: r782464 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sun Jun 7 20:48:15 2009 New Revision: 782464 URL: http://svn.apache.org/viewvc?rev=782464&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=782464&r1=782463&r2=782464&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 7 20:48:15 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7 + 2.8-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r784315 - /maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml
Author: baerrach
Date: Fri Jun 12 23:39:05 2009
New Revision: 784315
URL: http://svn.apache.org/viewvc?rev=784315&view=rev
Log:
With the upgrade to m-assembly-p:2.2-beta-4 changed assembly file to use
interpolated values.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml?rev=784315&r1=784314&r2=784315&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/assemble/source-release.xml
Fri Jun 12 23:39:05 2009
@@ -28,14 +28,14 @@
- .
+ ${project.basedir}
/
true
-**/target/**
-**/.classpath
-**/.project
-**/.settings/**
+${project.build.directory}/**
+.classpath
+.project
+.settings/**
**/*.iml
**/*.ipr
**/*.iws
@@ -44,11 +44,11 @@
**/*.patch
**/*.log
**/pom.xml.releaseBackup
-**/release.properties
+**/release.properties
- target/maven-shared-archive-resources/META-INF
+
${project.build.directory}/maven-shared-archive-resources/META-INF
/
svn commit: r784388 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: baerrach
Date: Sat Jun 13 13:15:44 2009
New Revision: 784388
URL: http://svn.apache.org/viewvc?rev=784388&view=rev
Log:
eclipse plugin 2.7 release
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=784388&r1=784387&r2=784388&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sat Jun 13 13:15:44 2009
@@ -148,7 +148,7 @@
*---+--++--+++
| <> | |
| <> | |
*---+--++--+++
-| {{{/plugins/maven-eclipse-plugin/} <<>>}}| 2.6 |
2009-03-23 | Generate an Eclipse project file for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MECLIPSE}JIRA}}
+| {{{/plugins/maven-eclipse-plugin/} <<>>}}| 2.7 |
2009-06-13 | Generate an Eclipse project file for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MECLIPSE}JIRA}}
*---+--++--+++
| {{{/plugins/maven-idea-plugin/} <<>>}} | 2.2 |
2008-08-08 | Create/update an IDEA workspace for the current project
(individual modules are created as IDEA modules) |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MIDEA}JIRA}}
*---+--++--+++
svn commit: r784504 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt
Author: baerrach
Date: Sun Jun 14 03:28:47 2009
New Revision: 784504
URL: http://svn.apache.org/viewvc?rev=784504&view=rev
Log:
Updated step 11 to note that you should not copy the step 7 deployment
documentation into the release documentation.
Modified:
maven/site/trunk/src/site/apt/developers/release/releasing.apt
Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?rev=784504&r1=784503&r2=784504&view=diff
==
--- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original)
+++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Sun Jun 14
03:28:47 2009
@@ -315,6 +315,9 @@
mvn site-deploy -Preporting
+-+
+ <> You can not just copy the documentation from Step 7 into the
released documentation as the links are not identical.
+ See the email thread
{{http://www.nabble.com/forum/ViewPost.jtp?post=24018250&framed=y}}
+
[[12]] Review the website
Wait for the files to arrive at
svn commit: r786766 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.java
Author: baerrach
Date: Sat Jun 20 08:11:44 2009
New Revision: 786766
URL: http://svn.apache.org/viewvc?rev=786766&view=rev
Log:
Fixed typo in variable name
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseSpringBeansWriter.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=786766&r1=786765&r2=786766&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
Sat Jun 20 08:11:44 2009
@@ -66,10 +66,10 @@
public void write()
throws MojoExecutionException
{
-FileWriter sprintFileWriter;
+FileWriter springFileWriter;
try
{
-sprintFileWriter =
+springFileWriter =
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( sprintFileWriter,
"UTF-8", null );
+XMLWriter writer = new PrettyPrintXMLWriter( springFileWriter,
"UTF-8", null );
writer.startElement( MYECLIPSE_SPRING_BEANS_PROJECT_DESCRIPTION );
// Configuration extension
@@ -122,7 +122,7 @@
writer.endElement();
-IOUtil.close( sprintFileWriter );
+IOUtil.close( springFileWriter );
}
/**
svn commit: r786945 [4/4] - in /maven/plugins/trunk/maven-eclipse-plugin: ./ src/test/java/org/apache/maven/plugin/eclipse/it/ src/test/resources/projects/j2ee-simple/ear/expected/ src/test/resources/
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.project URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.project?rev=786945&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.project (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.project Sun Jun 21 07:11:14 2009 @@ -0,0 +1,46 @@ + + project-rad-7 + + + + + com.ibm.wtp.migration.MigrationBuilder + + + org.eclipse.jdt.core.javabuilder + + + com.ibm.etools.j2ee.ui.LibDirBuilder + + + com.ibm.etools.webtools.additions.linksbuilder + + + com.ibm.etools.webpage.template.templatebuilder + + + com.ibm.etools.siteedit.SiteNavBuilder + + + com.ibm.etools.siteedit.SiteUpdateBuilder + + + com.ibm.etools.validation.validationbuilder + + + com.ibm.wtp.j2ee.LibCopyBuilder + + + com.ibm.etools.webtools.additions.jspcompilationbuilder + + + com.ibm.sse.model.structuredbuilder + + + +com.ibm.wtp.web.WebNature +org.eclipse.jdt.core.javanature +com.ibm.etools.siteedit.WebSiteNature +com.ibm.etools.webpage.template.templatenature + + \ No newline at end of file Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.project -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.project -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.settings/org.eclipse.jdt.core.prefs URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.settings/org.eclipse.jdt.core.prefs?rev=786945&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.settings/org.eclipse.jdt.core.prefs (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.settings/org.eclipse.jdt.core.prefs Sun Jun 21 07:11:14 2009 @@ -0,0 +1,5 @@ +#Sat Jun 20 07:30:09 CST 2009 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.compiler.compliance=1.4 Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.website-config URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.website-config?rev=786945&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.website-config (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-7/expected/.website-config Sun Jun 21 07:11:14 2009 @@ -0,0 +1,4 @@ + + + + \ No newline at end of file Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.classpath?rev=786945&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.classpath (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.classpath Sun Jun 21 07:11:14 2009 @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.classpath -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.classpath -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.j2ee URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-8/expected/.j2ee?rev=786945&view=auto ==
svn commit: r786950 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-34/multymodule-2/expected/.settings/ project-51-MECLIPSE-415/multymodule-2/expected/.settings/
Author: baerrach Date: Sun Jun 21 07:46:32 2009 New Revision: 786950 URL: http://svn.apache.org/viewvc?rev=786950&view=rev Log: IT overhaul. - replaced hard coded paths with their variables Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component?rev=786950&r1=786949&r2=786950&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component Sun Jun 21 07:46:32 2009 @@ -27,7 +27,7 @@ uses - + uses Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component?rev=786950&r1=786949&r2=786950&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component Sun Jun 21 07:46:32 2009 @@ -27,7 +27,7 @@ uses - + uses
svn commit: r787000 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sun Jun 21 12:04:13 2009 New Revision: 787000 URL: http://svn.apache.org/viewvc?rev=787000&view=rev Log: Increased memory to surefire to avoid Java Heap Space errors Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=787000&r1=786999&r2=787000&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Jun 21 12:04:13 2009 @@ -44,7 +44,7 @@ http://jira.codehaus.org/browse/MECLIPSE --Xmx256m +-Xmx1024m
svn commit: r787002 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/actual/
Author: baerrach Date: Sun Jun 21 12:06:06 2009 New Revision: 787002 URL: http://svn.apache.org/viewvc?rev=787002&view=rev Log: Removed actual file in preparation for fixing expected file Removed: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/actual/
svn commit: r787121 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/classpath
Author: baerrach Date: Mon Jun 22 02:12:24 2009 New Revision: 787121 URL: http://svn.apache.org/viewvc?rev=787121&view=rev Log: Added back in original classpath as another file. the RAD support needs more work Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/classpath Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/classpath?rev=787121&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/classpath (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-3/classpath Mon Jun 22 02:12:24 2009 @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file
svn commit: r787536 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Tue Jun 23 04:23:03 2009 New Revision: 787536 URL: http://svn.apache.org/viewvc?rev=787536&view=rev Log: Hacking to see why hudson is failing. For the failing plugin moving to validate phase so it happens early and to echo cwd in an attempt to prove that it is not the project.basedir Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=787536&r1=787535&r2=787536&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Tue Jun 23 04:23:03 2009 @@ -219,10 +219,17 @@ verify-integration-tests-checks +validate + - + + + +
svn commit: r787858 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Tue Jun 23 22:38:22 2009 New Revision: 787858 URL: http://svn.apache.org/viewvc?rev=787858&view=rev Log: Using Ant's location attribute to property to reference the script file in an attempt to fix the problem. Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=787858&r1=787857&r2=787858&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Tue Jun 23 22:38:22 2009 @@ -219,17 +219,15 @@ verify-integration-tests-checks -validate - - - - + + +
svn commit: r787869 - in /maven/plugins/trunk/maven-eclipse-plugin: maven-antrun.bsh verify-integration-tests-checks.bsh
Author: baerrach
Date: Tue Jun 23 23:21:03 2009
New Revision: 787869
URL: http://svn.apache.org/viewvc?rev=787869&view=rev
Log:
Inlining file to avoid hudson cwd issues.
Removed:
maven/plugins/trunk/maven-eclipse-plugin/maven-antrun.bsh
Modified:
maven/plugins/trunk/maven-eclipse-plugin/verify-integration-tests-checks.bsh
Modified:
maven/plugins/trunk/maven-eclipse-plugin/verify-integration-tests-checks.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/verify-integration-tests-checks.bsh?rev=787869&r1=787868&r2=787869&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/verify-integration-tests-checks.bsh
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/verify-integration-tests-checks.bsh
Tue Jun 23 23:21:03 2009
@@ -1,4 +1,10 @@
-source("maven-antrun.bsh");
+addMavenClasspath() {
+maven_plugin_classpath = project.getReference("maven.test.classpath");
+paths = maven_plugin_classpath.list();
+for( path : paths ) {
+addClassPath( path );
+}
+}
addMavenClasspath();
import org.apache.tools.ant.BuildException;
svn commit: r787918 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Wed Jun 24 06:05:23 2009 New Revision: 787918 URL: http://svn.apache.org/viewvc?rev=787918&view=rev Log: cleanup after hacking. Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=787918&r1=787917&r2=787918&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Wed Jun 24 06:05:23 2009 @@ -220,13 +220,9 @@ verify-integration-tests-checks post-integration-test - -
svn commit: r724628 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/ide/ main/resources/META-INF/plexus/ main/resources/org/apache/maven/plugin/ide/ test/java/org
Author: baerrach Date: Mon Dec 8 23:13:27 2008 New Revision: 724628 URL: http://svn.apache.org/viewvc?rev=724628&view=rev Log: [MECLIPSE-509] Unavailable cache is incorrectly updated to mark sources/javadoc as not available when downloads option is not specified - Updating of the unavailable cache is now only done if downloading was true. [MECLIPSE-508] If base artifact does not exist then the unavailable cache was incorrectly updated - If the base artifact can not be resolved then checking for sources and javadocs is skipped for that artifact. [MECLIPSE-377] eclipse:eclipse -DdownloadSources=true shouldn't attempt download more than once in a multi-project - marker files are now created if sources/javadocs could not be downloaded. the marker file is has the same path as the sources/javadocs but with an additional suffix of "-not-available" - resolveArtifactWithClassifier refactored into multiple parts - createArtifactWithClassifier( String groupId, String artifactId, String version, String depClassifier, String inClassifier, ArtifactFactory artifactFactory ) - resolveArtifact( ArtifactResolver artifactResolver, Artifact artifact, List remoteRepos, ArtifactRepository localRepository, Log log ) - added getNotAvailableMarkerFile(ArtifactRepository localRepository, Artifact artifact) - components.xml - added comments to indicate it is only used for eclipse-plugin packaging. - cleaned up phases as the default mappings are already included in the phase overlay, no need to respecify them. - Added ITs for marker file creation on missing sources/javadocs Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/main/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/main/resources/dummy maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/test/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/test/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/test/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/src/test/resources/dummy maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/main/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/main/resources/dummy maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/test/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/test/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/src/test/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/
svn commit: r724712 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath
Author: baerrach Date: Tue Dec 9 06:31:51 2008 New Revision: 724712 URL: http://svn.apache.org/viewvc?rev=724712&view=rev Log: fixed tests for unix Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath?rev=724712&r1=724711&r2=724712&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath Tue Dec 9 06:31:51 2008 @@ -7,8 +7,8 @@ - + - \ No newline at end of file +
svn commit: r725481 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/ide/ main/resources/org/apache/maven/plugin/ide/ test/java/org/apache/maven/plugin/eclipse/it/
Author: baerrach
Date: Wed Dec 10 15:06:32 2008
New Revision: 725481
URL: http://svn.apache.org/viewvc?rev=725481&view=rev
Log:
[MECLIPSE-504] Add a new mojo eclipse:remove-cache
Added forceRecheck to AbstractIdeSupportMojo which will recheck
sources/javadocs for existence.
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/main/java/DummyClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/main/resources/dummy
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/test/java/DummyClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/test/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/src/test/resources/dummy
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=725481&r1=725480&r2=725481&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
Wed Dec 10 15:06:32 2008
@@ -190,8 +190,8 @@
/**
* Enables/disables the downloading of source attachments. Defaults to
false. When this flag is true
* remote repositories are checked for sources: in order to avoid repeated
check for unavailable source archives, a
- * status cache is mantained in the ~/.m2 directory. To reset this cache
delete the
- * maven-eclipse-plugin-cache.properties.
+ * status cache is mantained. To reset this cache run mvn
eclipse:remove-cache, or use the
+ * forceRecheck option.
*
* @parameter expression="${downloadSources}"
*/
@@ -200,12 +200,22 @@
/**
* Enables/disables the downloading of javadoc attachments. Defaults to
false. When this flag is true
* remote repositories are checked for javadocs: in order to avoid
repeated check for unavailable javadoc archives,
- * a status cache is mantained in the ~/.m2 directory. To reset this cache
delete the
- * maven-eclipse-plugin-cache.properties.
+ * a status cache is mantained. To reset this cache run mvn
eclipse:remove-cache, or use the
+ * forceRecheck option.
*
* @parameter expression="${downloadJavadocs}"
*/
protected boolean downloadJavadocs;
+
+/**
+ * Enables/disables the rechecking of the remote repository for
downloading source/javadoc attachments. Defaults to
+ * false. When this flag is true and the source or javadoc
attachment has a status cache to indicate
+ * that it is not available, then the remote repository will be rechecked
for a source or javadoc attachment and the
+ * status cache updated to reflect the new state.
+ *
+ * @parameter expression="${forceRecheck}"
+ */
+protected boolean forceRecheck;
/**
* Plexus logger needed for debugging manual artifact resolution.
@@ -939,6 +949,12 @@
inClassifier,
artifactFacto
svn commit: r725859 - in /maven/plugins/trunk/maven-eclipse-plugin/src/main: java/org/apache/maven/plugin/eclipse/EclipsePlugin.java resources/org/apache/maven/plugin/eclipse/messages.properties
Author: baerrach
Date: Thu Dec 11 16:06:24 2008
New Revision: 725859
URL: http://svn.apache.org/viewvc?rev=725859&view=rev
Log:
Cleanup of info messages for workspace detection.
Converted to use Messages
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/resources/org/apache/maven/plugin/eclipse/messages.properties
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=725859&r1=725858&r2=725859&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
Thu Dec 11 16:06:24 2008
@@ -1704,6 +1704,7 @@
{
workspaceConfiguration = new WorkspaceConfiguration();
locateWorkspace();
+getLog().info( Messages.getString( "EclipsePlugin.workspace",
workspace ) );
workspaceConfiguration.setWorkspaceDirectory( workspace );
new ReadWorkspaceLocations().init( getLog(),
workspaceConfiguration, project, wtpdefaultserver );
@@ -1722,10 +1723,10 @@
while ( currentWorkingDirectory != null )
{
File metadataDirectory = new File( currentWorkingDirectory,
".metadata" );
-logger.debug( "Checking metadataDirectory = " +
currentWorkingDirectory );
+logger.debug( "Checking for eclipse workspace at " +
currentWorkingDirectory );
if ( metadataDirectory.exists() &&
metadataDirectory.isDirectory() )
{
-logger.debug( " Found" );
+logger.debug( " Found workspace at " +
currentWorkingDirectory );
workspace = currentWorkingDirectory;
return;
}
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=725859&r1=725858&r2=725859&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
Thu Dec 11 16:06:24 2008
@@ -21,6 +21,7 @@
EclipsePlugin.deprecatedpar=Plugin parameter "{0}" is deprecated, please use
"{1}"
EclipsePlugin.cantcopyartifact=Can''t copy artifact "{0}".
EclipsePlugin.foundadir={0} is a directory, ignoring.
+EclipsePlugin.workspace=Using Eclipse Workspace: {0}
EclipseSettingsWriter.wrotesettings=Wrote settings to {0}
EclipseSettingsWriter.cannotcreatesettings=Cannot create settings file
svn commit: r725892 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/ main/java/org/apache/maven/plugin/
Author: baerrach
Date: Thu Dec 11 18:30:58 2008
New Revision: 725892
URL: http://svn.apache.org/viewvc?rev=725892&view=rev
Log:
ResourceBundle cleanup.
Someone spent a lot of effort creating NLS bundles for eclipse and it has
atrophied over time.
(And I can see why, its a lot of effort!)
Merged two messages.properties into one file - makes using Eclipses' checking
easier.
NLS'ed EclipseToMavenMojo
Fixed missing keys
Removed unused keys
' and " dont require escaping, cleaned this up.
Removed:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/Messages.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractEclipseManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseOSGiManifestWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.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/AbstractEclipsePluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java?rev=725892&r1=725891&r2=725892&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
Thu Dec 11 18:30:58 2008
@@ -85,12 +85,12 @@
/**
* A pattern the deployTo param should match.
*/
-private static final Pattern DEPLOYTO_PATTERN = Pattern.compile(
"(.+)::(.+)::(.+)" );
+private static final Pattern DEPLOYTO_PATTERN = Pattern.compile(
"(.+)::(.+)::(.+)" ); //$NON-NLS-1$
/**
* A pattern for a 4 digit osgi version number.
*/
-private static final Pattern VERSION_PATTERN = Pattern.compile(
"(([0-9]+\\.)+[0-9]+)" );
+private static final Pattern VERSION_PATTERN = Pattern.compile(
"(([0-9]+\\.)+[0-9]+)" ); //$NON-NLS-1$
/**
* Plexus container, needed to manually lookup components for deploy of
artifacts.
@@ -168,7 +168,7 @@
{
if ( eclipseDir == null )
{
-getLog().info( "Eclipse directory? " );
+getLog().info( Messages.getString(
"EclipseToMavenMojo.eclipseDirectoryPrompt" ) ); //$NON-NLS-1$
String eclipseDirString;
try
@@ -177,21 +177,21 @@
}
catch ( IOException e )
{
-throw new MojoFailureException( "Unable to read from standard
input" );
+throw new MojoFailureException( Messages.getString(
"EclipseToMavenMojo.errorreadingfromstandardinput" ) ); //$NON-NLS-1$
}
eclipseDir = new File( eclipseDirString );
}
if ( !eclipseDir.isDirectory() )
{
-throw new MojoFailureException( "Directory " +
eclipseDir.getAbsolutePath() + " doesn't exists" );
+throw new MojoFailureException( Messages.getString(
"EclipseToMavenMojo.directoydoesnotexist", eclipseDir.getAbsolutePath() ) );
//$NON-NLS-1$
}
-File pluginDir = new File( eclipseDir, "plugins" );
+File pluginDir = new File( eclipseDir, "plugins" ); //$NON-NLS-1$
if ( !pluginDir.isDirectory() )
{
-throw new MojoFailureException( "Plugin directory " +
pluginDir.getAbsolutePath() + " doesn't exists" );
+throw new MojoFailureException( Messages.getString(
"EclipseToMavenMojo.plugindirectorydoesnotexist", pluginDir.getAbsolutePath() )
); //$NON-NLS-1$
}
File[] files = pluginDir.listFiles();
@@ -200,7 +200,7 @@
if ( remoteRepo != null )
{
-getLog().info( "Will deploy artifacts to remote repository " +
deployTo );
+getLog().info( Messages.getString
svn commit: r726621 - in /maven/plugins/trunk/maven-eclipse-plugin: ./ src/main/java/org/apache/maven/plugin/eclipse/ src/main/java/org/apache/maven/plugin/ide/ src/main/resources/org/apache/maven/plu
Author: baerrach
Date: Sun Dec 14 22:04:54 2008
New Revision: 726621
URL: http://svn.apache.org/viewvc?rev=726621&view=rev
Log:
[MECLIPSE-504] Add a new mojo eclipse:remove-cache
- Moved delete(File) from EclipseCleanMojo into IdeUtils.java
- Added RemoveCacheMojo
- Added IT tests for RemoveCacheMojo
- added commons-io:commons-io:1.4 as a dependency
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RemoveCacheMojo.java
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RemoveCacheMojoIT.java
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=726621&r1=726620&r2=726621&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sun Dec 14 22:04:54 2008
@@ -48,6 +48,11 @@
+ commons-io
+ commons-io
+ 1.4
+
+
org.codehaus.plexus
plexus-archiver
1.0-alpha-7
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java?rev=726621&r1=726620&r2=726621&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java
Sun Dec 14 22:04:54 2008
@@ -19,11 +19,10 @@
package org.apache.maven.plugin.eclipse;
import java.io.File;
-import java.io.IOException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.plugin.ide.IdeUtils;
/**
* Deletes the .project, .classpath, .wtpmodules files and .settings folder
used by Eclipse.
@@ -165,35 +164,7 @@
protected void delete( File f )
throws MojoExecutionException
{
-if ( f.isDirectory() )
-{
-getLog().info( Messages.getString(
"EclipseCleanMojo.deletingDirectory", f.getName() ) ); //$NON-NLS-1$
-}
-else
-{
-getLog().info( Messages.getString(
"EclipseCleanMojo.deletingFile", f.getName() ) ); //$NON-NLS-1$
-}
-
-if ( f.exists() )
-{
-if ( !f.delete() )
-{
-try
-{
-FileUtils.forceDelete( f );
-}
-catch ( IOException e )
-{
-throw new MojoExecutionException( Messages.getString(
"EclipseCleanMojo.failedtodelete", //$NON-NLS-1$
- new
Object[] { f.getName(),
-
f.getAbsolutePath() } ) );
-}
-}
-}
-else
-{
-getLog().debug( Messages.getString(
"EclipseCleanMojo.nofilefound", f.getName() ) ); //$NON-NLS-1$
-}
+IdeUtils.delete( f, getLog() );
}
/**
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RemoveCacheMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RemoveCacheMojo.java?rev=726621&view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RemoveCacheMojo.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/RemoveCacheMojo.java
Sun Dec 14 22:04:54 2008
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file e
svn commit: r726873 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Author: baerrach
Date: Mon Dec 15 15:27:20 2008
New Revision: 726873
URL: http://svn.apache.org/viewvc?rev=726873&view=rev
Log:
Added javadoc to methods
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=726873&r1=726872&r2=726873&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Mon Dec 15 15:27:20 2008
@@ -889,6 +889,18 @@
}
}
+/**
+ * Return the not available marker file for the specified artifact details.
+ *
+ * @param groupId group id of artifact
+ * @param artifactId artifact id of artifact
+ * @param version version of artifact
+ * @param classifier the classifier of the artifact
+ * @param inClassifier the sources/javadocs to be attached
+ * @return the not available marker file
+ * @throws Exception failures.
+ * @see IdeUtils#createArtifactWithClassifier(String, String, String,
String, String, ArtifactFactory)
+ */
protected File getNotAvailableMarkerFile( String groupId, String
artifactId, String version,
String classifier, String
inClassifier )
throws Exception
@@ -922,6 +934,16 @@
return IdeUtils.getNotAvailableMarkerFile( localRepository, artifact );
}
+/**
+ * Assert that the not available marker file exists for the specified
artifact details.
+ *
+ * @param groupId group id of artifact
+ * @param artifactId artifact id of artifact
+ * @param version version of artifact
+ * @param classifier the classifier of the artifact
+ * @param inClassifier the sources/javadocs to be attached
+ * @throws Exception failures
+ */
protected void assertNotAvailableMarkerFileExists( String groupId, String
artifactId, String version,
String classifier,
String inClassifier ) throws Exception
{
@@ -929,6 +951,16 @@
assertTrue( "The \"Not Available\" marker file does not exist: " +
markerFile, markerFile.exists() );
}
+/**
+ * Assert that the not available marker file does not exist for the
specified artifact details.
+ *
+ * @param groupId group id of artifact
+ * @param artifactId artifact id of artifact
+ * @param version version of artifact
+ * @param classifier the classifier of the artifact
+ * @param inClassifier the sources/javadocs to be attached
+ * @throws Exception failures
+ */
protected void assertNotAvailableMarkerFileDoesNotExist( String groupId,
String artifactId, String version,
String classifier,
String inClassifier ) throws Exception
{
svn commit: r726945 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
Author: baerrach Date: Mon Dec 15 20:20:09 2008 New Revision: 726945 URL: http://svn.apache.org/viewvc?rev=726945&view=rev Log: Cleanup of imports Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?rev=726945&r1=726944&r2=726945&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java Mon Dec 15 20:20:09 2008 @@ -19,10 +19,7 @@ package org.apache.maven.plugin.ide; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -30,7 +27,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.TreeSet; import java.util.jar.Attributes; @@ -67,7 +63,6 @@ import org.apache.maven.project.MavenProject; import org.codehaus.plexus.logging.LogEnabled; import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.util.IOUtil; /** * Abstract base plugin which takes care of the common stuff usually needed by maven IDE plugins. A plugin extending
svn commit: r726947 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/ide/IdeUtils.java test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Author: baerrach
Date: Mon Dec 15 20:23:40 2008
New Revision: 726947
URL: http://svn.apache.org/viewvc?rev=726947&view=rev
Log:
Moved fixWindowsDriveURI to IdeUtils.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?rev=726947&r1=726946&r2=726947&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
Mon Dec 15 20:23:40 2008
@@ -521,6 +521,21 @@
{
return StringUtils.replace( filename, '\\', '/' );
}
+
+/**
+ * NOTE: This is to account for the unfortunate fact that "file:" URIs
differ between Windows and Unix. On a Windows
+ * box, the path "C:\dir" is mapped to "file:/C:/dir". On a Unix box, the
path "/home/dir" is mapped to
+ * "file:/home/dir". So, in the first case the slash after "file:" is not
part of the corresponding filesystem path
+ * while in the later case it is. This discrepancy makes verifying the
javadoc attachments in ".classpath" a little
+ * tricky.
+ *
+ * @param input string input that may contain a windows URI
+ * @return all windows URI convert "file:C:/dir" to "file:/C:/dir"
+ */
+public static String fixWindowsDriveURI( String input )
+{
+return input.replaceAll( "file:([a-zA-Z]):", "file:/$1:" );
+}
/**
* Returns a compiler plugin settings from a list of plugins .
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=726947&r1=726946&r2=726947&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Mon Dec 15 20:23:40 2008
@@ -622,7 +622,7 @@
throw new MojoExecutionException( "Unable to read file", ex );
}
result = replaceVariables( result, variables );
-result = fixWindowsDriveURI( result );
+result = IdeUtils.fixWindowsDriveURI( result );
/*
* NOTE: This is another hack to compensate for some metadata files
that contain a complete XML file as the
@@ -661,21 +661,6 @@
}
/**
- * NOTE: This is to account for the unfortunate fact that "file:" URIs
differ between Windows and Unix. On a Windows
- * box, the path "C:\dir" is mapped to "file:/C:/dir". On a Unix box, the
path "/home/dir" is mapped to
- * "file:/home/dir". So, in the first case the slash after "file:" is not
part of the corresponding filesystem path
- * while in the later case it is. This discrepancy makes verifying the
javadoc attachments in ".classpath" a little
- * tricky.
- *
- * @param input string input that may contain a windows URI
- * @return all windows URI convert "file:C:/dir" to "file:/C:/dir"
- */
-private String fixWindowsDriveURI( String input )
-{
-return input.replaceAll( "file:([a-zA-Z]):", "file:/$1:" );
-}
-
-/**
* @param str input string
* @param variables map of variables (keys) and replacement value (values)
* @return the string with all variable values replaced.
svn commit: r726959 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RemoveCacheMojoIT.java
Author: baerrach Date: Mon Dec 15 21:11:57 2008 New Revision: 726959 URL: http://svn.apache.org/viewvc?rev=726959&view=rev Log: fixing id expansion tag Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RemoveCacheMojoIT.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RemoveCacheMojoIT.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RemoveCacheMojoIT.java?rev=726959&r1=726958&r2=726959&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RemoveCacheMojoIT.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RemoveCacheMojoIT.java Mon Dec 15 21:11:57 2008 @@ -26,7 +26,7 @@ /** * @author mailto:baerr...@apache.org";>Barrie Treloar - * @version $Id$ + * @version $Id:$ */ public class RemoveCacheMojoIT extends AbstractEclipsePluginIT
svn commit: r726962 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/eclipse/it/ test/resources/projects/project-m2eclip
Author: baerrach
Date: Mon Dec 15 21:28:18 2008
New Revision: 726962
URL: http://svn.apache.org/viewvc?rev=726962&view=rev
Log:
[MECLIPSE-326] m2eclipse goal does not respect additionalBuildcommands and
additionalProjectnatures defined in pom
Submitted by: Holger Joest
- Applied patch, minor change to test to have an IT suffix so it runs as an IT
and not unit test.
- Added license header to M2EclipseMojo.java
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/M2EclipseMojoIT.java
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-m2eclipse-01/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-m2eclipse-01/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-m2eclipse-01/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-m2eclipse-01/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-m2eclipse-01/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/M2EclipseMojo.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/M2EclipseMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/M2EclipseMojo.java?rev=726962&r1=726961&r2=726962&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/M2EclipseMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/M2EclipseMojo.java
Mon Dec 15 21:28:18 2008
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.maven.plugin.eclipse;
import java.util.ArrayList;
@@ -29,8 +47,23 @@
// disable normal dependency resolution; the m2eclipse plugin will
handle it.
setResolveDependencies( false );
-setAdditionalProjectnatures( new ArrayList( Collections.singletonList(
M2ECLIPSE_NATURE ) ) );
-setAdditionalBuildcommands( new ArrayList( Collections.singletonList(
M2ECLIPSE_BUILD_COMMAND ) ) );
+if ( getAdditionalProjectnatures() != null )
+{
+getAdditionalProjectnatures().add( M2ECLIPSE_NATURE );
+}
+else
+{
+setAdditionalProjectnatures( new ArrayList(
Collections.singletonList( M2ECLIPSE_NATURE ) ) );
+}
+
+if ( getAdditionalBuildcommands() != null )
+{
+getAdditionalBuildcommands().add( M2ECLIPSE_BUILD_COMMAND );
+}
+else
+{
+setAdditionalBuildcommands( new ArrayList(
Collections.singletonList( M2ECLIPSE_BUILD_COMMAND ) ) );
+}
List classpathContainers = getClasspathContainers();
if ( classpathContainers == null )
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/M2EclipseMojoIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/M2EclipseMojoIT.java?rev=726962&view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/M2EclipseMojoIT.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/M2EclipseMojoIT.java
Mon Dec 15 21:28:18 2008
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy
svn commit: r726964 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java
Author: baerrach Date: Mon Dec 15 21:29:58 2008 New Revision: 726964 URL: http://svn.apache.org/viewvc?rev=726964&view=rev Log: Added missing license header Modified: 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/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=726964&r1=726963&r2=726964&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 Mon Dec 15 21:29:58 2008 @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.maven.plugin.eclipse.it; /**
svn commit: r727202 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml
Author: baerrach
Date: Tue Dec 16 14:36:08 2008
New Revision: 727202
URL: http://svn.apache.org/viewvc?rev=727202&view=rev
Log:
Fixing corruption of workspace value.
(Contained user specific details from my environment)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml?rev=727202&r1=727201&r2=727202&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml
Tue Dec 16 14:36:08 2008
@@ -14,7 +14,7 @@
maven-eclipse-plugin
test
-
D:\ide\maven\maven-eclipse-plugin\target\test-classes\projects\project-34
+ ${basedir}
[artifactId]-[version]
true
true
svn commit: r727235 - in /maven/plugins/trunk/maven-eclipse-plugin/src/main: java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java resources/org/apache/maven/plugin/eclipse/messages.
Author: baerrach
Date: Tue Dec 16 16:42:05 2008
New Revision: 727235
URL: http://svn.apache.org/viewvc?rev=727235&view=rev
Log:
The dynamic workspace test has invalid JRE paths in the workspace.
This was causing an IOException which incorrectly displayed the Xpp3Dom array
instead of the element that was the problem.
Once fixed the next problem was that the construction of the rtJar fails if the
file does not exist. The code now protects against this.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/eclipse/messages.properties
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java?rev=727235&r1=727234&r2=727235&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
Tue Dec 16 16:42:05 2008
@@ -31,6 +31,7 @@
import java.util.Set;
import java.util.jar.JarFile;
+import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.WorkspaceConfiguration;
import org.apache.maven.plugin.ide.IdeDependency;
import org.apache.maven.plugin.ide.IdeUtils;
@@ -464,7 +465,12 @@
MessageFormat.format(
ReadWorkspaceLocations.CLASSPATHENTRY_FORMAT,
new Object[] { typeId, name } );
String jrePath = new File( path ).getCanonicalPath();
-JarFile rtJar = new JarFile( new File( new File( jrePath
), "jre/lib/rt.jar" ) );
+File rtJarFile = new File( new File( jrePath ),
"jre/lib/rt.jar" );
+if ( !rtJarFile.exists() ) {
+logger.warn( Messages.getString(
"EclipsePlugin.invalidvminworkspace", jrePath ) );
+continue;
+}
+JarFile rtJar = new JarFile( rtJarFile );
String version =
rtJar.getManifest().getMainAttributes().getValue( "Specification-Version" );
if ( defaultJRE.endsWith( "," + vmId ) )
{
@@ -490,7 +496,7 @@
}
catch ( IOException e )
{
-logger.warn( "Could not interpret entry: " + vm.toString()
);
+logger.warn( "Could not interpret entry: " +
vm[vmIndex].toString() );
}
}
}
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=727235&r1=727234&r2=727235&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 Dec 16 16:42:05 2008
@@ -20,6 +20,7 @@
EclipsePlugin.workspace=Using Eclipse Workspace: {0}
EclipsePlugin.cantcanonicalize=Can't canonicalize system path: {0}
EclipsePlugin.unchangedmanifest=Not writing Manifest file as it is unchanged:
{0}
+EclipsePlugin.invalidvminworkspace=Workspace defines a VM that does not
contain a valid jre/lib/rt.jar: {0}
EclipseSettingsWriter.wrotesettings=Wrote settings to {0}
EclipseSettingsWriter.cannotcreatesettings=Cannot create settings file
svn commit: r727238 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test: java/org/apache/maven/plugin/eclipse/it/ resources/projects/project-50-MECLIPSE-415/ resources/projects/project-50-MECLIPSE
Author: baerrach
Date: Tue Dec 16 16:54:14 2008
New Revision: 727238
URL: http://svn.apache.org/viewvc?rev=727238&view=rev
Log:
[MECLIPSE-415] settings stored in wrong project directory
Added IT tests that show this is not a problem
Waiing for reporter feedback.
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/.settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/.settings/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/.settings/expected/org.eclipse.jdt.core.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java?rev=727238&r1=727237&r2=727238&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginIT.java
Tue Dec 16 16:54:14 2008
@@ -606,6 +606,18 @@
assertNotAvailableMarkerFileDoesNotExist( "commons-lang",
"commons-lang", "2.4", null, "sources" );
assertNotAvailableMarkerFileDoesNotExist( "commons-lang",
"commons-lang", "2.4", null, "javadoc" );
}
+
+
+/**
+ * [MECLIPSE-415] settings are stored in wrong directory if project is not
in the workspace.
+ *
+ * @throws Exception
+ */
+public void testProject50MECLIPSE415()
+throws Exception
+{
+testProject( "project-50-MECLIPSE-415" );
+}
public void testJeeSimple()
throws Exception
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/.settings/expected/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/.settings/expected/org.eclipse.jdt.core.prefs?rev=727238&view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/.settings/expected/org.eclipse.jdt.core.prefs
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/.settings/expected/org.eclipse.jdt.core.prefs
Tue Dec 16 16:54:14 2008
@@ -0,0 +1,5 @@
+#Wed Dec 17 10:25:39 CST 2008
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath?rev=727238&view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath
Tue Dec 16 16:54:14 2008
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath
--
svn:eol-style = native
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.project?rev=727238&view=auto
==
svn commit: r727241 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/writers/ test/resources/eclipse/dynamicWorkspace/workspace/project-Z/expected/ test/re
Author: baerrach Date: Tue Dec 16 17:37:04 2008 New Revision: 727241 URL: http://svn.apache.org/viewvc?rev=727241&view=rev Log: [ECLIPSE-442] Classpath container entries should come last in .classpath Submitted by: Michael Johns - Moved container definition to end as per patch. - Fixed IT tests. Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/eclipse/dynamicWorkspace/workspace/project-Z/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-01/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-06/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-07/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-08/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-09/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-36/my-ejb/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-38/child/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-45/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-46/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-47/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-48/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-49/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-50-MECLIPSE-415/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/expected/.classpath Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java?rev=727241&r1=727240&r2=727241&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java Tue Dec 16 17:37:04 2008 @
svn commit: r727284 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/ test/resources/projects/
Author: baerrach
Date: Tue Dec 16 21:09:23 2008
New Revision: 727284
URL: http://svn.apache.org/viewvc?rev=727284&view=rev
Log:
[MECLIPSE-419]
As part of this change a lot of methods on EclipsePlugin were made final or
hidden as private.
This is to avoid the problems in the future where subclasses are extending at
the wrong points and getting out of sync. e.g. MyEclipse plugin overwrote
writeConfiguration() but missed all the WTP changes.
Added javadocs for public/protected methods that were missing docs.
Renamed methods used for subclassing to be consistent with a "Extras" suffix.
MyEclipse now just writes MyEclipse specific files and EclipsePlugin handles
the rest.
Updated ITs to include provided jars in classpath.
As part of the EclipsePlugin/WTP handling target/generated-resources/eclipse
will be added to the classpath with the generated META-INF/MANIFEST.MF file.
Removed:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/MyEclipseClasspathWriter.java
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/main/java/org/apache/maven/plugin/eclipse/RadPlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
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=727284&r1=727283&r2=727284&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
Tue Dec 16 21:09:23 2008
@@ -506,12 +506,12 @@
*/
private String ajdtVersion;
-protected boolean isJavaProject()
+protected final boolean isJavaProject()
{
return isJavaProject;
}
-protected boolean isPdeProject()
+protected final boolean isPdeProject()
{
return pde;
}
@@ -521,7 +521,7 @@
*
* @return Returns the buildcommands.
*/
-public List getBuildcommands()
+public final List getBuildcommands()
{
return buildcommands;
}
@@ -531,7 +531,7 @@
*
* @param buildcommands The buildcommands to set.
*/
-public void setBuildcommands( List buildcommands )
+public final void setBuildcommands( List buildcommands )
{
this.buildcommands = buildcommands;
}
@@ -541,7 +541,7 @@
*
* @return Returns the buildOutputDirectory.
*/
-public File getBuildOutputDirectory()
+public final File getBuildOutputDirectory()
{
return buildOutputDirectory;
}
@@ -551,7 +551,7 @@
*
* @param buildOutputDirectory The buildOutputDirectory to set.
*/
-public void setBuildOutputDirectory( File buildOutputDirectory )
+public final void setBuildOutputDirectory( File buildOutputDirectory )
{
this.buildOutputDirectory = buildOutputDirectory;
}
@@ -561,7 +561,7 @@
*
* @return Returns the classpathContainers.
*/
-public List getClasspathContainers()
+public final List getClasspathContainers()
{
return classpathContainers;
}
@@ -571,7 +571,7 @@
*
* @param classpathContainers The classpathContainers to set.
*/
-public void setClasspathContainers( List classpathContainers )
+public final void setClasspathContainers( List classpathContainers )
{
this.classpathContainers = classpathContainers;
}
@@ -581,7 +581,7 @@
*
* @return Returns the eclipseProjectDir.
*/
-public File getEclipseProjectDir()
+public final File getEclipseProjectDir()
{
return eclipseProjectDir;
}
@@ -591,7 +591,7 @@
*
* @param eclipseProjectDir The eclipseProjectDir to set.
*/
-public void setEclipseProjectDir( File eclipseProjectDir )
+public final void setEclipseProjectDir( File eclipseProjectDir )
{
this.eclipseProjectDir = eclipseProjectDir;
}
@@ -601,7 +601,7 @
svn commit: r727620 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/ide/ test/resources/projects/project-34/multymodule
Author: baerrach
Date: Wed Dec 17 18:35:18 2008
New Revision: 727620
URL: http://svn.apache.org/viewvc?rev=727620&view=rev
Log:
[MECLIPSE-364] incorrect dependencies with different projectNameTemplates in
submodules
EclipsePlugin
- Moved calculateProjectNameTemplate() to IdeUtils and parameterized.
- IdeUtils.calculateProjectNameTemplate() is now called once in setup to set
the value of projectNameTemplate
All previous uses of calculateProjectNameTemplate() now refer to
getProjectNameTemplate()
- getProjectNameForArifact() now checks if the project is in the reactor and
uses getProjectNameTemplateForMavenProject() to
use that project's name template definition and not the current project's
definition
- getProjectNameTemplateForMavenProject() looks for the variables in the
specified project pom and uses IdeUtils.calculateProjectNameTemplate() to
return the project name template
AbstractIdeSupportMojo
- refactored isAvailableAsAReactorProject method body into getReactorProject
which returns the project out of the reactor.
isAvailableAsAReactorProject justs checks for against null from
getReactorProject
- modified test project-34 to use projectNameTemplate
the side effect of this is that the generated classpath for the web app
MANIFEST.MF uses the eclipse project name for the jar.
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/ide/AbstractIdeSupportMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.project
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF
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=727620&r1=727619&r2=727620&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
Wed Dec 17 18:35:18 2008
@@ -35,6 +35,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.model.Build;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
@@ -82,7 +83,7 @@
* @execute phase="generate-resources"
*/
public class EclipsePlugin
-extends AbstractIdeSupportMojo
+extends AbstractIdeSupportMojo
{
private static final String WEAVE_DEPENDENCY = "weaveDependency";
@@ -757,6 +758,8 @@
boolean ready = true;
checkDeprecations();
+setProjectNameTemplate( IdeUtils.calculateProjectNameTemplate(
getProjectNameTemplate(), isAddVersionToProjectName(),
+
isAddGroupIdToProjectName(), getLog() ) );
ajdt = enableAjdt( executedProject ) && !ajdtVersion.equals( "none" );
ready = validate();
@@ -1136,7 +1139,7 @@
config.setWorkspaceConfiguration( getWorkspaceConfiguration() );
-config.setProjectNameTemplate( calculateProjectNameTemplate() );
+config.setProjectNameTemplate( getProjectNameTemplate() );
String projectName = IdeUtils.getProjectName(
config.getProjectNameTemplate(), project );
@@ -1700,40 +1703,7 @@
}
}
}
-
-/**
- * Calculate the project name template from the fields {...@link
#projectNameTemplate},
- * {...@link #addVersionToProjectName} and {...@link
#addGroupIdToProjectName}
- *
- * @return the project name template that should be used after considering
the plugin configuration
- */
-private String calculateProjectNameTemplate()
-{
-if ( getProjectNameTemplate() != null )
-{
-if ( isAddVersionToProjectName() || isAddGroupIdToProjectName() )
-{
-getLog().warn(
- "projectNameTemplate definition overrides "
-
svn commit: r727621 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
Author: baerrach
Date: Wed Dec 17 18:55:18 2008
New Revision: 727621
URL: http://svn.apache.org/viewvc?rev=727621&view=rev
Log:
[MECLIPSE-502] test failures for drive D being CD rom
- test is skipped if the fileToAdd can't be canonicalized.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java?rev=727621&r1=727620&r2=727621&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.java
Wed Dec 17 18:55:18 2008
@@ -19,6 +19,7 @@
package org.apache.maven.plugin.ide;
import java.io.File;
+import java.io.IOException;
import junit.framework.TestCase;
@@ -32,8 +33,8 @@
*/
public class IdeUtilsTest
extends TestCase
-{
-
+{
+
public void testGetProjectNameStringIdeDependency()
{
IdeDependency dependency = new IdeDependency();
@@ -69,7 +70,17 @@
}
File basedir = new File(
"C:\\TEMP\\EclipsePlugin.unitTest.1165557188766\\" );
File fileToAdd = new File(
"D:\\ide\\workspace\\maven\\maven-eclipse-plugin\\target\\main-output" );
-
+try
+{
+fileToAdd.getCanonicalPath();
+}
+catch ( IOException e )
+{
+// skip the test if the fileToAdd can't be canonicalized.
+// Likely it is because D refers to a CD drive that is not ready.
+return;
+}
+
String actual = IdeUtils.toRelativeAndFixSeparator( basedir,
fileToAdd, false );
String expected =
"D:/ide/workspace/maven/maven-eclipse-plugin/target/main-output";
@@ -88,7 +99,7 @@
if (!Os.isFamily( Os.FAMILY_WINDOWS ) ) {
return;
}
-
+
File basedir = new File(
"C:\\TEMP\\EclipsePlugin.unitTest.1165557188766\\" );
File fileToAdd = new File( "target/main-output" );
@@ -115,7 +126,7 @@
if (!Os.isFamily( Os.FAMILY_WINDOWS ) ) {
return;
}
-
+
File basedir = new File( "Z:" );
File fileToAdd = new File( "target/main-output" );
svn commit: r727686 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415: ./ multymodule-1/ multymodule-1/expected/ multymodule-1/expected/target/ multymo
Author: baerrach Date: Thu Dec 18 02:04:20 2008 New Revision: 727686 URL: http://svn.apache.org/viewvc?rev=727686&view=rev Log: preparing multi-moulde test case for MECLIPSE-415 Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/target/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/target/generated-resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/target/generated-resources/eclipse/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/target/generated-resources/eclipse/META-INF/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/expected/target/generated-resources/eclipse/META-INF/MANIFEST.MF (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/refproject-sysdep.jar (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/src/main/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/direct-sysdep.jar (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/src/main/webapp/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/src/main/webapp/META-INF/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/src/main/webapp/META-INF/MANIFEST.MF (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/src/main/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/expected/target/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-3/expected/target/application.xml (with p
svn commit: r756392 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
Author: baerrach
Date: Fri Mar 20 09:46:09 2009
New Revision: 756392
URL: http://svn.apache.org/viewvc?rev=756392&view=rev
Log:
Fixed minor typo
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.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=756392&r1=756391&r2=756392&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 Mar 20 09:46:09 2009
@@ -1350,7 +1350,7 @@
if ( getWorkspaceConfiguration().getDefaultClasspathContainer() !=
null )
{
getLog().info(
- "Adding default classpath contaigner: "
+ "Adding default classpath container: "
+
getWorkspaceConfiguration().getDefaultClasspathContainer() );
classpathContainers.add(
getWorkspaceConfiguration().getDefaultClasspathContainer() );
}
svn commit: r757029 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
Author: baerrach
Date: Sat Mar 21 21:33:39 2009
New Revision: 757029
URL: http://svn.apache.org/viewvc?rev=757029&view=rev
Log:
[MECLIPSE-241] with the change to dynamically locate workspaces - this will
find the workspace for building maven-eclipse-plugin and hence be
non-deterministic. Setting the workspace to one that does not exist fits with
the IT here.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml?rev=757029&r1=757028&r2=757029&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
Sat Mar 21 21:33:39 2009
@@ -19,6 +19,7 @@
maven-eclipse-plugin
test
+ ${basedir}
1.5
contextName
svn commit: r757031 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml
Author: baerrach Date: Sat Mar 21 21:37:51 2009 New Revision: 757031 URL: http://svn.apache.org/viewvc?rev=757031&view=rev Log: project-30 uses javax.servlet:servlet-api:2.3 with downloadSources which impacts other ITs expected results (depending on the order the ITs get run) as the source is available it will get added to the .classpath. So any IT that depends on javax.servlet:servlet-api:2.3 should also use downloadSources. Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml?rev=757031&r1=757030&r2=757031&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml Sat Mar 21 21:37:51 2009 @@ -14,6 +14,9 @@ org.apache.maven.plugins maven-eclipse-plugin test + + true +
svn commit: r757171 [2/2] - in /maven/plugins/trunk/maven-eclipse-plugin/src/test: java/org/apache/maven/plugin/eclipse/it/ resources/eclipse/workspaceDoesNotExist/ resources/projects/MECLIPSE-295/ re
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml?rev=757171&r1=757170&r2=757171&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml
Sun Mar 22 11:41:05 2009
@@ -24,6 +24,7 @@
maven-eclipse-plugin
test
+ ${basedir}/../../eclipse/workspaceDoesNotExist
none
true
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/pom.xml?rev=757171&r1=757170&r2=757171&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/pom.xml
Sun Mar 22 11:41:05 2009
@@ -24,6 +24,7 @@
maven-eclipse-plugin
test
+ ${basedir}/../../eclipse/workspaceDoesNotExist
none
true
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/pom.xml?rev=757171&r1=757170&r2=757171&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/pom.xml
Sun Mar 22 11:41:05 2009
@@ -24,6 +24,7 @@
maven-eclipse-plugin
test
+ ${basedir}/../../eclipse/workspaceDoesNotExist
none
true
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-m2eclipse-01/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-m2eclipse-01/pom.xml?rev=757171&r1=757170&r2=757171&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-m2eclipse-01/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-m2eclipse-01/pom.xml
Sun Mar 22 11:41:05 2009
@@ -13,6 +13,7 @@
maven-eclipse-plugin
test
+ ${basedir}/../../eclipse/workspaceDoesNotExist
org.springframework.ide.eclipse.core.springnature
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml?rev=757171&r1=757170&r2=757171&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-01/pom.xml
Sun Mar 22 11:41:05 2009
@@ -15,6 +15,7 @@
maven-eclipse-plugin
test
+ ${basedir}/../../eclipse/workspaceDoesNotExist
true
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/pom.xml?rev=757171&r1=757170&r2=757171&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-02/pom.xml
Sun Mar 22 11:41:05 2009
@@ -14,6 +14,9 @@
org.apache.maven.plugins
maven-eclipse-plugin
test
+
+ ${basedir}/../../eclipse/workspaceDoesNotExist
+
org.apache.maven.plugins
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-03/pom.xml?rev=757171&r1=757170&r2=757171&view=diff
svn commit: r757250 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml
Author: baerrach
Date: Sun Mar 22 20:17:15 2009
New Revision: 757250
URL: http://svn.apache.org/viewvc?rev=757250&view=rev
Log:
workspace configuration not needed in child module
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml?rev=757250&r1=757249&r2=757250&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-1/pom.xml
Sun Mar 22 20:17:15 2009
@@ -54,7 +54,6 @@
maven-eclipse-plugin
- ${basedir}/../../eclipse/workspaceDoesNotExist
prefix-[artifactId]-[version]
svn commit: r757251 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
Author: baerrach
Date: Sun Mar 22 20:17:55 2009
New Revision: 757251
URL: http://svn.apache.org/viewvc?rev=757251&view=rev
Log:
deleted test 5_2 as it was a cut-and-paste copy (just not kept up to date but
still doing the same work)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java?rev=757251&r1=757250&r2=757251&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
Sun Mar 22 20:17:55 2009
@@ -113,20 +113,6 @@
executeMaven( pom0, props, goals );
-// this.maven.execute( Arrays.asList( new MavenProject[] { project,
project2, project3 } ), Arrays
-// .asList( new String[] {
-// "install",
-// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad-clean",
-// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad" } ),
eventMonitor, new ConsoleDownloadMonitor(),
-// new Properties(), basedir );
-// this.maven.execute( Arrays.asList( new MavenProject[] { project1,
project2, project3 } ), Arrays
-// .asList( new String[] {
-// "install",
-// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad-clean",
-// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad" } ),
eventMonitor, new ConsoleDownloadMonitor(),
-// new Properties(), basedir );
-
-// jar muss reincoliert sein
assertTrue( "Expected file not found:
project-rad-1/maven-core-98.0.jar",
new File( basedir, "project-rad-1/maven-core-98.0.jar"
).exists() );
@@ -182,114 +168,6 @@
websettings.getChild( "lib-modules" ).getChild(
"lib-module" ).getChild( "project" ).getValue() );
}
-public void testProject5_2()
-throws Exception
-{
-File basedir = getTestFile(
"target/test-classes/projects/project-rad-5" );
-
-FileUtils.deleteDirectory( new File( basedir, "project-rad-1/META-INF"
) );
-
-File pom0 = new File( basedir, "pom.xml" );
-
-MavenProject project = readProject( pom0 );
-
-String outputDirPath =
-IdeUtils.getPluginSetting( project,
"org.apache.maven.plugins:maven-eclipse-plugin", "outputDir", null );
-File outputDir;
-
-if ( outputDirPath == null )
-{
-outputDir = basedir;
-}
-else
-{
-outputDir = new File( basedir, outputDirPath );
-outputDir.mkdirs();
-new File( outputDir, project.getArtifactId() );
-}
-
-List goals = new ArrayList();
-
-String pluginSpec = getPluginCLISpecification();
-
-goals.add( pluginSpec + "rad-clean" );
-goals.add( pluginSpec + "rad" );
-
-Properties props = new Properties();
-
-executeMaven( pom0, props, goals );
-
-// this.maven.execute( Arrays.asList( new MavenProject[] { project,
project2, project3 } ), Arrays
-// .asList( new String[] {
-// "install",
-// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad-clean",
-// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad" } ),
eventMonitor, new ConsoleDownloadMonitor(),
-// new Properties(), basedir );
-//
-// this.maven.execute( Arrays.asList( new MavenProject[] { project1,
project2, project3 } ), Arrays
-// .asList( new String[] {
-// "install",
-// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad-clean",
-// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad" } ),
eventMonitor, new ConsoleDownloadMonitor(),
-// new Properties(), basedir );
-
-assertTrue( "Expected file not found:
project-rad-1/maven-core-98.0.jar",
-new File( basedir, "project-rad-1/maven-core-98.0.jar"
).exists() );
-
-Xpp3Dom applicationXml =
-Xpp3DomBuilder.build( new InputStreamReader(
- new FileInputStream(
-
new File( basedir,
-
svn commit: r757353 - /maven/project/KEYS
Author: baerrach Date: Mon Mar 23 08:58:05 2009 New Revision: 757353 URL: http://svn.apache.org/viewvc?rev=757353&view=rev Log: Adding new keys for baerr...@apache.org after system crash Modified: maven/project/KEYS Modified: maven/project/KEYS URL: http://svn.apache.org/viewvc/maven/project/KEYS?rev=757353&r1=757352&r2=757353&view=diff == --- maven/project/KEYS (original) +++ maven/project/KEYS Mon Mar 23 08:58:05 2009 @@ -1302,5 +1302,40 @@ =n9eY -END PGP PUBLIC KEY BLOCK- +pub 1024D/39332BA6 2009-03-23 +uid Barrie Treloar +sig 339332BA6 2009-03-23 Barrie Treloar +sub 2048g/853A46C3 2009-03-23 +sig 39332BA6 2009-03-23 Barrie Treloar +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.9 (MingW32) + +mQGiBEnHTQARBADHrp9eVIR7twlFyvy7uW/TEPYmObIXa6ob2yfjDn9amxVNru6y +Tvc3QhN0ZsVqI3n1xSlw0wdMsvuzns7zxadd7Zj8YNKpdp4s9MgKqdd66BgihAem +du90P1i8NiCbZ1TZ3ph0AICvtHSumq03yW4nWlzo6z/pH79WhnRWnCJHCwCgjhSs +kxsKDMAci1RWLnIB+nNW/80D/jjLsKEbfeV962fmy/F+T5oh3Fj4IuheNg8Ce5mS +CfSylR4CAp38Vfg/QA3LMS6qThLo06WJXfh9q+QWdoqvdWLQU3hXxrvVKytpYwYd +S9neyKfRVX35iO9zxPwX9iM5hyc6jvWGLIAdq+Jb0XLeexEOsl/Usgw6UbGikkrm +FRqMBAC8vN1gQrF3vvUb8YaHxTebPjdnCwGoI83fIYjcuS45ZwlkEbum9dlZ1jTP +tCOwTRsUh7tmuzb+cLb5lz/cYaTBI/mf25GfWG4tTysO7VFJ/HFxm/043Yij55L5 +hdE2HLVtqvjfLirAmRR428QMhY5e/8SbVVHe8KWGc5Q+3iNy5bQkQmFycmllIFRy +ZWxvYXIgPGJhZXJyYWNoQGFwYWNoZS5vcmc+iGAEExECACAFAknHTQACGwMGCwkI +BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRB8rbdyOTMrpqwtAJ4/kpZUSK2x1b+j01yC +lnWAIGtcSwCeKSKMZEnDjLtBhtWypkCbmRBTOmu5Ag0EScdNABAIAIwsj6N0FoYy +P+NBIfurdJK3qi6mSkJwyhG9Fnsoaq+HaVrRCPtB3fVED8clMBCirS6ShmQrHK+b +ii2MnGxkWbkpTly6xYubG2ZwFhXivb9BskPvL9Zg+JEx9BptWcdkY6XrQVFh6jgb +uBBLFLJr/8AbSs75n5v1w/ZZU4Fo54HViPzlK+F3bg6BXPaY8iZVIBb+5g243y/8 +A+1eWlymtSx6EIFnKVj5X0iVL1cjx/9PEKhqo8tZvCDVu3llzfs4dl6BxBagzVG5 +fb786ItpmZcWr9OFtYOH84Sks0fMK37G33DWASz4gqyYUpLy8PiFZSncZQWfEcPG +AAfRbgYI5c8ABAsH/3RbLZwD3D1oymJBqo06HZB9AnIdb32NV4vOMJ9fqL8hr1xN +ibQktFlqDGO5KAQwNNh/FtN/eTjRWKjHRVouAE0EdK+PM5ODHOd4H4wRPXtZ//tp +2oedV82UhcBTX7yViq4NawBuW0nMRr03xq6YRXNPBiBvAaNHmeteZm7gntMdRtBE +rndP43IhYFEt1zfvUxNakHA/Cd3/UA4R3VKnhxHRzdZPMm81aW5qsjGLTtPq5UGe +/LsiUOajFizTsfZcf9Xdvf/HP+SgUQ2/AktDM92g0sLqtx4Wrzu0TwOKQTb07cwC +1DNpugspBQgHRS5YfouhdZ3SA2vtS48M2TOsL++ISQQYEQIACQUCScdNAAIbDAAK +CRB8rbdyOTMrpgloAJ9/y0sa/v+FdmYVeJfaay9ETX7SMwCfSVEW8VvgXoglQbuz +DA18EOfx5Mg= +=7awt +-END PGP PUBLIC KEY BLOCK-
svn commit: r757369 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Mon Mar 23 10:38:41 2009 New Revision: 757369 URL: http://svn.apache.org/viewvc?rev=757369&view=rev Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.6 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=757369&r1=757368&r2=757369&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Mon Mar 23 10:38:41 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.6-SNAPSHOT + 2.6 maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.6 JIRA
svn commit: r757371 - /maven/plugins/tags/maven-eclipse-plugin-2.6/
Author: baerrach Date: Mon Mar 23 10:45:36 2009 New Revision: 757371 URL: http://svn.apache.org/viewvc?rev=757371&view=rev Log: [maven-release-plugin] copy for tag maven-eclipse-plugin-2.6 Added: maven/plugins/tags/maven-eclipse-plugin-2.6/ - copied from r757370, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r757372 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Mon Mar 23 10:45:44 2009 New Revision: 757372 URL: http://svn.apache.org/viewvc?rev=757372&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=757372&r1=757371&r2=757372&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Mon Mar 23 10:45:44 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.6 + 2.7-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.6 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r757377 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Mon Mar 23 11:16:10 2009 New Revision: 757377 URL: http://svn.apache.org/viewvc?rev=757377&view=rev Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.6 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=757377&r1=757376&r2=757377&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Mon Mar 23 11:16:10 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7-SNAPSHOT + 2.6 maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.6 JIRA
svn commit: r757378 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Mon Mar 23 11:18:01 2009 New Revision: 757378 URL: http://svn.apache.org/viewvc?rev=757378&view=rev Log: [maven-release-plugin] rollback the release of maven-eclipse-plugin-2.6 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=757378&r1=757377&r2=757378&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Mon Mar 23 11:18:01 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.6 + 2.7-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.6 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r757379 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Mon Mar 23 11:20:22 2009 New Revision: 757379 URL: http://svn.apache.org/viewvc?rev=757379&view=rev Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.6 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=757379&r1=757378&r2=757379&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Mon Mar 23 11:20:22 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7-SNAPSHOT + 2.6 maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.6 JIRA
svn commit: r757537 - /maven/plugins/tags/maven-eclipse-plugin-2.6/
Author: baerrach Date: Mon Mar 23 20:40:18 2009 New Revision: 757537 URL: http://svn.apache.org/viewvc?rev=757537&view=rev Log: redoing release Removed: maven/plugins/tags/maven-eclipse-plugin-2.6/
svn commit: r757538 - /maven/plugins/tags/maven-eclipse-plugin-2.6/
Author: baerrach Date: Mon Mar 23 20:41:25 2009 New Revision: 757538 URL: http://svn.apache.org/viewvc?rev=757538&view=rev Log: [maven-release-plugin] copy for tag maven-eclipse-plugin-2.6 Added: maven/plugins/tags/maven-eclipse-plugin-2.6/ - copied from r757536, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r757539 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Mon Mar 23 20:41:39 2009 New Revision: 757539 URL: http://svn.apache.org/viewvc?rev=757539&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=757539&r1=757538&r2=757539&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Mon Mar 23 20:41:39 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.6 + 2.7-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.6 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.6 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r758515 - in /maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion: pom.xml verify.bsh
Author: baerrach
Date: Thu Mar 26 04:25:49 2009
New Revision: 758515
URL: http://svn.apache.org/viewvc?rev=758515&view=rev
Log:
removed SNAPSHOT from IT test dependency - otherwise it will fail because the
snapshot repo is not available
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml?rev=758515&r1=758514&r2=758515&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/pom.xml
Thu Mar 26 04:25:49 2009
@@ -26,7 +26,7 @@
org.codehaus.plexus
plexus-utils
- 1.3-SNAPSHOT
+ 1.3
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh?rev=758515&r1=758514&r2=758515&view=diff
==
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/basic-features/outputFileNameMapping-withArtifactBaseVersion/verify.bsh
Thu Mar 26 04:25:49 2009
@@ -6,7 +6,7 @@
try
{
-result = new File( basedir,
"target/outputFileNameMapping-withArtifactBaseVersion-1.0-SNAPSHOT-bin/lib/plexus-utils-1.3-SNAPSHOT.jar"
).exists();
+result = new File( basedir,
"target/outputFileNameMapping-withArtifactBaseVersion-1.0-SNAPSHOT-bin/lib/plexus-utils-1.3.jar"
).exists();
}
catch( IOException e )
{
svn commit: r759020 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/ test/java/org/apache/maven/plugin/
Author: baerrach Date: Fri Mar 27 04:46:39 2009 New Revision: 759020 URL: http://svn.apache.org/viewvc?rev=759020&view=rev Log: [MECLIPSE-538] Ajdt support needs to include*.aj on the classpath. Moved inclusion/exclusion patterns out of EclipseClasspathWriter and into EclipsePlugin extract methods where the EclipseSourceDir gets created and defines the includes/excludes. If ajdt is enable then all sources directories will include **/*.aj files. The aspect directory will also include **/*.java files. Added toString() to EclipseSourceDir. The generated resource directory for manifest handling (target/generated-resources/eclipse) no longer exclude java files. Since we create that directory and copy the MANIFEST.MF file into it there isn't much need for exclusion. Test cases updated to reflect this. Test case for MECLIPSE-538 created. Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/org/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/org/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/org/test/Profiling2.aj (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/App.java (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/Profiling.aj (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/resources/dummy maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/org/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/org/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/org/test/AppTest.java (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/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/EclipseSourceDir.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseAjdtPluginIT.java maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07
svn commit: r759846 - in /maven/plugins/trunk/maven-eclipse-plugin: ./ src/main/java/org/apache/maven/plugin/eclipse/ src/test/java/org/apache/maven/plugin/eclipse/ src/test/java/org/apache/maven/plug
Author: baerrach Date: Mon Mar 30 06:26:34 2009 New Revision: 759846 URL: http://svn.apache.org/viewvc?rev=759846&view=rev Log: [MECLIPSE-104] - Add the ability to specify source inclusions/exclusions Submitted by: Richard van der Hoff The configuration for EclipsePlugin now accepts XXX (same for sourceExclusions) to modifiy the classpath entries for source directories. **/*.java is always added if it is a java (or pde) project **/*.aj is always added if it is an ajdt project. Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/src/main/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-1/src/main/resources/dummy maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/src/main/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-2/src/main/resources/dummy maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/src/main/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/module-3/src/main/resources/dummy maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-52-MECLIPSE-104/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resou
svn commit: r760283 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java site/apt/examples/specifying-source-path-inclusions-and-exclusions.
Author: baerrach
Date: Tue Mar 31 01:03:35 2009
New Revision: 760283
URL: http://svn.apache.org/viewvc?rev=760283&view=rev
Log:
[MECLIPSE-104]
Added site documentation and updated the parameter documentation.
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/specifying-source-path-inclusions-and-exclusions.apt
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml
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=760283&r1=760282&r2=760283&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
Tue Mar 31 01:03:35 2009
@@ -524,7 +524,11 @@
/**
* List of inclusions to add to the source directories on the classpath.
* Adds including="" to the classpathentry of the eclipse .classpath file.
- * Defaults to "**\/*.java"
+ *
+ * Java projects will always include "**/*.java"
+ *
+ * Ajdt projects will always include "**/*.aj"
+ *
* [MECLIPSE-104]
*
* @since 2.6.1
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/specifying-source-path-inclusions-and-exclusions.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/specifying-source-path-inclusions-and-exclusions.apt?rev=760283&view=auto
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/specifying-source-path-inclusions-and-exclusions.apt
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/specifying-source-path-inclusions-and-exclusions.apt
Tue Mar 31 01:03:35 2009
@@ -0,0 +1,62 @@
+ --
+ Specifying source path inclusions and exclusions
+ --
+ Barrie Treloar
+ --
+ 31 March 2009
+ --
+
+Overview
+
+ With the change done as part of
{{{http://jira.codehaus.org/browse/MECLIPSE-443}MECLIPSE-443 "Only include
**/*.java in Java source directories"}}
+ the .classpath entries for classpathentry kind="src" now specify an
<<>> attribute with a value of <<<"**/*.java">>>.
+ Previously this attribute was not specified which meant that
eclipse would include any file in this src directory as being on the classpath
and hence compiled.
+
+ This broke Ajdt support as <<<"**/*.aj">>> files were no longer
included on the classpath and
{{{http://jira.codehaus.org/browse/MECLIPSE-538}MECLIPSE-538}} fixed this.
+
+ {{{http://jira.codehaus.org/browse/MECLIPSE-104}MECLIPSE-104 "Add the
ability to specify source inclusions/exclusions"}} was added put back this
flexibility.
+
+ In summary:
+
+ * If your project is a java project then "**/*.java" will always be
added to the including attribute of source directories.
+
+ * If your project is an ajdt project then "**/*.aj" will always be
added to the including attribute of source directories.
+
+ * If you need any additional includes or excludes for source
directories then use the configuration elements sourceIncludes/sourceExcludes
+
+ []
+
+Example - Specifying sourceIncludes/sourceExcludes
+
++-
+
+ [...]
+
+[...]
+
+ [...]
+
+org.apache.maven.plugins
+maven-eclipse-plugin
+
+
+**/.svn/**
+
+
+**/*.myExtension
+
+
+
+ [...]
+
+[...]
+
+ [...]
+
++-
+
+ This will result in the <<<.classpath>>> file having source directory
entries similar to this:
+
++-
+
++-
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/specifying-source-path-inclusions-and-exclusions.apt
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/specifying-source-path-inclusions-and-exclusions.apt
--
svn:keywords = Author Date Id
svn commit: r761055 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: baerrach
Date: Wed Apr 1 20:56:35 2009
New Revision: 761055
URL: http://svn.apache.org/viewvc?rev=761055&view=rev
Log:
Release of Maven Eclipse PLugin 2.6
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=761055&r1=761054&r2=761055&view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Wed Apr 1 20:56:35 2009
@@ -148,7 +148,7 @@
*---+--++--+++
| <> | |
| <> | |
*---+--++--+++
-| {{{/plugins/maven-eclipse-plugin/} <<>>}}| 2.5.1|
2008-04-05 | Generate an Eclipse project file for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MECLIPSE}JIRA}}
+| {{{/plugins/maven-eclipse-plugin/} <<>>}}| 2.6 |
2009-03-23 | Generate an Eclipse project file for the current project. |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MECLIPSE}JIRA}}
*---+--++--+++
| {{{/plugins/maven-idea-plugin/} <<>>}} | 2.2 |
2008-08-08 | Create/update an IDEA workspace for the current project
(individual modules are created as IDEA modules) |
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-idea-plugin}SVN}}
| {{{http://jira.codehaus.org/browse/MIDEA}JIRA}}
*---+--++--+++
svn commit: r761139 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Thu Apr 2 00:52:56 2009 New Revision: 761139 URL: http://svn.apache.org/viewvc?rev=761139&view=rev Log: bumping to 2.7 as per email that fixing regression with a new feature shouldn't be a .z version update. Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=761139&r1=761138&r2=761139&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Thu Apr 2 00:52:56 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.6.1-SNAPSHOT + 2.7-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM.
svn commit: r761418 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Thu Apr 2 20:29:35 2009 New Revision: 761418 URL: http://svn.apache.org/viewvc?rev=761418&view=rev Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.7 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=761418&r1=761417&r2=761418&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Thu Apr 2 20:29:35 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7-SNAPSHOT + 2.7 maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 JIRA
svn commit: r761419 - in /maven/plugins/tags/maven-eclipse-plugin-2.7: ./ pom.xml
Author: baerrach Date: Thu Apr 2 20:29:47 2009 New Revision: 761419 URL: http://svn.apache.org/viewvc?rev=761419&view=rev Log: [maven-release-plugin] copy for tag maven-eclipse-plugin-2.7 Added: maven/plugins/tags/maven-eclipse-plugin-2.7/ - copied from r761413, maven/plugins/trunk/maven-eclipse-plugin/ maven/plugins/tags/maven-eclipse-plugin-2.7/pom.xml - copied unchanged from r761418, maven/plugins/trunk/maven-eclipse-plugin/pom.xml
svn commit: r761420 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Thu Apr 2 20:29:53 2009 New Revision: 761420 URL: http://svn.apache.org/viewvc?rev=761420&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=761420&r1=761419&r2=761420&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Thu Apr 2 20:29:53 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7 + 2.8-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r761916 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sat Apr 4 12:38:29 2009 New Revision: 761916 URL: http://svn.apache.org/viewvc?rev=761916&view=rev Log: [maven-release-plugin] prepare release maven-eclipse-plugin-2.7 Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=761916&r1=761915&r2=761916&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sat Apr 4 12:38:29 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.8-SNAPSHOT + 2.7 maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ - http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 + http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 JIRA
svn commit: r761917 - /maven/plugins/tags/maven-eclipse-plugin-2.7/
Author: baerrach Date: Sat Apr 4 12:43:50 2009 New Revision: 761917 URL: http://svn.apache.org/viewvc?rev=761917&view=rev Log: re-releasing Removed: maven/plugins/tags/maven-eclipse-plugin-2.7/
svn commit: r761918 - /maven/plugins/tags/maven-eclipse-plugin-2.7/
Author: baerrach Date: Sat Apr 4 12:44:29 2009 New Revision: 761918 URL: http://svn.apache.org/viewvc?rev=761918&view=rev Log: [maven-release-plugin] copy for tag maven-eclipse-plugin-2.7 Added: maven/plugins/tags/maven-eclipse-plugin-2.7/ - copied from r761916, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r761919 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: baerrach Date: Sat Apr 4 12:44:46 2009 New Revision: 761919 URL: http://svn.apache.org/viewvc?rev=761919&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=761919&r1=761918&r2=761919&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Sat Apr 4 12:44:46 2009 @@ -27,7 +27,7 @@ 13 maven-eclipse-plugin - 2.7 + 2.8-SNAPSHOT maven-plugin Maven Eclipse Plugin The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM. @@ -35,9 +35,9 @@ 2.0.1 - scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-eclipse-plugin-2.7 - http://svn.apache.org/viewvc/maven/plugins/tags/maven-eclipse-plugin-2.7 + scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-eclipse-plugin/ + http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/ JIRA
svn commit: r693322 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Author: baerrach
Date: Mon Sep 8 17:14:40 2008
New Revision: 693322
URL: http://svn.apache.org/viewvc?rev=693322&view=rev
Log:
Removed unused argument "mavenRepo" from getLines() private method.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=693322&r1=693321&r2=693322&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Mon Sep 8 17:14:40 2008
@@ -468,14 +468,14 @@
protected void assertFileEquals( String mavenRepo, File expectedFile, File
actualFile )
throws IOException
{
-List expectedLines = getLines( mavenRepo, expectedFile );
+List expectedLines = getLines( expectedFile );
if ( !actualFile.exists() )
{
throw new AssertionFailedError( "Expected file not found: " +
actualFile.getAbsolutePath() );
}
-List actualLines = getLines( mavenRepo, actualFile );
+List actualLines = getLines( actualFile );
String filename = actualFile.getName();
String basedir = new File( getBasedir() ).getCanonicalPath().replace(
'\\', '/' );
@@ -570,7 +570,7 @@
}
}
-private List getLines( String mavenRepo, File file )
+private List getLines( File file )
throws IOException
{
List lines = new ArrayList();
svn commit: r693338 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it: AbstractEclipsePluginIT.java EclipsePluginMasterProjectIT.java RadPluginIT.java
Author: baerrach
Date: Mon Sep 8 18:36:25 2008
New Revision: 693338
URL: http://svn.apache.org/viewvc?rev=693338&view=rev
Log:
Removed unused argument "mavenRepo" from assertFileEquals().
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=693338&r1=693337&r2=693338&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Mon Sep 8 18:36:25 2008
@@ -459,13 +459,13 @@
throw new AssertionFailedError( "Expected file not found:
" + actualFile.getAbsolutePath() );
}
-assertFileEquals( localRepositoryDirectory.getCanonicalPath(),
expectedFile, actualFile );
+assertFileEquals( expectedFile, actualFile );
}
}
}
-protected void assertFileEquals( String mavenRepo, File expectedFile, File
actualFile )
+protected void assertFileEquals( File expectedFile, File actualFile )
throws IOException
{
List expectedLines = getLines( expectedFile );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java?rev=693338&r1=693337&r2=693338&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipsePluginMasterProjectIT.java
Mon Sep 8 18:36:25 2008
@@ -103,8 +103,7 @@
throws Exception
{
executeMaven2();
-assertFileEquals( null, new File( basedir,
"module-1/expected/.project" ), //
- new File( basedir, "module-1/.project" ) );
+assertFileEquals( new File( basedir, "module-1/expected/.project" ),
new File( basedir, "module-1/.project" ) );
}
public void testModule1Classpath()
@@ -134,16 +133,14 @@
throws Exception
{
executeMaven2();
-assertFileEquals( null, new File( basedir,
"module-1/expected/.wtpmodules" ), //
- new File( basedir, "module-1/.wtpmodules" ) );
+assertFileEquals( new File( basedir, "module-1/expected/.wtpmodules"
), new File( basedir, "module-1/.wtpmodules" ) );
}
public void testModule2Project()
throws Exception
{
executeMaven2();
-assertFileEquals( null, new File( basedir,
"module-2/expected/.project" ), //
- new File( basedir, "module-2/.project" ) );
+assertFileEquals( new File( basedir, "module-2/expected/.project" ),
new File( basedir, "module-2/.project" ) );
}
public void testModule2Classpath()
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java?rev=693338&r1=693337&r2=693338&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
Mon Sep 8 18:36:25 2008
@@ -62,7 +62,7 @@
File generatedManifest = getTestFile( PROJECTS_BASEDIR +
"/project-rad-3/ejbModule/META-INF/MANIFEST.MF" );
File expectedManifest =
getTestFile( PROJECTS_BASEDIR +
"/project-rad-3/ejbModule/META-INF/expected_MANIFEST.MF" );
-assertFileEquals( localRepositoryDirectory.getCanonicalPath(),
expectedManifest, generatedManifest );
+assertFileEquals( expectedManifest, generatedManifest );
}
public void testProject4()
svn commit: r694563 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
Author: baerrach Date: Thu Sep 11 17:29:59 2008 New Revision: 694563 URL: http://svn.apache.org/viewvc?rev=694563&view=rev Log: [MECLIPSE-486] fixing incorrect hard coded path Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath?rev=694563&r1=694562&r2=694563&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath Thu Sep 11 17:29:59 2008 @@ -32,5 +32,5 @@ - + \ No newline at end of file
svn commit: r694576 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-myeclipse-06-MECLIPSE-427/src/main/resources/ project-myeclipse-07-MECLIPSE-445/multymodule-2/sr
Author: baerrach Date: Thu Sep 11 18:35:29 2008 New Revision: 694576 URL: http://svn.apache.org/viewvc?rev=694576&view=rev Log: [MECLIPSE-486] fixing incorrectly named files Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/applicationContext-foo.xml - copied unchanged from r694545, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/applicaitonContext-foo.xml maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicationContext-foo.xml - copied unchanged from r694545, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicaitonContext-foo.xml Removed: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/applicaitonContext-foo.xml maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/resources/applicaitonContext-foo.xml
svn commit: r694577 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Author: baerrach
Date: Thu Sep 11 18:36:16 2008
New Revision: 694577
URL: http://svn.apache.org/viewvc?rev=694577&view=rev
Log:
[MECLIPSE-486] Adding more hacks into assertFile to handle generated values.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java?rev=694577&r1=694576&r2=694577&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
Thu Sep 11 18:36:16 2008
@@ -499,28 +499,44 @@
}
/*
- * NOTE: This is to account for the unfortunate fact that "file:"
URIs differ between Windows and Unix. On a
- * Windows box, the path "C:\dir" is mapped to "file:/C:/dir". On
a Unix box, the path "/home/dir" is mapped
- * to "file:/home/dir". So, in the first case the slash after
"file:" is not part of the corresponding
- * filesystem path while in the later case it is. This discrepancy
makes verifying the javadoc attachments
- * in ".classpath" a little tricky.
+ * Hacks for assertEquals problems.
*/
if ( !expected.equals( actual ) )
{
+/*
+ * NOTE: This is to account for the unfortunate fact that
"file:" URIs differ between Windows and Unix.
+ * On a Windows box, the path "C:\dir" is mapped to
"file:/C:/dir". On a Unix box, the path "/home/dir"
+ * is mapped to "file:/home/dir". So, in the first case the
slash after "file:" is not part of the
+ * corresponding filesystem path while in the later case it
is. This discrepancy makes verifying the
+ * javadoc attachments in ".classpath" a little tricky.
+ */
// convert "file:C:/dir" to "file:/C:/dir"
expected = expected.replaceAll( "file:([a-zA-Z])", "file:/$1"
);
-}
-/*
- * NOTE: This is another hack to compensate for some metadata
files that contain a complete XML file as the
- * value for a key like "org.eclipse.jdt.ui.formatterprofiles"
from "org.eclipse.jdt.ui.prefs". Line
- * terminators in this value are platform-dependent.
- */
-if ( !expected.equals( actual ) &&
expectedFile.getName().endsWith( ".prefs" ) )
-{
-// normalize line terminators
-expected = expected.replaceAll(
"(rn)|(n)|(r)", "\\n" );
-actual = actual.replaceAll( "(rn)|(n)|(r)",
"\\n" );
+if ( expectedFile.getName().endsWith( ".prefs" ) )
+{
+/*
+ * NOTE: This is another hack to compensate for some
metadata files that contain a complete XML file
+ * as the value for a key like
"org.eclipse.jdt.ui.formatterprofiles" from
+ * "org.eclipse.jdt.ui.prefs". Line terminators in this
value are platform-dependent.
+ */
+// normalize line terminators
+expected = expected.replaceAll(
"(rn)|(n)|(r)", "\\n" );
+actual = actual.replaceAll(
"(rn)|(n)|(r)", "\\n" );
+}
+else if ( expectedFile.getName().equals(
"org.eclipse.wst.common.component" )
+|| expectedFile.getName().equals( ".modulemaps" )
+|| expectedFile.getName().equals( "application.xml" ) )
+{
+/*
+ * NOTE: This is a hack to compensate for files that
contain generated values like dependent-object
+ * in org.eclipse.wst.common.component.
+ *
+ * Regex would be a better solution.
+ */
+expected = expected.replaceAll( "_\\d+", "" );
+actual = actual.replaceAll( "_\\d+", "" );
+}
}
assertEquals( "Comparing '" + IdeUtils.getCanonicalPath(
actualFile ) + "' against '"
svn commit: r694602 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/eclipse/writers/ test/resources/projects/project-34
Author: baerrach
Date: Thu Sep 11 21:39:45 2008
New Revision: 694602
URL: http://svn.apache.org/viewvc?rev=694602&view=rev
Log:
Changed EclipseSourceDir so that path is always stored with / and not \s.
Modified unit test to use input path containing \\ and check that the results
does not contain \\ but uses /
Changed expected .classpath for project-34 to use /s in file.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java?rev=694602&r1=694601&r2=694602&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseSourceDir.java
Thu Sep 11 21:39:45 2008
@@ -18,6 +18,8 @@
*/
package org.apache.maven.plugin.eclipse;
+import org.apache.maven.plugin.ide.IdeUtils;
+
/**
* Represent an eclipse source dir. Eclipse has no "main", "test" or
"resource" concepts, so two source dirs with the
* same path are equal.
@@ -45,7 +47,7 @@
public EclipseSourceDir( String path, String output, boolean isResource,
boolean test, String include,
String exclude, boolean filtering )
{
-this.path = path;
+setPath( path );
this.output = output;
this.isResource = isResource;
this.test = test;
@@ -126,12 +128,13 @@
/**
* Setter for path.
+ * Converts \\ to / in path.
*
* @param path The path to set.
*/
public void setPath( String path )
{
-this.path = path;
+this.path = IdeUtils.fixSeparator( path );
}
/**
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java?rev=694602&r1=694601&r2=694602&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
Thu Sep 11 21:39:45 2008
@@ -74,7 +74,7 @@
EclipseSourceDir dir =
new EclipseSourceDir( "src/main/resources", "target/classes",
true, false, null, null, false );
EclipseSourceDir testDir =
-new EclipseSourceDir( "src/test/resources",
"target/classes/test-resources", true, true, null, null, false );
+new EclipseSourceDir( "src\\test\\resources",
"target/classes/test-resources", true, true, null, null, false );
EclipseSourceDir[] dirs = { dir, testDir };
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath?rev=694602&r1=694601&r2=694602&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/expected/.classpath
Thu Sep 11 21:39:45 2008
@@ -1,6 +1,6 @@
-
+
svn commit: r694608 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-myeclipse-06-MECLIPSE-427/expected/ project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/ pr
Author: baerrach Date: Thu Sep 11 22:47:42 2008 New Revision: 694608 URL: http://svn.apache.org/viewvc?rev=694608&view=rev Log: Fixing incorrect filename ".springbeans" should have capital B as in ".springBeans" Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springBeansX - copied unchanged from r694563, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springbeans maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springBeansX - copied unchanged from r694563, 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-2/expected/.springBeansX - copied unchanged from r694563, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springbeans Removed: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springbeans 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-2/expected/.springbeans
svn commit: r694610 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects: project-myeclipse-06-MECLIPSE-427/expected/ project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/ pr
Author: baerrach Date: Thu Sep 11 22:49:28 2008 New Revision: 694610 URL: http://svn.apache.org/viewvc?rev=694610&view=rev Log: Fixing incorrect filename ".springbeans" should have capital B as in ".springBeans" Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springBeans - copied unchanged from r694608, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springBeansX maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springBeans - copied unchanged from r694608, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springBeansX maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springBeans - copied unchanged from r694608, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springBeansX Removed: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springBeansX maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springBeansX maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springBeansX
svn commit: r696092 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/eclipse/ test/resources/m2repo/eclipseinstall/jira/
Author: baerrach
Date: Tue Sep 16 16:07:04 2008
New Revision: 696092
URL: http://svn.apache.org/viewvc?rev=696092&view=rev
Log:
[MECLIPSE-488] - Fixed eclipse:install issue if jar does not contain a Manifest.
Submitted by: Baptiste MATHUS
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipseinstall/jira/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipseinstall/jira/meclipse/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipseinstall/jira/meclipse/488/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipseinstall/jira/meclipse/488/meclipse-488.jar
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java?rev=696092&r1=696091&r2=696092&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/InstallPluginsMojo.java
Tue Sep 16 16:07:04 2008
@@ -231,7 +231,8 @@
*
*
* Determine whether the plugin should be extracted into a directory
or not
- * If the plugin's target location exists, or overwrite is set to
true:
+ * If the plugin's target location exists, or overwrite is set to true:
+ *
* if extract, ensure the plugin target location exists (mkdirs), and
extract there.
* copy the plugin file from the local repository to the target
location
*
@@ -276,6 +277,13 @@
// don't verify, plugins zipped by eclipse:make-artifacts could
have a bad signature
JarFile jar = new JarFile( artifact.getFile(), false );
Manifest manifest = jar.getManifest();
+if ( manifest == null )
+{
+getLog().debug(
+"Ignoring " + artifact.getArtifactId()
++ " as it is does not have a Manifest (and
so is not an OSGi bundle)" );
+return;
+}
attributes = manifest.getMainAttributes();
}
catch ( IOException e )
@@ -408,8 +416,8 @@
/**
*
- * Format the artifact information into an Eclipse-friendly plug-in name.
- * Delegates to maven2OsgiConverter to obtain bundle symbolic name and
version.
+ * Format the artifact information into an Eclipse-friendly plug-in name.
Delegates to maven2OsgiConverter to obtain
+ * bundle symbolic name and version.
*
*/
private String formatEclipsePluginName( Artifact artifact )
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java?rev=696092&r1=696091&r2=696092&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/InstallPluginsMojoTest.java
Tue Sep 16 16:07:04 2008
@@ -55,9 +55,7 @@
{
private static final String TEST_M2_REPO = "m2repo/eclipseinstall/";
-private static final Artifact ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME =
-new DefaultArtifact( "org.eclipse.core", "runtime",
VersionRange.createFromVersion( "3.2.0-v20060603" ),
- "scope-unused", "eclipse-plugin",
"classifier-unused", null );
+private static Artifact ARTIFACT_ORG_ECLIPSE_CORE_RUNTIME;
private TestFileManager fileManager;
@@ -88,6 +86,33 @@
return new File( pluginsDir, formatEclipsePluginName( artifact ) +
".jar" );
}
+public void testJira488()
+throws MojoExecutionException, MojoFailureException
+{
+Artifact jira488_missingManifest =
+createArtifact("jira", "meclipse", "488");
+
+File pluginsDir = performTestInstall( null, false,
jira488_missingManifest, "eclipse-plugin" );
+
+File installedFile = locateInstalledFile( pluginsDir,
ARTIFAC
svn commit: r696147 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/ide/
Author: baerrach
Date: Tue Sep 16 21:27:35 2008
New Revision: 696147
URL: http://svn.apache.org/viewvc?rev=696147&view=rev
Log:
[MECLIPSE-206] adding unit tests for IdeUtils.toRelativeAndFixSeparator on
windows.
removed MavenProject from extractResourceDirs() as parameter never used.
In EclipsePluginUnitTest changed assertTrue()s with path.endWith() to be
assertEquals as we know what the correct values should be.
In IdeUtilsTest added two tests for windows file paths. One for files on
different drives with absolute paths and one for files on different drives and
relative paths.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/ide/IdeUtilsTest.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=696147&r1=696146&r2=696147&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
Tue Sep 16 21:27:35 2008
@@ -1372,16 +1372,16 @@
extractSourceDirs( mainDirectories, project.getCompileSourceRoots(),
basedir, projectBaseDir, false, null );
-extractResourceDirs( mainDirectories,
project.getBuild().getResources(), project, basedir, projectBaseDir,
- false, mainOutput );
+extractResourceDirs( mainDirectories,
project.getBuild().getResources(), basedir, projectBaseDir, false,
+ mainOutput );
Set testDirectories = new LinkedHashSet();
extractSourceDirs( testDirectories,
project.getTestCompileSourceRoots(), basedir, projectBaseDir, true,
testOutput );
-extractResourceDirs( testDirectories,
project.getBuild().getTestResources(), project, basedir, projectBaseDir,
- true, testOutput );
+extractResourceDirs( testDirectories,
project.getBuild().getTestResources(), basedir, projectBaseDir, true,
+ testOutput );
// avoid duplicated entries
Set directories = new LinkedHashSet();
@@ -1425,8 +1425,8 @@
}
}
-void extractResourceDirs( Set directories, List resources, MavenProject
project, File basedir,
- File workspaceProjectBaseDir, boolean test,
final String output )
+void extractResourceDirs( Set directories, List resources, File basedir,
File workspaceProjectBaseDir,
+ boolean test, final String output )
throws MojoExecutionException
{
for ( Iterator it = resources.iterator(); it.hasNext(); )
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java?rev=696147&r1=696146&r2=696147&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginUnitTest.java
Tue Sep 16 21:27:35 2008
@@ -93,7 +93,7 @@
String path = result[0].getOutput();
-assertTrue( "output directory should end with: " + resOutput,
path.endsWith( resOutput ) );
+assertEquals( resOutput, path );
}
public void testExtractResourceDirs_ShouldUseResourceOutput()
@@ -124,7 +124,7 @@
EclipsePlugin plugin = newMojo();
-plugin.extractResourceDirs( result, project.getBuild().getResources(),
project, basedir, basedir, false,
+plugin.extractResourceDirs( result, project.getBuild().getResources(),
basedir, basedir, false,
"target/classes" );
Iterator resultIter = result.iterator();
@@ -135,8 +135,7 @@
String prefix = "target/classes/";
-assertTrue( "output directory should end with: " + prefix + resOutput
+ "\nWas: " + path, path.endsWith( prefix
-+ resOutput ) );
+assertEquals( prefix + resOutput, path );
}
public void testExtractResourceDirs_ShouldUseSpecifiedO
svn commit: r696151 - in /maven/plugins/trunk/maven-eclipse-plugin/src/site: apt/index.apt site.xml
Author: baerrach
Date: Tue Sep 16 22:09:55 2008
New Revision: 696151
URL: http://svn.apache.org/viewvc?rev=696151&view=rev
Log:
[MECLIPSE-166] added example documentation for creating checkstyle
configurations to site.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt?rev=696151&r1=696150&r2=696151&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt Tue Sep 16
22:09:55 2008
@@ -98,6 +98,8 @@
* {{{examples/load-code-styles.html}Load Code Style file}}
+ * {{{examples/configure-checkstyle.html}Configure Checkstyle}}
+
* {{{examples/multi-module-projects.html}Multi-module projects with WTP}}
* {{{examples/ajdt-projects.html}AJDT projects}}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml?rev=696151&r1=696150&r2=696151&view=diff
==
--- maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/site/site.xml Tue Sep 16
22:09:55 2008
@@ -39,6 +39,7 @@
+
svn commit: r696152 - /maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/configure-checkstyle.apt
Author: baerrach Date: Tue Sep 16 22:10:41 2008 New Revision: 696152 URL: http://svn.apache.org/viewvc?rev=696152&view=rev Log: [MECLIPSE-166] added example documentation for creating checkstyle configurations to site. Added: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/configure-checkstyle.apt (with props) Added: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/configure-checkstyle.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/configure-checkstyle.apt?rev=696152&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/configure-checkstyle.apt (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/configure-checkstyle.apt Tue Sep 16 22:10:41 2008 @@ -0,0 +1,64 @@ + -- + Configure Checkstyle + -- + Barrie Treloar + -- + 17 September 2008 + -- + +Configure Checkstyle + + You can configure checkstyle by creating/importing your Checkstyle Check Configuration in Eclipse + and then in your pom specify: + + * additionalBuildcommands + + * additionalProjectnatures + + * additionalConfig to create the .checkstyle file. + + [] + + See the example below, make sure you specify the correct value in <<>>. + ++- + + [...] + +[...] + + [...] + + org.apache.maven.plugins + maven-eclipse-plugin + + + com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder + + + com.atlassw.tools.eclipse.checkstyle.CheckstyleNature + + + +.checkstyle + + + + + + + + [...] + +[...] + + [...] + ++- \ No newline at end of file Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/configure-checkstyle.apt -- svn:eol-style = native
svn commit: r696154 - /maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
Author: baerrach
Date: Tue Sep 16 22:27:24 2008
New Revision: 696154
URL: http://svn.apache.org/viewvc?rev=696154&view=rev
Log:
[MECLIPSE-337] added back in testProject2 - nothing needed to be done tests
just works.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java?rev=696154&r1=696153&r2=696154&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/RadPluginIT.java
Tue Sep 16 22:27:24 2008
@@ -47,13 +47,16 @@
testProject( "project-rad-1", new Properties(), "rad-clean", "rad" );
}
-/*
- * TODO: fix failing test public void testProject2() throws Exception {
testProject( "project-rad-2", new
- * Properties(), "rad-clean", "rad" ); File generatedManifest =
getTestFile( PROJECTS_BASEDIR +
- * "/project-rad-2/src/main/webapp/META-INF/MANIFEST.MF" ); File
expectedManifest = getTestFile( PROJECTS_BASEDIR +
- * "/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF" );
assertFileEquals(
- * localRepositoryDirectory.getCanonicalPath(), expectedManifest,
generatedManifest ); }
- */
+public void testProject2()
+throws Exception
+{
+testProject( "project-rad-2", new Properties(), "rad-clean", "rad" );
+File generatedManifest = getTestFile( PROJECTS_BASEDIR +
"/project-rad-2/src/main/webapp/META-INF/MANIFEST.MF" );
+File expectedManifest =
+getTestFile( PROJECTS_BASEDIR +
"/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF" );
+assertFileEquals( expectedManifest, generatedManifest );
+
+}
public void testProject3()
throws Exception
