Author: jvanzyl
Date: Sat Nov 25 16:59:04 2006
New Revision: 479247

URL: http://svn.apache.org/viewvc?view=rev&rev=479247
Log:
o added a modello assembly to help us debug, the ant script is a pita

Added:
    maven/components/branches/maven.new/modello.jar   (with props)
Modified:
    maven/components/branches/maven.new/build.xml

Modified: maven/components/branches/maven.new/build.xml
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven.new/build.xml?view=diff&rev=479247&r1=479246&r2=479247
==============================================================================
--- maven/components/branches/maven.new/build.xml (original)
+++ maven/components/branches/maven.new/build.xml Sat Nov 25 16:59:04 2006
@@ -138,10 +138,13 @@
     <!-- DGF Need to keep these modello classes out of the system classpath at 
runtime, because different parts of the build
          need different versions of modello.  -->
     <path id="modello.classpath">
+      <!--
       <path refid="pre.classpath"/>
       <pathelement 
location="${maven.repo.local}/org/codehaus/modello/modello-core/1.0-alpha-12-SNAPSHOT/modello-core-1.0-alpha-12-SNAPSHOT.jar"/>
       <pathelement 
location="${maven.repo.local}/org/codehaus/modello/modello-plugin-xml/1.0-alpha-12-SNAPSHOT/modello-plugin-xml-1.0-alpha-12-SNAPSHOT.jar"/>
       <pathelement 
location="${maven.repo.local}/org/codehaus/modello/modello-plugin-xpp3/1.0-alpha-12-SNAPSHOT/modello-plugin-xpp3-1.0-alpha-12-SNAPSHOT.jar"/>
+      -->
+      <pathelement location="modello.jar"/>
     </path>
     <!-- DGF pathconvert immediately so we can validate the classpath -->
     <pathconvert property="pre.classpath.str" refid="pre.classpath" 
pathsep="&#xa;"/>
@@ -159,7 +162,7 @@
       <attribute name="mode"/>
       <attribute name="version"/>
       <sequential>
-        <java fork="false" classname="org.codehaus.modello.ModelloCli" 
failonerror="true">
+        <java fork="fork" classname="org.codehaus.modello.ModelloCli" 
failonerror="true">
           <classpath refid="modello.classpath"/>
           <arg file="@{file}"/>
           <arg value="@{mode}"/>

Added: maven/components/branches/maven.new/modello.jar
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven.new/modello.jar?view=auto&rev=479247
==============================================================================
Binary file - no diff available.

Propchange: maven/components/branches/maven.new/modello.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream


Reply via email to