ÿþcvs server: Diffing .

Index: plugin.jelly

===================================================================

RCS file: /home/cvspublic/maven-plugins/aspectj/plugin.jelly,v

retrieving revision 1.11

diff -u -r1.11 plugin.jelly

--- plugin.jelly	10 May 2004 18:23:05 -0000	1.11

+++ plugin.jelly	16 May 2004 09:36:31 -0000

@@ -97,7 +97,6 @@

 

       <ant:iajc

           fork="${maven.aspectj.fork}"

-          maxmem="${maven.aspectj.maxmem}"

           incremental="${maven.aspectj.incremental}"

           destDir="${maven.build.dest}"

           sourceRootCopyFilter="${maven.aspectj.sourceRootCopyFilter}"

@@ -105,6 +104,12 @@

           emacssym="${maven.aspectj.emacssym}"

           verbose="${maven.aspectj.verbose}">

 

+        <j:if test="${context.getVariable('maven.aspectj.fork') == true}">

+          <j:if test="${context.getVariable('maven.aspectj.maxmem') != null}">

+            <ant:setProperty name="maxmem" value="${maven.aspectj.maxmem}" />

+          </j:if>

+        </j:if>

+        

         <ant:sourceroots>

           <ant:path refid="maven.compile.src.set"/>

           <j:if test="${aspectSourcesPresent == 'true'}">

Index: plugin.properties

===================================================================

RCS file: /home/cvspublic/maven-plugins/aspectj/plugin.properties,v

retrieving revision 1.5

diff -u -r1.5 plugin.properties

--- plugin.properties	10 May 2004 18:23:05 -0000	1.5

+++ plugin.properties	16 May 2004 09:36:31 -0000

@@ -44,4 +44,4 @@

 

 # The maximum memory to use for the new VM when fork is true. Values should 

 # have the same form as accepted by the VM, e.g., "128m". 

-maven.aspectj.maxmem = 128m

+#maven.aspectj.maxmem = 128m

cvs server: Diffing src

cvs server: Diffing src/plugin-test

cvs server: Diffing src/plugin-test/src

cvs server: Diffing src/plugin-test/src/aspect

cvs server: Diffing src/plugin-test/src/aspect/org

cvs server: Diffing src/plugin-test/src/aspect/org/apache

cvs server: Diffing src/plugin-test/src/aspect/org/apache/maven

cvs server: Diffing src/plugin-test/src/aspect/org/apache/maven/aspectj

cvs server: Diffing src/plugin-test/src/main

cvs server: Diffing src/plugin-test/src/main/org

cvs server: Diffing src/plugin-test/src/main/org/apache

cvs server: Diffing src/plugin-test/src/main/org/apache/maven

cvs server: Diffing src/plugin-test/src/main/org/apache/maven/aspectj

cvs server: Diffing src/plugin-test/src/test

cvs server: Diffing src/plugin-test/src/test/org

cvs server: Diffing src/plugin-test/src/test/org/apache

cvs server: Diffing src/plugin-test/src/test/org/apache/maven

cvs server: Diffing src/plugin-test/src/test/org/apache/maven/aspectj

cvs server: Diffing xdocs

Index: xdocs/index.xml

===================================================================

RCS file: /home/cvspublic/maven-plugins/aspectj/xdocs/index.xml,v

retrieving revision 1.4

diff -u -r1.4 index.xml

--- xdocs/index.xml	7 May 2004 19:19:10 -0000	1.4

+++ xdocs/index.xml	16 May 2004 09:36:31 -0000

@@ -45,11 +45,21 @@

         document.

       </p>

     </section>

+

     <section name="Installing">

       <p>

         To install or update the plugin do the following:<br/>

         <code>maven plugin:download -DgroupId=maven -DartifactId=maven-aspectj-plugin -Dversion=&lt;version&gt;</code>

       </p>

+    </section>

+

+    <section name="Compiling aspect sources">

+      <p>You must add the property aspectSourceDirectory in your project.xml</p>

+      <source>

+          <![CDATA[

+          <aspectSourceDirectory>src/aspectj</aspectSourceDirectory>

+          ]]>

+      </source>

     </section>

 

     <section name="Using aspects from other libraries">

Index: xdocs/properties.xml

===================================================================

RCS file: /home/cvspublic/maven-plugins/aspectj/xdocs/properties.xml,v

retrieving revision 1.7

diff -u -r1.7 properties.xml

--- xdocs/properties.xml	10 May 2004 18:23:05 -0000	1.7

+++ xdocs/properties.xml	16 May 2004 09:36:31 -0000

@@ -103,7 +103,7 @@

           <td>

             The maximum memory to use for the new VM when fork is true. Values should have

             the same form as accepted by the VM, e.g., "128m". 

-            Default <code>128m</code>

+            Default none

           </td>

         </tr>