You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2008/09/03 01:17:04 UTC
svn commit: r691425 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/writers/
test/resources/projects/project-ajdt1/
test/resources/projects/project-ajdt1/expected/
test/resources/projects/project-ajdt2/ tes...
Author: aheritier
Date: Tue Sep 2 16:17:03 2008
New Revision: 691425
URL: http://svn.apache.org/viewvc?rev=691425&view=rev
Log:
MECLIPSE-200 : add support for the AJDT plugin
Fix tests and add support of vars in org.eclipse.ajdt.ui.prefs
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.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/resources/projects/project-ajdt1/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/pom.xml
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-ajdt2/pom.xml
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-ajdt3/pom.xml
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-ajdt4/expected/.settings/org.eclipse.ajdt.ui.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/pom.xml
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-ajdt5/expected/.settings/org.eclipse.ajdt.ui.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/pom.xml
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-ajdt6/expected/.settings/org.eclipse.ajdt.ui.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/pom.xml
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-ajdt7/pom.xml
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-ajdt8/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/pom.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java Tue Sep 2 16:17:03 2008
@@ -153,18 +153,67 @@
if ( dep.isReferencedProject() && !config.isPde() )
{
- path = "/" + dep.getArtifactId(); //$NON-NLS-1$
+ path = "/" + dep.getEclipseProjectName(); //$NON-NLS-1$
+ }
+ else if ( dep.isReferencedProject() && config.isPde() )
+ {
+ // don't do anything, referenced projects are automatically handled by eclipse in PDE builds
+ return;
}
else
{
File artifactPath = dep.getFile();
+
if ( artifactPath == null )
{
log.error( Messages.getString( "EclipsePlugin.artifactpathisnull", dep.getId() ) ); //$NON-NLS-1$
return;
}
- path = IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), artifactPath, false );
+ if ( dep.isSystemScoped() )
+ {
+ path = IdeUtils.toRelativeAndFixSeparator( config.getEclipseProjectDirectory(), artifactPath, false );
+
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( Messages.getString( "EclipsePlugin.artifactissystemscoped", //$NON-NLS-1$
+ new Object[] { dep.getArtifactId(), path } ) );
+ }
+ }
+ else
+ {
+ File localRepositoryFile = new File( config.getLocalRepository().getBasedir() );
+
+ // if the dependency is not provided and the plugin runs in "pde mode", the dependency is
+ // added to the Bundle-Classpath:
+ if ( config.isPde() && ( dep.isProvided() || dep.isOsgiBundle() ) )
+ {
+ return;
+ }
+ else if ( config.isPde() && !dep.isProvided() && !dep.isTestDependency() )
+ {
+ // path for link created in .project, not to the actual file
+ path = dep.getFile().getName();
+ }
+ // running in PDE mode and the dependency is provided means, that it is provided by
+ // the target platform. This case is covered by adding the plugin container
+ else
+ {
+ String fullPath = artifactPath.getPath();
+ String relativePath =
+ IdeUtils.toRelativeAndFixSeparator( localRepositoryFile, new File( fullPath ), false );
+
+ if ( !new File( relativePath ).isAbsolute() )
+ {
+ path = EclipseClasspathWriter.M2_REPO + "/" //$NON-NLS-1$
+ + relativePath;
+ }
+ else
+ {
+ path = relativePath;
+ }
+ }
+ }
}
ajdtSettings.setProperty( AJDT_PROP_PREFIX + propName + CONTENT_KIND + index, BINARY );
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=691425&r1=691424&r2=691425&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 Sep 2 16:17:03 2008
@@ -88,7 +88,7 @@
/**
* Eclipse build path variable M2_REPO
*/
- private static final String M2_REPO = "M2_REPO"; //$NON-NLS-1$
+ protected static final String M2_REPO = "M2_REPO"; //$NON-NLS-1$
/**
* Attribute for sourcepath.
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/expected/.classpath?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/expected/.classpath Tue Sep 2 16:17:03 2008
@@ -3,7 +3,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5-sources.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="true"/>
@@ -11,4 +11,4 @@
</classpathentry>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/pom.xml?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/pom.xml Tue Sep 2 16:17:03 2008
@@ -9,7 +9,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>2.0</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/expected/.classpath?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/expected/.classpath Tue Sep 2 16:17:03 2008
@@ -3,7 +3,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5-sources.jar">
<attributes>
<attribute name="org.eclipse.ajdt.inpath" value="true"/>
@@ -11,4 +11,4 @@
</classpathentry>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/pom.xml?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/pom.xml Tue Sep 2 16:17:03 2008
@@ -9,7 +9,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>2.0</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/expected/.classpath?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/expected/.classpath Tue Sep 2 16:17:03 2008
@@ -3,7 +3,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5-sources.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="true"/>
@@ -12,4 +12,4 @@
</classpathentry>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/pom.xml?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/pom.xml Tue Sep 2 16:17:03 2008
@@ -9,7 +9,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>2.0</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.classpath?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.classpath Tue Sep 2 16:17:03 2008
@@ -5,10 +5,10 @@
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
<classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.settings/org.eclipse.ajdt.ui.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.settings/org.eclipse.ajdt.ui.prefs?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.settings/org.eclipse.ajdt.ui.prefs (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.settings/org.eclipse.ajdt.ui.prefs Tue Sep 2 16:17:03 2008
@@ -3,6 +3,6 @@
org.eclipse.ajdt.ui.aspectPath.contentKind2=BINARY
org.eclipse.ajdt.ui.aspectPath.entryKind2=LIBRARY
org.eclipse.ajdt.ui.aspectPath.contentKind1=BINARY
-org.eclipse.ajdt.ui.aspectPath2=C\:/Users/eberry0006e/Documents/svn/maven-eclipse-plugin/target/test-classes/m2repo/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar
+org.eclipse.ajdt.ui.aspectPath2=M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar
org.eclipse.ajdt.ui.aspectPath.entryKind1=LIBRARY
-org.eclipse.ajdt.ui.aspectPath1=C\:/Users/eberry0006e/Documents/svn/maven-eclipse-plugin/target/test-classes/m2repo/commons-logging/commons-logging/1.1/commons-logging-1.1.jar
+org.eclipse.ajdt.ui.aspectPath1=M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/pom.xml?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/pom.xml Tue Sep 2 16:17:03 2008
@@ -9,7 +9,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>2.0</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.classpath?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.classpath Tue Sep 2 16:17:03 2008
@@ -5,10 +5,10 @@
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
<classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.settings/org.eclipse.ajdt.ui.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.settings/org.eclipse.ajdt.ui.prefs?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.settings/org.eclipse.ajdt.ui.prefs (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.settings/org.eclipse.ajdt.ui.prefs Tue Sep 2 16:17:03 2008
@@ -1,8 +1,8 @@
#Wed May 28 08:51:08 PDT 2008
-org.eclipse.ajdt.ui.inPath2=C\:/Users/eberry0006e/Documents/svn/maven-eclipse-plugin/target/test-classes/m2repo/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar
+org.eclipse.ajdt.ui.inPath2=M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar
org.eclipse.ajdt.ui.inPath.contentKind2=BINARY
org.eclipse.ajdt.ui.inPath.entryKind2=LIBRARY
-org.eclipse.ajdt.ui.inPath1=C\:/Users/eberry0006e/Documents/svn/maven-eclipse-plugin/target/test-classes/m2repo/commons-logging/commons-logging/1.1/commons-logging-1.1.jar
+org.eclipse.ajdt.ui.inPath1=M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar
org.eclipse.ajdt.ui.inPath.contentKind1=BINARY
eclipse.preferences.version=1
org.eclipse.ajdt.ui.inPath.entryKind1=LIBRARY
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/pom.xml?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/pom.xml Tue Sep 2 16:17:03 2008
@@ -9,7 +9,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>2.0</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.classpath?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.classpath Tue Sep 2 16:17:03 2008
@@ -3,8 +3,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.settings/org.eclipse.ajdt.ui.prefs
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.settings/org.eclipse.ajdt.ui.prefs?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.settings/org.eclipse.ajdt.ui.prefs (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.settings/org.eclipse.ajdt.ui.prefs Tue Sep 2 16:17:03 2008
@@ -1,8 +1,8 @@
#Wed May 28 08:51:11 PDT 2008
-org.eclipse.ajdt.ui.inPath1=C\:/Users/eberry0006e/Documents/svn/maven-eclipse-plugin/target/test-classes/m2repo/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar
+org.eclipse.ajdt.ui.inPath1=M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar
org.eclipse.ajdt.ui.inPath.contentKind1=BINARY
eclipse.preferences.version=1
org.eclipse.ajdt.ui.inPath.entryKind1=LIBRARY
org.eclipse.ajdt.ui.aspectPath.contentKind1=BINARY
org.eclipse.ajdt.ui.aspectPath.entryKind1=LIBRARY
-org.eclipse.ajdt.ui.aspectPath1=C\:/Users/eberry0006e/Documents/svn/maven-eclipse-plugin/target/test-classes/m2repo/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar
+org.eclipse.ajdt.ui.aspectPath1=M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/pom.xml?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/pom.xml Tue Sep 2 16:17:03 2008
@@ -9,7 +9,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>2.0</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath Tue Sep 2 16:17:03 2008
@@ -4,8 +4,8 @@
<classpathentry kind="var" path="M2_REPO/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
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=691425&r1=691424&r2=691425&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 Tue Sep 2 16:17:03 2008
@@ -9,7 +9,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>2.0</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/expected/.classpath?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/expected/.classpath Tue Sep 2 16:17:03 2008
@@ -4,8 +4,8 @@
<classpathentry kind="var" path="M2_REPO/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
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=691425&r1=691424&r2=691425&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 Tue Sep 2 16:17:03 2008
@@ -9,7 +9,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>2.0</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/expected/.classpath
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/expected/.classpath?rev=691425&r1=691424&r2=691425&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/expected/.classpath (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/expected/.classpath Tue Sep 2 16:17:03 2008
@@ -4,8 +4,8 @@
<classpathentry kind="var" path="M2_REPO/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/2.0/junit-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-aspects/2.5/spring-aspects-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-</classpath>
\ No newline at end of file
+</classpath>
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=691425&r1=691424&r2=691425&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 Tue Sep 2 16:17:03 2008
@@ -9,7 +9,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>2.0</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>