o some changes to make things work on windows, shouldn't have bothered

with files at all.


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

maven-mboot2/build

@@ -8,6 +8,4 @@ mkdir ${buildDir}
 
 javac -d ${buildDir} @sources.txt
 
-cp src/main/resources/mboot.deps ${buildDir}/mboot.deps
-
 ( cd ${buildDir} ; jar -cf ../mboot.jar -m ../manifest.txt * )

maven-mboot2/src/main/java/MBoot.java

@@ -12,7 +12,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.io.StringWriter;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,6 +37,37 @@ public class MBoot
     // maven-plugin
     // maven-plugins
 
+    // ----------------------------------------------------------------------
+    // 
+    // ----------------------------------------------------------------------
+    
+    String[] deps = new String[]
+    {
+        "junit/jars/junit-3.8.1.jar",
+        "surefire/jars/surefire-booter-1.1.jar",
+        "surefire/jars/surefire-1.1.jar",
+        "modello/jars/modello-1.0-SNAPSHOT.jar",
+        "xpp3/jars/xpp3-1.1.3.3.jar",
+        "xstream/jars/xstream-1.0-SNAPSHOT.jar",
+        "qdox/jars/qdox-1.2.jar",
+        "maven/jars/maven-plugin-2.0-SNAPSHOT.jar"
+    };
+
+    String[] builds = new String[]
+    {
+        "maven-model",
+        "maven-plugin",
+        "maven-core",
+        "maven-plugins/maven-clean-plugin",
+        "maven-plugins/maven-compiler-plugin",
+        "maven-plugins/maven-install-plugin",
+        "maven-plugins/maven-jar-plugin",
+        "maven-plugins/maven-plugin-plugin",
+        "maven-plugins/maven-pom-plugin",
+        "maven-plugins/maven-resources-plugin",
+        "maven-plugins/maven-surefire-plugin"
+    };
+    
     // ----------------------------------------------------------------------
     // Standard locations for resources in Maven projects.
     // ----------------------------------------------------------------------
@@ -101,21 +131,9 @@ public class MBoot
 
         checkMBootDeps();
 
-        File instructions = new File( basedir, "mboot.txt" );
+        for ( int i = 0; i < builds.length; i++ )
-
-        if ( instructions.exists() )
         {
-            FileInputStream is = new FileInputStream( instructions );
+            String directory = new File( basedir, builds[i] ).getAbsolutePath();
-
-            StringWriter w = new StringWriter();
-
-            IOUtil.copy( is, w );
-
-            String[] deps = StringUtils.split( w.toString(), "\n" );
-
-            for ( int i = 0; i < deps.length; i++ )
-            {
-                String directory = new File( basedir, deps[i] ).getAbsolutePath();
 
             System.out.println( "Building project in " + directory + " ..." );
 
@@ -246,11 +264,6 @@ public class MBoot
             FileUtils.copyFileToDirectory( f.getAbsolutePath(), plugins );
         }
     }
-        else
-        {
-            buildProject( basedir );
-        }
-    }
 
     public void buildProject( String basedir )
         throws Exception
@@ -442,14 +455,6 @@ public class MBoot
     {
         System.out.println( "Checking for MBoot's dependencies ..." );
 
-        InputStream is = MBoot.class.getClassLoader().getResourceAsStream( "mboot.deps" );
-
-        StringWriter w = new StringWriter();
-
-        IOUtil.copy( is, w );
-
-        String[] deps = StringUtils.split( w.toString(), "\n" );
-
         mbootDependencies = Arrays.asList( deps );
 
         downloader.downloadDependencies( mbootDependencies );

maven-mboot2/src/main/resources/mboot.deps

@@ -1,8 +0,0 @@
-junit/jars/junit-3.8.1.jar
-surefire/jars/surefire-booter-1.1.jar
-surefire/jars/surefire-1.1.jar
-modello/jars/modello-1.0-SNAPSHOT.jar
-xpp3/jars/xpp3-1.1.3.3.jar
-xstream/jars/xstream-1.0-SNAPSHOT.jar
-qdox/jars/qdox-1.2.jar
-maven/jars/maven-plugin-2.0-SNAPSHOT.jar