svn commit: r1023058 - in /mahout/trunk/core: pom.xml src/main/assembly/job.xml src/main/java/org/apache/mahout/driver/MahoutDriver.java

[gs...@apache.org]

Author: gsingers
Date: Fri Oct 15 18:23:57 2010
New Revision: 1023058

URL: http://svn.apache.org/viewvc?rev=1023058&view=rev
Log:
MAHOUT-500: provide a default driver classes file inside the JOB jar

Modified:
    mahout/trunk/core/pom.xml
    mahout/trunk/core/src/main/assembly/job.xml
    mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java

Modified: mahout/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1023058&r1=1023057&r2=1023058&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Fri Oct 15 18:23:57 2010
@@ -51,6 +51,24 @@
           <optimize>true</optimize>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <configuration>
+              <tasks>
+                <copy file="../conf/driver.classes.props" tofile="${project.build.directory}/classes/driver.classes.default.props"/>
+              </tasks>
+
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
       <!-- create test jar so other modules can reuse the core test utility classes. -->
       <plugin>

Modified: mahout/trunk/core/src/main/assembly/job.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/assembly/job.xml?rev=1023058&r1=1023057&r2=1023058&view=diff
==============================================================================
--- mahout/trunk/core/src/main/assembly/job.xml (original)
+++ mahout/trunk/core/src/main/assembly/job.xml Fri Oct 15 18:23:57 2010
@@ -27,5 +27,12 @@
         <exclude>*.jar</exclude>
       </excludes>
     </fileSet>
+    <fileSet>
+      <directory>${basedir}/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>driver.classes.default.props</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </assembly>

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java?rev=1023058&r1=1023057&r2=1023058&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/driver/MahoutDriver.java Fri Oct 15 18:23:57 2010
@@ -17,6 +17,7 @@
 
 package org.apache.mahout.driver;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -97,7 +98,15 @@ public final class MahoutDriver {
                                     .getContextClassLoader()
                                     .getResourceAsStream("driver.classes.props");
 
-    mainClasses.load(propsStream);
+    try {
+      mainClasses.load(propsStream);
+    } catch (Throwable e) {
+      //try getting the default one
+      propsStream = Thread.currentThread()
+                                    .getContextClassLoader()
+                                    .getResourceAsStream("driver.classes.default.props");
+      mainClasses.load(propsStream);
+    }
 
     boolean foundShortName = false;
     for (Object key :  mainClasses.keySet()) {