mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject svn commit: r1070408 - in /mahout/trunk: ./ bin/ conf/ core/ distribution/ distribution/src/main/assembly/ etc/ examples/ src/conf/ src/site/ utils/src/main/resources/ utils/src/test/resources/
Date Mon, 14 Feb 2011 08:47:40 GMT
Author: srowen
Date: Mon Feb 14 08:47:39 2011
New Revision: 1070408

URL: http://svn.apache.org/viewvc?rev=1070408&view=rev
Log:
MAHOUT-608 - Collect top-level config files into Maven-standard location like src/. Push some
top-level files down. Remove duplication in NOTICE.txt. Remove some apparently unused files.

Added:
    mahout/trunk/distribution/KEYS   (contents, props changed)
      - copied, changed from r1067703, mahout/trunk/KEYS
    mahout/trunk/examples/build.xml   (contents, props changed)
      - copied, changed from r1067703, mahout/trunk/etc/build.xml
    mahout/trunk/src/conf/
      - copied from r1067703, mahout/trunk/conf/
Removed:
    mahout/trunk/KEYS
    mahout/trunk/conf/
    mahout/trunk/core/build.properties
    mahout/trunk/etc/build.xml
    mahout/trunk/etc/findbugs-exclude.xml
    mahout/trunk/etc/mahout.importorder
    mahout/trunk/examples/build.properties
    mahout/trunk/src/site/
    mahout/trunk/utils/src/main/resources/
    mahout/trunk/utils/src/test/resources/
Modified:
    mahout/trunk/NOTICE.txt
    mahout/trunk/bin/mahout
    mahout/trunk/core/pom.xml
    mahout/trunk/distribution/src/main/assembly/bin.xml
    mahout/trunk/distribution/src/main/assembly/src.xml
    mahout/trunk/examples/pom.xml

