Index: src/plugin-resources/templates/classpath.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/eclipse/src/plugin-resources/templates/classpath.jelly,v
retrieving revision 1.31
diff -u -r1.31 classpath.jelly
--- src/plugin-resources/templates/classpath.jelly	26 Oct 2004 07:57:06 -0000	1.31
+++ src/plugin-resources/templates/classpath.jelly	24 Feb 2005 18:13:04 -0000
@@ -80,6 +80,15 @@
     </j:if>
   </j:if>
 
+  <!-- add aspectj jar and source path if defined -->
+  <j:if test="${pom.build.aspectSourceDirectory!=''}">
+  		<!-- path to the aspectj lib as provided by the ajdt plugin -->
+      	<classpathentry kind="var" path="ASPECTJRT_LIB"/>
+      	<!-- aspectj source dir -->
+      	<maven:makeRelativePath var="aspectjSrcDir" basedir="${basedir}" path="${pom.build.aspectSourceDirectory}" separator="/"/>
+      	<classpathentry kind="src" path="${aspectjSrcDir}"/>
+  </j:if>
+  
   <!-- Add the list of additional directories for the classpath from ${maven.eclipse.classpath.include}-->
   <u:tokenize var="maven.eclipse.classpath.include.split" delim=",">${maven.eclipse.classpath.include}</u:tokenize>
 
Index: src/plugin-resources/templates/project.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/eclipse/src/plugin-resources/templates/project.jelly,v
retrieving revision 1.6
diff -u -r1.6 project.jelly
--- src/plugin-resources/templates/project.jelly	16 Nov 2004 10:48:16 -0000	1.6
+++ src/plugin-resources/templates/project.jelly	24 Feb 2005 18:13:04 -0000
@@ -39,7 +39,10 @@
   <j:if test="${sourcesPresent}">
   <buildSpec>
     <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
+	    <j:choose>
+	    	<j:when test="${pom.build.aspectSourceDirectory!=''}"><name>org.eclipse.ajdt.ui.ajbuilder</name></j:when>
+	    	<j:otherwise><name>org.eclipse.jdt.core.javabuilder</name></j:otherwise>
+	    </j:choose>
       <arguments>
       </arguments>
     </buildCommand>
@@ -52,6 +55,10 @@
     </j:forEach>
   </buildSpec>
   <natures>
+    <!-- aspectj nature if required -->
+    <j:if test="${pom.build.aspectSourceDirectory!=''}">
+      <nature>org.eclipse.ajdt.ui.ajnature</nature>
+    </j:if>
     <nature>org.eclipse.jdt.core.javanature</nature>
     <util:tokenize var="natures" delim=",">${maven.eclipse.projectnatures}</util:tokenize>
     <j:forEach var="nature" items="${natures}" trim="true">