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-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=759020&r1=759019&r2=759020&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 27 04:46:39 2009
@@ -143,6 +143,10 @@
// warning, order is important for binary search
public static final String[] WTP_SUPPORTED_VERSIONS = new String[] {
"1.0", "1.5", "2.0", "R7", "none" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+ private static final String ASPECTJ_FILE_PATTERN = "**/*.aj";
+
+ private static final String JAVA_FILE_PATTERN = "**/*.java";
/**
* Constant for 'artifactId' element in POM.xml.
@@ -1001,6 +1005,7 @@
if ( wtpmanifest && isJavaProject() )
{
+ // NOTE: This could change the config!
EclipseManifestWriter.addManifestResource( getLog(), config );
}
// NOTE: This could change the config!
@@ -1480,6 +1485,18 @@
String output )
throws MojoExecutionException
{
+ List includes = new ArrayList();
+ // automatically include java files only: eclipse doesn't have the
concept of a source only directory so it
+ // will try to include non-java files found in maven source dirs
+ includes.add( JAVA_FILE_PATTERN );
+ if ( ajdt ) {
+ includes.add( ASPECTJ_FILE_PATTERN );
+ }
+ String includePattern = StringUtils.join( includes.iterator(), "|" );
+
+ List excludes = new ArrayList();
+ String excludePattern = StringUtils.join( excludes.iterator(), "|" );
+
for ( Iterator it = sourceRoots.iterator(); it.hasNext(); )
{
@@ -1491,7 +1508,7 @@
IdeUtils.toRelativeAndFixSeparator( projectBaseDir,
sourceRootFile,
!projectBaseDir.equals( basedir ) );
- directories.add( new EclipseSourceDir( sourceRoot, output,
false, test, null, null, false ) );
+ directories.add( new EclipseSourceDir( sourceRoot, output,
false, test, includePattern, excludePattern, false ) );
}
}
}
@@ -1506,18 +1523,13 @@
getLog().debug( "Processing resource dir: " +
resource.getDirectory() );
- String includePattern = null;
- String excludePattern = null;
-
- if ( resource.getIncludes().size() != 0 )
- {
- includePattern = StringUtils.join(
resource.getIncludes().iterator(), "|" );
- }
-
- if ( resource.getExcludes().size() != 0 )
- {
- excludePattern = StringUtils.join(
resource.getExcludes().iterator(), "|" );
- }
+ String includePattern = StringUtils.join(
resource.getIncludes().iterator(), "|" );
+
+ List excludes = new ArrayList( resource.getExcludes() );
+ // automatically exclude java files: eclipse doesn't have the
concept of resource directory so it will
+ // try to compile any java file found in maven resource dirs
+ excludes.add( JAVA_FILE_PATTERN );
+ String excludePattern = StringUtils.join( excludes.iterator(), "|"
);
// TODO: figure out how to merge if the same dir is specified twice
// with different in/exclude patterns.
@@ -1574,6 +1586,11 @@
Xpp3Dom configuration = getAspectjConfiguration( project );
if ( configuration != null )
{
+ List includes = new ArrayList();
+ includes.add( JAVA_FILE_PATTERN );
+ includes.add( ASPECTJ_FILE_PATTERN) ;
+ String includePattern = StringUtils.join( includes.iterator(), "|"
);
+
String aspectDirectory = DEFAULT_ASPECT_DIRECTORY;
Xpp3Dom aspectDirectoryElement = configuration.getChild(
ASPECT_DIRECTORY );
if ( aspectDirectoryElement != null )
@@ -1588,7 +1605,7 @@
IdeUtils.toRelativeAndFixSeparator( projectBaseDir,
aspectDirectoryFile,
!projectBaseDir.equals( basedir ) );
- directories.add( new EclipseSourceDir( sourceRoot, null,
false, false, null, null, false ) );
+ directories.add( new EclipseSourceDir( sourceRoot, null,
false, false, includePattern, null, false ) );
}
String testAspectDirectory = DEFAULT_TEST_ASPECT_DIRECTORY;
@@ -1605,7 +1622,7 @@
IdeUtils.toRelativeAndFixSeparator( projectBaseDir,
testAspectDirectoryFile,
!projectBaseDir.equals( basedir ) );
- directories.add( new EclipseSourceDir( sourceRoot, testOutput,
false, true, null, null, false ) );
+ directories.add( new EclipseSourceDir( sourceRoot, testOutput,
false, true, includePattern, null, false ) );
}
}
}
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=759020&r1=759019&r2=759020&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 Mar 27 04:46:39 2009
@@ -199,4 +199,21 @@
{
return this.path.compareTo( ( (EclipseSourceDir) obj ).path );
}
+
+ /**
+ * {...@inheritdoc}
+ */
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append( ( isResource ? "re" : "" ) + "source " );
+ 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( "test=" ).append( test ).append( ", " );
+ buffer.append( "filtering=" ).append( filtering );
+ return buffer.toString();
+ }
}
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=759020&r1=759019&r2=759020&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
Fri Mar 27 04:46:39 2009
@@ -206,8 +206,7 @@
{
EclipseSourceDir dir = config.getSourceDirs()[j];
- log.debug( "Processing " + ( dir.isResource() ? "re" : "" ) +
"source " + dir.getPath() + ": output="
- + dir.getOutput() + "; default output=" + defaultOutput );
+ log.debug( "Processing classpath for: " + dir.toString() + ";
default output=" + defaultOutput );
boolean isSpecial = false;
@@ -246,28 +245,12 @@
}
String includes = dir.getInclude();
-
- if ( !dir.isResource() )
- {
- // automatically include java files only: eclipse doesn't have
the concept of a source only directory so it
- // will try to include non-java files found in maven source
dirs
- includes = StringUtils.isEmpty( includes ) ? "**/*.java" :
includes + "|**/*.java";
- }
-
if ( StringUtils.isNotEmpty( includes ) )
{
writer.addAttribute( ATTR_INCLUDING, includes );
}
String excludes = dir.getExclude();
-
- if ( dir.isResource() )
- {
- // automatically exclude java files: eclipse doesn't have the
concept of resource directory so it will
- // try to compile any java file found in maven resource dirs
- excludes = StringUtils.isEmpty( excludes ) ? "**/*.java" :
excludes + "|**/*.java";
- }
-
if ( StringUtils.isNotEmpty( excludes ) )
{
writer.addAttribute( ATTR_EXCLUDING, excludes );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseAjdtPluginIT.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseAjdtPluginIT.java?rev=759020&r1=759019&r2=759020&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseAjdtPluginIT.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseAjdtPluginIT.java
Fri Mar 27 04:46:39 2009
@@ -86,4 +86,11 @@
{
testProject( "project-ajdt9" );
}
+
+ public void testProjectAjdt10()
+ throws Exception
+ {
+ testProject( "project-ajdt10-MECLIPSE-538" );
+ }
+
}
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=759020&r1=759019&r2=759020&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
Fri Mar 27 04:46:39 2009
@@ -1,6 +1,6 @@
<classpath>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="target/generated-resources/eclipse"
excluding="**/*.java"/>
+ <classpathentry kind="src" path="target/generated-resources/eclipse"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath?rev=759020&r1=759019&r2=759020&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-4/expected/.classpath
Fri Mar 27 04:46:39 2009
@@ -1,6 +1,6 @@
<classpath>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="target/generated-resources/eclipse"
excluding="**/*.java"/>
+ <classpathentry kind="src" path="target/generated-resources/eclipse"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.classpath?rev=759020&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.classpath
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.classpath
Fri Mar 27 04:46:39 2009
@@ -0,0 +1,11 @@
+<classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"
including="**/*.java|**/*.aj"/>
+ <classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java"
including="**/*.java|**/*.aj"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/aspect"
including="**/*.java|**/*.aj"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
+</classpath>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.classpath
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.project?rev=759020&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.project
Fri Mar 27 04:46:39 2009
@@ -0,0 +1,14 @@
+<projectDescription>
+ <name>maven-eclipse-plugin-test-project-ajdt10</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.ajdt.core.ajbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.ajdt.ui.ajnature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/expected/.project
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/pom.xml?rev=759020&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/pom.xml
Fri Mar 27 04:46:39 2009
@@ -0,0 +1,75 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>eclipse</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-ajdt10</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+ <name>ajdt10</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjtools</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+
<workspace>${basedir}/../../eclipse/workspaceDoesNotExist</workspace>
+ <ajdtVersion>1.5</ajdtVersion>
+ <projectnatures>
+ <projectnature>org.eclipse.ajdt.ui.ajnature</projectnature>
+ <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+ </projectnatures>
+ <buildcommands>
+ <buildCommand>
+ <name>org.eclipse.ajdt.core.ajbuilder</name>
+ </buildCommand>
+ </buildcommands>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>aspectj-maven-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <complianceLevel>1.6</complianceLevel>
+ <source>1.6</source>
+ <target>1.6</target>
+ <verbose>false</verbose>
+ <showWeaveInfo>true</showWeaveInfo>
+ <encoding>UTF-8</encoding>
+ <deprecation>true</deprecation>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+
<artifactId>aspectjrt</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+
<artifactId>aspectjtools</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/org/test/Profiling2.aj
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/org/test/Profiling2.aj?rev=759020&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/org/test/Profiling2.aj
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/org/test/Profiling2.aj
Fri Mar 27 04:46:39 2009
@@ -0,0 +1,22 @@
+/*
+ * Crée le 5 janv. 2009 par JB Defard
+ *
+ */
+package org.test;
+
+public aspect Profiling2
+{
+ pointcut publicOperations()
+ : execution(public * *.*(..));
+
+ Object around() : publicOperations()
+ {
+ long start = System.nanoTime();
+ Object ret = proceed();
+ long end = System.nanoTime();
+ System.out.println(thisJoinPointStaticPart.getSignature()
+ + " took " + (end-start) + " nanoseconds");
+ return ret;
+ }
+}
+
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/org/test/Profiling2.aj
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/aspect/org/test/Profiling2.aj
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/App.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/App.java?rev=759020&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/App.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/App.java
Fri Mar 27 04:46:39 2009
@@ -0,0 +1,20 @@
+package org.test;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+
+ public void hello()
+ {
+ System.out.println( "Hello World!" );
+ }
+
+ public static void main( String[] args )
+ {
+ new App().hello();
+ }
+
+}
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/App.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/Profiling.aj
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/Profiling.aj?rev=759020&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/Profiling.aj
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/Profiling.aj
Fri Mar 27 04:46:39 2009
@@ -0,0 +1,22 @@
+/*
+ * Crée le 5 janv. 2009 par JB Defard
+ *
+ */
+package org.test;
+
+public aspect Profiling
+{
+ pointcut publicOperations()
+ : execution(public * *.*(..));
+
+ Object around() : publicOperations()
+ {
+ long start = System.nanoTime();
+ Object ret = proceed();
+ long end = System.nanoTime();
+ System.out.println(thisJoinPointStaticPart.getSignature()
+ + " took " + (end-start) + " nanoseconds");
+ return ret;
+ }
+}
+
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/Profiling.aj
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/java/org/test/Profiling.aj
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/resources/dummy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/main/resources/dummy?rev=759020&view=auto
==============================================================================
(empty)
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/org/test/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/org/test/AppTest.java?rev=759020&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/org/test/AppTest.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/org/test/AppTest.java
Fri Mar 27 04:46:39 2009
@@ -0,0 +1,38 @@
+package org.test;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/org/test/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/java/org/test/AppTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/resources/dummy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt10-MECLIPSE-538/src/test/resources/dummy?rev=759020&view=auto
==============================================================================
(empty)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath?rev=759020&r1=759019&r2=759020&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath
Fri Mar 27 04:46:39 2009
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="target/generated-resources/eclipse"
excluding="**/*.java"/>
+ <classpathentry kind="src" path="target/generated-resources/eclipse"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath?rev=759020&r1=759019&r2=759020&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath
Fri Mar 27 04:46:39 2009
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src/test/resources"
output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="target/generated-resources/eclipse"
excluding="**/*.java"/>
+ <classpathentry kind="src" path="target/generated-resources/eclipse"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
</classpath>
\ No newline at end of file
