[MNG-3969] debugging bootstrap

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746035 13f79535-47bb-0310-9956-ffa450edef68

bs

@@ -5,6 +5,9 @@
 #       and maven-3 requires a specific default implementation
 #
 export CLASSPATH=./mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
-export ANT_OPTS='-Dmercury.log.threshold=warn -Djavax.xml.stream.XMLInputFactory=com.ctc.wstx.stax.WstxInputFactory -Dmaven.repo.central=http://repository.sonatype.org/content/groups/public '
+export ANT_OPTS='-Dmercury.log.threshold=debug -Djavax.xml.stream.XMLInputFactory=com.ctc.wstx.stax.WstxInputFactory -Dmercury.repo.central=http://repository.sonatype.org/content/groups/public '
 #export ANT_OPTS=$ANT_OPTS' -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000'
-ant -f build-mercury.xml
+
+echo ANT_OPTS=$ANT_OPTS
+
+ant -f build-mercury.xml $*

build-mercury.xml

@@ -85,41 +85,38 @@ END SNIPPET: ant-bootstrap -->
     <replace file="${basedir}/dependencies.xml" token="&lt;!--start--&gt;" value="&lt;!--"/>
     <replace file="${basedir}/dependencies.xml" token="&lt;!--end--&gt;" value="--&gt;"/>
 
-  	<delete file="${basedir}/dependencies.xml"/>
-
-
     <mercury:local-repository location="${maven.repo.local}"/>
+
+  	<!-- classpaths with default names: mercury.classpath, mercury.classpath.test, mercury.classpath.runtime -->
     <mercury:resolve-dependencies>
+      <mercury:dependency source="maven:${basedir}/dependencies.xml"/>
       <mercury:dependency id="org.codehaus.plexus:plexus-component-metadata:${pom.properties.plexusVersion}"/>
-      <mercury:dependency id="org.apache.maven:maven:3.0-SNAPSHOT::pom" source="maven:pom.xml"/>
-      <mercury:dependency id="org.codehaus.modello:modello-maven-plugin:${pom.properties.modelloVersion}"/>
     </mercury:resolve-dependencies>
-
-<!-- those are for debugging and example (named paths) only. Remove as needed -->
 <!--
-    <mercury:resolve-dependencies pathid="plexus.classpath">
-      <mercury:dependency id="org.codehaus.plexus:plexus-component-metadata:${pom.properties.plexusVersion}"/>
-    </mercury:resolve-dependencies>
-
-    <mercury:resolve-dependencies pathid="modello.classpath">
+  	<delete file="${basedir}/dependencies.xml"/>
+-->    
+    <!-- only one named classpath: modello.classpath -->
+    <mercury:resolve-dependencies pathid="modello.classpath" scope="runtime">
       <mercury:dependency id="org.codehaus.modello:modello-maven-plugin:${pom.properties.modelloVersion}"/>
     </mercury:resolve-dependencies>
--->
+<!--
     <echo>========================================================================</echo>
     <property name="mcc" refid="mercury.classpath.compile"/>
     <echo>mercury.classpath.compile=${mcc}</echo>
     <echo>========================================================================</echo>
-    <property name="mct" refid="mercury.classpath.test"/>
-    <echo>mercury.classpath.test=${mct}</echo>
+    <property name="mcr" refid="mercury.classpath.runtime"/>
+    <echo>mercury.classpath.runtime=${mcr}</echo>
     <echo>========================================================================</echo>
-<!--
+
     <property name="cp.plexus" refid="plexus.classpath"/>
     <echo>cp.plexus=${cp.plexus}</echo>
     <echo>========================================================================</echo>
+    
     <property name="cp.modello" refid="modello.classpath"/>
     <echo>cp.modello=${cp.modello}</echo>
     <echo>========================================================================</echo>
 -->
+
     <!-- Pull the dependencies for Modello 
       <mercury:dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="${pom.properties.modelloVersion}"/>
     </mercury:resolve-dependencies>
@@ -139,7 +136,7 @@ END SNIPPET: ant-bootstrap -->
     <path id="maven.classpath">
       <pathelement location="bootstrap/target/classes"/>
       <path refid="sources"/>     
-      <path refid="mercury.classpath"/>
+      <path refid="mercury.classpath.runtime"/>     
     </path>
 
     <echo>Using plexus version ${pom.properties.plexusVersion}</echo> 
@@ -169,7 +166,7 @@ END SNIPPET: ant-bootstrap -->
       <attribute name="mode"/>
       <attribute name="version"/>
       <sequential>
-        <java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true" classpathref="mercury.classpath">
+        <java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true" classpathref="modello.classpath">
           <arg file="@{file}"/> <!-- model file -->
           <arg value="@{mode}"/> <!-- output type -->
           <arg file="bootstrap/target/generated-sources"/> <!-- output directory -->
@@ -202,6 +199,7 @@ END SNIPPET: ant-bootstrap -->
   </target>
 
   <target name="compile-boot" depends="generate-sources" description="compiles the bootstrap sources">
+  	
     <path id="sources">
       <dirset dir=".">
         <include name="bootstrap/target/generated-sources"/>
@@ -209,10 +207,15 @@ END SNIPPET: ant-bootstrap -->
       </dirset>
     </path>
 
+
+    <echo>========================================================================</echo>
+    <property name="mc" refid="mercury.classpath"/>
+    <echo>mercury.classpath=${mc}</echo>
+    <echo>========================================================================</echo>
     <mkdir dir="bootstrap/target/classes"/>
     <javac destdir="bootstrap/target/classes" encoding="UTF-8" source="1.5" target="1.5" debug="true">
       <src refid="sources"/>
-      <classpath refid="pom.pathid"/>
+      <classpath refid="mercury.classpath"/>
     </javac>
 
     <path id="maven.classpath">