svn commit: r721950 - in /maven/components/trunk: build.xml maven-compat/pom.xml

[jv...@apache.org]

Author: jvanzyl
Date: Sun Nov 30 18:49:21 2008
New Revision: 721950

URL: http://svn.apache.org/viewvc?rev=721950&view=rev
Log:
o generating annotations from the javadoc in maven-compat, no point in converting to annotations, we'll take what's
  there and leave it at that.

Modified:
    maven/components/trunk/build.xml
    maven/components/trunk/maven-compat/pom.xml

Modified: maven/components/trunk/build.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.xml?rev=721950&r1=721949&r2=721950&view=diff
==============================================================================
--- maven/components/trunk/build.xml (original)
+++ maven/components/trunk/build.xml Sun Nov 30 18:49:21 2008
@@ -106,10 +106,16 @@
   	
     <java fork="fork" classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" failonerror="true">
       <classpath refid="maven.classpath"/>
+      <!-- We need to generate component descriptors from the maven-artifact sources which use javadoc annotations. -->
       <arg value="--source"/>
-      <arg value="${basedir}/bootstrap/target/generate-sources"/>
+      <arg value="${basedir}/maven-compat/src/main/java"/>
+      <!-- We have separated the artifact handlers and lifecycle mappings into a separate file. -->
+      <arg value="--descriptors"/>
+      <arg value="${basedir}/maven-core/src/main/resources/META-INF/plexus"/>
+      <!-- Search the classes for annotations that we've compiled. -->
       <arg value="--classes"/>
       <arg value="${basedir}/bootstrap/target/classes"/>
+      <!-- We'll make one big fat components descriptor. -->
       <arg value="--output"/>
       <arg value="${basedir}/bootstrap/target/classes/META-INF/plexus/components.xml"/>
     </java>
@@ -171,6 +177,7 @@
 
     <path id="maven.classpath">
       <pathelement location="bootstrap/target/classes"/>
+      <pathelement location="maven-compat/src/main/resources"/>
       <path refid="sources"/>
       <path refid="pom.pathid"/>
     </path>

Modified: maven/components/trunk/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/pom.xml?rev=721950&r1=721949&r2=721950&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/pom.xml (original)
+++ maven/components/trunk/maven-compat/pom.xml Sun Nov 30 18:49:21 2008
@@ -45,18 +45,22 @@
       <artifactId>easymock</artifactId>
       <version>1.2_Java1.3</version>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+      </plugin>
+      <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
           <version>1.0.0</version>
           <model>src/main/mdo/metadata.mdo</model>
         </configuration>
-      </plugin>    
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -65,10 +69,6 @@
           <target>1.5</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file