Modified: mahout/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/mahout/trunk/NOTICE.txt?rev=1070408&r1=1070407&r2=1070408&view=diff
==============================================================================
--- mahout/trunk/NOTICE.txt (original)
+++ mahout/trunk/NOTICE.txt Mon Feb 14 08:47:39 2011
@@ -1,51 +1 @@
-==============================================================
- Apache Mahout
- Copyright 2009 The Apache Software Foundation
-==============================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Includes software from other Apache Software Foundation projects,
-including, but not limited to:
-  - Apache Lucene Java
-  - Apache Hadoop
-  - Apache Commons
-
-This product includes software developed by the Indiana University
-  Extreme! Lab (http://www.extreme.indiana.edu/).
-  Copyright (c) 2002 Extreme! Lab, Indiana University.
-
-This product includes examples code from the Watchmaker project   
-  https://watchmaker.dev.java.net/
-  Copyright (c) 2006-2009 Daniel W. Dyer.
-
-This product includes libraries developed by the Kosmos project (http://kosmosfs.sourceforge.net/)
- Copyright 2008 Quantcast Corp.
- Copyright 2007 Kosmix Corp.
-
-This product includes software developed by the Jets3T project (https://jets3t.dev.java.net/)

-Copyright (c) 2008 James Murty
-
-This product includes libraries developed by the CGLib project (http://cglib.sourceforge.net/)
-Copyright (c) 2008, cglib
-
-This product includes a JUnit jar: http://junit.sourceforge.net/
-License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
-Copyright (c) 2000-2006, www.hamcrest.org
-
-This product includes code from the XStream project (http://xstream.codehaus.org/)
-Copyright (c) 2003-2006, Joe Walnes
-Copyright (c) 2006-2007, XStream Committers
-
-This product includes tests written with EasyMock 
-Copyright 2001-2007 Tammo Freese (http://www.easymock.org/)
-
-This product uses the Breast Cancer Wisconsin (Diagnostic) Dataset from the
-UCI Machine Learning Repository [http://www.ics.uci.edu/~mlearn/MLRepository.html, http://archive.ics.uci.edu/ml/datasets/Breast+Cancer+Wisconsin+(Diagnostic)].

-
-This product contains parts of the Bayesian Logic (BLOG) Inference Engine.
-Copyright (c) 2005, Regents of the University of California
-
-This product contains code from the Colt Java matrix library (http://acs.lbl.gov/~hoschek/colt/)
-Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+Please see the file src/main/appended-resources/META-INF/NOTICE
\ No newline at end of file

Modified: mahout/trunk/bin/mahout
URL: http://svn.apache.org/viewvc/mahout/trunk/bin/mahout?rev=1070408&r1=1070407&r2=1070408&view=diff
==============================================================================
--- mahout/trunk/bin/mahout (original)
+++ mahout/trunk/bin/mahout Mon Feb 14 08:47:39 2011
@@ -15,7 +15,7 @@
 #
 #   MAHOUT_CONF_DIR    The location of the program short-name to class name
 #                      mappings and the default properties files
-#                      defaults to "$MAHOUT_HOME/conf"
+#                      defaults to "$MAHOUT_HOME/src/conf"
 #
 #   MAHOUT_LOCAL       set to anything other than an empty string to force
 #                      mahout to run locally even if
@@ -105,10 +105,10 @@ if [ "$MAHOUT_HEAPSIZE" != "" ]; then
 fi
 
 if [ "x$MAHOUT_CONF_DIR" = "x" ]; then
-  MAHOUT_CONF_DIR=$MAHOUT_HOME/conf
+  MAHOUT_CONF_DIR=$MAHOUT_HOME/src/conf
 fi
 
-# CLASSPATH initially contains $MAHOUT_CONF_DIR, or defaults to $MAHOUT_HOME/conf
+# CLASSPATH initially contains $MAHOUT_CONF_DIR, or defaults to $MAHOUT_HOME/src/conf
 CLASSPATH=${CLASSPATH}:$MAHOUT_CONF_DIR
 CLASSPATH=${CLASSPATH}:$HADOOP_CONF_DIR
 CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
@@ -202,8 +202,8 @@ if [ "$HADOOP_HOME" = "" ] || [ "$MAHOUT
 else
   echo "Running on hadoop, using HADOOP_HOME=$HADOOP_HOME"
   if [ "$HADOOP_CONF_DIR" = "" ] ; then
-    HADOOP_CONF_DIR=$HADOOP_HOME/conf
-    echo "No HADOOP_CONF_DIR set, using $HADOOP_HOME/conf "
+    HADOOP_CONF_DIR=$HADOOP_HOME/src/conf
+    echo "No HADOOP_CONF_DIR set, using $HADOOP_HOME/src/conf "
   else 
     echo "HADOOP_CONF_DIR=$HADOOP_CONF_DIR"
   fi

Modified: mahout/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1070408&r1=1070407&r2=1070408&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Mon Feb 14 08:47:39 2011
@@ -58,7 +58,7 @@
             <phase>compile</phase>
             <configuration>
               <tasks>
-                <copy file="../conf/driver.classes.props"
+                <copy file="../src/conf/driver.classes.props"
                       tofile="${project.build.directory}/classes/driver.classes.default.props"/>
               </tasks>
 

Copied: mahout/trunk/distribution/KEYS (from r1067703, mahout/trunk/KEYS)
URL: http://svn.apache.org/viewvc/mahout/trunk/distribution/KEYS?p2=mahout/trunk/distribution/KEYS&p1=mahout/trunk/KEYS&r1=1067703&r2=1070408&rev=1070408&view=diff
==============================================================================
    (empty)

Propchange: mahout/trunk/distribution/KEYS
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: mahout/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/distribution/src/main/assembly/bin.xml?rev=1070408&r1=1070407&r2=1070408&view=diff
==============================================================================
--- mahout/trunk/distribution/src/main/assembly/bin.xml (original)
+++ mahout/trunk/distribution/src/main/assembly/bin.xml Mon Feb 14 08:47:39 2011
@@ -112,7 +112,7 @@
         <include>../README*</include>
         <include>../LICENSE*</include>
         <include>../NOTICE*</include>
-        <include>../KEYS</include>
+        <include>KEYS</include>
       </includes>
       <fileMode>0644</fileMode>
     </fileSet>
@@ -133,7 +133,7 @@
       <fileMode>0755</fileMode>
     </fileSet>
     <fileSet>
-      <directory>../conf</directory>
+      <directory>../src/conf</directory>
       <outputDirectory>conf</outputDirectory>
       <fileMode>0644</fileMode>
     </fileSet>

Modified: mahout/trunk/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/distribution/src/main/assembly/src.xml?rev=1070408&r1=1070407&r2=1070408&view=diff
==============================================================================
--- mahout/trunk/distribution/src/main/assembly/src.xml (original)
+++ mahout/trunk/distribution/src/main/assembly/src.xml Mon Feb 14 08:47:39 2011
@@ -19,7 +19,7 @@
         <include>**/NOTICE*</include>
         <include>**/pom.xml</include>
         <include>**/src/**</include>
-        <include>conf/**</include>
+        <include>src/conf/**</include>
         <include>**/build.xml</include>
         <include>**/*.properties</include>
       </includes>

Copied: mahout/trunk/examples/build.xml (from r1067703, mahout/trunk/etc/build.xml)
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/build.xml?p2=mahout/trunk/examples/build.xml&p1=mahout/trunk/etc/build.xml&r1=1067703&r2=1070408&rev=1070408&view=diff
==============================================================================
--- mahout/trunk/etc/build.xml (original)
+++ mahout/trunk/examples/build.xml Mon Feb 14 08:47:39 2011
@@ -23,7 +23,7 @@
 
  -->
 
-<project name="mahout" default="core-job" basedir=".">
+<project name="mahout" default="core-job" basedir="../etc">
   <!-- Run in examples during the package phase -->
   <target name="build-grouplens-jar">
     <jar jarfile="${dest}/grouplens.jar">

Propchange: mahout/trunk/examples/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: mahout/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/pom.xml?rev=1070408&r1=1070407&r2=1070408&view=diff
==============================================================================
--- mahout/trunk/examples/pom.xml (original)
+++ mahout/trunk/examples/pom.xml Mon Feb 14 08:47:39 2011
@@ -76,7 +76,7 @@
             <phase>package</phase>
             <configuration>
               <tasks>
-                <ant antfile="../etc/build.xml" target="build-grouplens-jar">
+                <ant antfile="build.xml" target="build-grouplens-jar">
                   <property name="dest" value="${project.build.directory}"/>
                   <property name="examples-base" value="src/main/java"/>
                 </ant>



Mime
View raw message