From mahout-commits-returnrachelpatel@example.org Sun Feb 01 23:44:43 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 56903 invoked from network); 1 Feb 2009 23:44:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Feb 2009 23:44:43 -0000 Received: (qmail 76945 invoked by uid 500); 1 Feb 2009 23:44:42 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 76913 invoked by uid 500); 1 Feb 2009 23:44:42 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 76904 invoked by uid 99); 1 Feb 2009 23:44:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 15:44:42 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 23:44:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A3F842388A2E; Sun, 1 Feb 2009 23:44:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r739886 - in /lucene/mahout/trunk: core/src/main/java/org/apache/mahout/cf/taste/impl/eval/ core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/ examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/ examples/src/... Date: Sun, 01 Feb 2009 23:44:12 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: srowen Date: Sun Feb 1 23:44:11 2009 New Revision: 739886 URL: http://svn.apache.org/viewvc?rev=739886&view=rev Log: Committed Deneche's change for MAHOUT-102 Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingRecommenderEvaluatorRunner.java lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/jester/JesterRecommenderEvaluatorRunner.java Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java?rev=739886&r1=739885&r2=739886&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java (original) +++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AbstractDifferenceRecommenderEvaluator.java Sun Feb 1 23:44:11 2009 @@ -23,11 +23,9 @@ import org.apache.mahout.cf.taste.impl.common.FastMap; import org.apache.mahout.cf.taste.impl.common.RandomUtils; import org.apache.mahout.cf.taste.impl.model.GenericDataModel; -import org.apache.mahout.cf.taste.impl.model.GenericItem; import org.apache.mahout.cf.taste.impl.model.GenericPreference; import org.apache.mahout.cf.taste.impl.model.GenericUser; import org.apache.mahout.cf.taste.model.DataModel; -import org.apache.mahout.cf.taste.model.Item; import org.apache.mahout.cf.taste.model.Preference; import org.apache.mahout.cf.taste.model.User; import org.apache.mahout.cf.taste.recommender.Recommender; @@ -102,8 +100,7 @@ List<Preference> testPrefs = new ArrayList<Preference>(); Preference[] prefs = user.getPreferencesAsArray(); for (Preference pref : prefs) { - Item itemCopy = new GenericItem<String>(pref.getItem().getID().toString()); - Preference newPref = new GenericPreference(null, itemCopy, pref.getValue()); + Preference newPref = new GenericPreference(null, pref.getItem(), pref.getValue()); if (random.nextDouble() < trainingPercentage) { trainingPrefs.add(newPref); } else { Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java?rev=739886&r1=739885&r2=739886&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java (original) +++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java Sun Feb 1 23:44:11 2009 @@ -25,6 +25,7 @@ import org.apache.mahout.cf.taste.impl.model.GenericItem; import org.apache.mahout.cf.taste.impl.model.GenericPreference; import org.apache.mahout.cf.taste.impl.model.GenericUser; +import org.apache.mahout.cf.taste.impl.model.BooleanPreference; import org.apache.mahout.cf.taste.model.DataModel; import org.apache.mahout.cf.taste.model.Item; import org.apache.mahout.cf.taste.model.Preference; @@ -43,15 +44,31 @@ import java.util.concurrent.locks.ReentrantLock; /** - * <p>A {@link DataModel} backed by a comma-delimited file. This class assumes that each line of the - * file contains a user ID, followed by item ID, followed by preferences value, separated by commas. - * The preference value is assumed to be parseable as a <code>double</code>. The user and item IDs + * <p>A {@link DataModel} backed by a comma-delimited file. This class typically expects a file where each + * line contains a user ID, followed by item ID, followed by preferences value, separated by commas. You may + * also use tabs.</p> + * + * <p>The preference value is assumed to be parseable as a <code>double</code>. The user and item IDs * are ready literally as Strings and treated as such in the API. Note that this means that whitespace * matters in the data file; they will be treated as part of the ID values.</p> * - * <p>This class is not intended for use with very large amounts of data (over, say, several million rows). For - * that, a JDBC-backed {@link DataModel} and a database are more appropriate. - * The file will be periodically reloaded if a change is detected.</p> + * <p>This class will reload data from the data file when {@link #refresh(Collection)} is called, unless + * the file has been reloaded very recently already.</p> + * + * <p>This class will also look for update "delta" files in the same directory, with file names that start + * the same way (up to the first period). These files should have the same format, and provide updated data + * that supersedes what is in the main data file. This is a mechanism that allows an application to push + * updates to {@link FileDataModel} without re-copying the entire data file.</p> + * + * <p>The line may contain a blank preference value (e.g. "123,ABC,"). This is interpreted to mean "delete + * preference", and is only useful in the context of an update delta file (see above).</p> + * + * <p>Finally, for application that have no notion of a preference value (that is, the user simply expresses + * a preference for an item, but no degree of preference), the caller can simply omit the third token in + * each line altogether -- for example, "123,ABC".</p> + * + * <p>This class is not intended for use with very large amounts of data (over, say, tens of millions of rows). + * For that, a JDBC-backed {@link DataModel} and a database are more appropriate.</p> * * <p>It is possible and likely useful to subclass this class and customize its behavior to accommodate * application-specific needs and input formats. See {@link #processLine(String, Map, Map)}, @@ -63,9 +80,11 @@ private static final Logger log = LoggerFactory.getLogger(FileDataModel.class); private static final long MIN_RELOAD_INTERVAL_MS = 60 * 1000L; // 1 minute? + private static final char UNKNOWN_DELIMITER = '\0'; private final File dataFile; private long lastModified; + private char delimiter; private boolean loaded; private DataModel delegate; private final ReentrantLock reloadLock; @@ -83,6 +102,8 @@ throw new FileNotFoundException(dataFile.toString()); } + this.delimiter = UNKNOWN_DELIMITER; + log.info("Creating FileDataModel for file " + dataFile); this.dataFile = dataFile; @@ -119,6 +140,12 @@ } } + /** + * Finds update delta files in the same directory as the data file. This finds any file whose + * name starts the same way as the data file (up to first period) but isn't the data file itself. + * For example, if the data file is /foo/data.txt.gz, you might place update files at + * /foo/data.1.txt.gz, /foo/data.2.txt.gz, etc. + */ private Iterable<File> findUpdateFiles() { String dataFileName = dataFile.getName(); int period = dataFileName.indexOf('.'); @@ -126,7 +153,8 @@ File parentDir = dataFile.getParentFile(); List<File> updateFiles = new ArrayList<File>(); for (File updateFile : parentDir.listFiles()) { - if (!updateFile.getName().startsWith(startName)) { + String updateFileName = updateFile.getName(); + if (updateFileName.startsWith(startName) && !updateFileName.equals(dataFileName)) { updateFiles.add(updateFile); } } @@ -140,11 +168,24 @@ for (String line : new FileLineIterable(dataOrUpdateFile, false)) { if (line.length() > 0) { log.debug("Read line: {}", line); + if (delimiter == UNKNOWN_DELIMITER) { + delimiter = determineDelimiter(line); + } processLine(line, data, itemCache); } } } + private static char determineDelimiter(String line) { + if (line.indexOf(',') >= 0) { + return ','; + } + if (line.indexOf('\t') >= 0) { + return '\t'; + } + throw new IllegalArgumentException("Did not find a delimiter in first line"); + } + /** * <p>Reads one line from the input file and adds the data to a {@link Map} data structure * which maps user IDs to preferences. This assumes that each line of the input file @@ -163,21 +204,29 @@ * @see #buildItem(String) */ protected void processLine(String line, Map<String, List<Preference>> data, Map<String, Item> itemCache) { - int commaOne = line.indexOf((int) ','); - int commaTwo = line.indexOf((int) ',', commaOne + 1); - if (commaOne < 0 || commaTwo < 0) { + int delimiterOne = line.indexOf((int) delimiter); + int delimiterTwo = line.indexOf((int) delimiter, delimiterOne + 1); + if (delimiterOne < 0) { throw new IllegalArgumentException("Bad line: " + line); } - String userID = line.substring(0, commaOne); - String itemID = line.substring(commaOne + 1, commaTwo); - String preferenceValueString = line.substring(commaTwo + 1); + + String userID = line.substring(0, delimiterOne); + String itemID; + String preferenceValueString; + if (delimiterTwo >= 0) { + itemID = line.substring(delimiterOne + 1, delimiterTwo); + preferenceValueString = line.substring(delimiterTwo + 1); + } else { + itemID = line.substring(delimiterOne + 1); + preferenceValueString = null; + } List<Preference> prefs = data.get(userID); if (prefs == null) { prefs = new ArrayList<Preference>(); data.put(userID, prefs); } - if (preferenceValueString.length() == 0) { + if (preferenceValueString != null && preferenceValueString.length() == 0) { // remove pref Iterator<Preference> prefsIterator = prefs.iterator(); while (prefsIterator.hasNext()) { @@ -189,14 +238,18 @@ } } else { // add pref -- assume it does not already exist - double preferenceValue = Double.parseDouble(preferenceValueString); Item item = itemCache.get(itemID); if (item == null) { item = buildItem(itemID); itemCache.put(itemID, item); } log.debug("Read item '{}' for user ID '{}'", item, userID); - prefs.add(buildPreference(null, item, preferenceValue)); + if (preferenceValueString == null) { + prefs.add(new BooleanPreference(null, item)); + } else { + double preferenceValue = Double.parseDouble(preferenceValueString); + prefs.add(buildPreference(null, item, preferenceValue)); + } } } @@ -278,10 +331,13 @@ @Override public void refresh(Collection<Refreshable> alreadyRefreshed) { - long newModified = dataFile.lastModified(); - if (newModified > lastModified + MIN_RELOAD_INTERVAL_MS) { + long mostRecentModification = dataFile.lastModified(); + for (File updateFile : findUpdateFiles()) { + mostRecentModification = Math.max(mostRecentModification, updateFile.lastModified()); + } + if (mostRecentModification > lastModified + MIN_RELOAD_INTERVAL_MS) { log.debug("File has changed; reloading..."); - lastModified = newModified; + lastModified = mostRecentModification; reload(); } } Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingRecommenderEvaluatorRunner.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingRecommenderEvaluatorRunner.java?rev=739886&r1=739885&r2=739886&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingRecommenderEvaluatorRunner.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingRecommenderEvaluatorRunner.java Sun Feb 1 23:44:11 2009 @@ -25,10 +25,6 @@ import java.io.IOException; -/** - * <p>A simple example "runner" class which will evaluate the performance of the current - * implementation of {@link org.apache.mahout.cf.taste.example.grouplens.GroupLensRecommender}.</p> - */ public final class BookCrossingRecommenderEvaluatorRunner { private static final Logger log = LoggerFactory.getLogger(BookCrossingRecommenderEvaluatorRunner.class); Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/jester/JesterRecommenderEvaluatorRunner.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/jester/JesterRecommenderEvaluatorRunner.java?rev=739886&r1=739885&r2=739886&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/jester/JesterRecommenderEvaluatorRunner.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/jester/JesterRecommenderEvaluatorRunner.java Sun Feb 1 23:44:11 2009 @@ -26,10 +26,6 @@ import java.io.IOException; -/** - * <p>A simple example "runner" class which will evaluate the performance of the current - * implementation of {@link org.apache.mahout.cf.taste.example.grouplens.GroupLensRecommender}.</p> - */ public final class JesterRecommenderEvaluatorRunner { private static final Logger log = LoggerFactory.getLogger(JesterRecommenderEvaluatorRunner.class); From mahout-commits-returnrachelpatel@example.org Mon Feb 02 00:00:33 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 61317 invoked from network); 2 Feb 2009 00:00:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2009 00:00:33 -0000 Received: (qmail 98234 invoked by uid 500); 2 Feb 2009 00:00:33 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 98199 invoked by uid 500); 2 Feb 2009 00:00:33 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 98178 invoked by uid 99); 2 Feb 2009 00:00:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2009 16:00:33 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 00:00:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1D1692388970; Sun, 1 Feb 2009 23:59:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r739889 - /lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluator.java Date: Sun, 01 Feb 2009 23:59:53 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: srowen Date: Sun Feb 1 23:59:53 2009 New Revision: 739889 URL: http://svn.apache.org/viewvc?rev=739889&view=rev Log: (empty) Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluator.java Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluator.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluator.java?rev=739889&r1=739888&r2=739889&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluator.java (original) +++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/eval/AverageAbsoluteDifferenceRecommenderEvaluator.java Sun Feb 1 23:59:53 2009 @@ -19,6 +19,7 @@ import org.apache.mahout.cf.taste.common.TasteException; import org.apache.mahout.cf.taste.common.NoSuchUserException; +import org.apache.mahout.cf.taste.common.NoSuchItemException; import org.apache.mahout.cf.taste.impl.common.FullRunningAverage; import org.apache.mahout.cf.taste.impl.common.RunningAverage; import org.apache.mahout.cf.taste.model.Preference; @@ -54,10 +55,12 @@ if (!Double.isNaN(estimatedPreference)) { average.addDatum(Math.abs(realPref.getValue() - estimatedPreference)); } - } catch (NoSuchUserException nsee) { + } catch (NoSuchUserException nsue) { // It's possible that an item exists in the test data but not training data in which case // NSEE will be thrown. Just ignore it and move on. - log.info("Element exists in test data but not training data: {}", testUser.getID(), nsee); + log.debug("User exists in test data but not training data: {}", testUser.getID(), nsue); + } catch (NoSuchItemException nsie) { + log.debug("Item exists in test data but not training data: {}", realPref.getItem().getID(), nsie); } } } From mahout-commits-returnrachelpatel@example.org Mon Feb 02 16:53:33 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 60702 invoked from network); 2 Feb 2009 16:53:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2009 16:53:33 -0000 Received: (qmail 65454 invoked by uid 500); 2 Feb 2009 16:53:33 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 65417 invoked by uid 500); 2 Feb 2009 16:53:32 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 65408 invoked by uid 99); 2 Feb 2009 16:53:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 08:53:32 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 16:53:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A1A4B238889C; Mon, 2 Feb 2009 16:53:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740033 - /lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java Date: Mon, 02 Feb 2009 16:53:11 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsingers Date: Mon Feb 2 16:53:11 2009 New Revision: 740033 URL: http://svn.apache.org/viewvc?rev=740033&view=rev Log: Make test standalone without extra file Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java?rev=740033&r1=740032&r2=740033&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java (original) +++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java Mon Feb 2 16:53:11 2009 @@ -30,6 +30,7 @@ import org.apache.mahout.cf.taste.recommender.Recommender; import java.io.File; +import java.io.FileWriter; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicBoolean; @@ -39,13 +40,36 @@ */ public final class FileDataModelTest extends TasteTestCase { - private static final File testFile = new File("src/test/java/org/apache/mahout/cf/taste/impl/model/file/test1.txt"); + //private static final File testFile = new File("src/test/resources/file-data-model-test.txt"); private DataModel model; + private static final String [] DATA = { + "A123,456,0.1", + "A123,789,0.6", + "A123,654,0.7", + "B234,123,0.5", + "B234,234,1.0", + "C345,789,0.6", + "C345,654,0.7", + "C345,123,1.0", + "C345,234,0.5", + "D456,456,0.1"}; + @Override public void setUp() throws Exception { super.setUp(); + File tmpDir = new File(System.getProperty("java.io.tmpdir")); + File tmpLoc = new File(tmpDir, "fileDataModel"); + tmpLoc.mkdirs(); + File testFile = File.createTempFile("test", ".txt", tmpLoc); + FileWriter writer = new FileWriter(testFile); + String lineSep = System.getProperty("line.separator"); + for (int i = 0; i < DATA.length; i++) { + writer.write(DATA[i]); + writer.write(lineSep); + } + writer.close(); model = new FileDataModel(testFile); } From mahout-commits-returnrachelpatel@example.org Mon Feb 02 16:53:51 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 60789 invoked from network); 2 Feb 2009 16:53:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2009 16:53:51 -0000 Received: (qmail 65604 invoked by uid 500); 2 Feb 2009 16:53:51 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 65571 invoked by uid 500); 2 Feb 2009 16:53:51 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 65562 invoked by uid 99); 2 Feb 2009 16:53:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 08:53:51 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 16:53:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AAFB723889CF; Mon, 2 Feb 2009 16:53:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740034 - /lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/test1.txt Date: Mon, 02 Feb 2009 16:53:28 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsingers Date: Mon Feb 2 16:53:28 2009 New Revision: 740034 URL: http://svn.apache.org/viewvc?rev=740034&view=rev Log: Make test standalone without extra file Removed: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/test1.txt From mahout-commits-returnrachelpatel@example.org Mon Feb 02 17:00:37 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 65107 invoked from network); 2 Feb 2009 17:00:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2009 17:00:36 -0000 Received: (qmail 76472 invoked by uid 500); 2 Feb 2009 17:00:36 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 76435 invoked by uid 500); 2 Feb 2009 17:00:36 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 76426 invoked by uid 99); 2 Feb 2009 17:00:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 09:00:36 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 17:00:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8DECA2388A01; Mon, 2 Feb 2009 17:00:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740039 - in /lucene/mahout/trunk: ./ core/ examples/ Date: Mon, 02 Feb 2009 17:00:15 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsingers Date: Mon Feb 2 17:00:14 2009 New Revision: 740039 URL: http://svn.apache.org/viewvc?rev=740039&view=rev Log: MAHOUT-104, deprecated Ant builds, move to Maven 2 builds. interim check-in Added: lucene/mahout/trunk/build-deprecated.xml - copied, changed from r739991, lucene/mahout/trunk/build.xml lucene/mahout/trunk/common-build-deprecated.xml (props changed) - copied unchanged from r739991, lucene/mahout/trunk/common-build.xml lucene/mahout/trunk/core/build-deprecated.xml (contents, props changed) - copied, changed from r739991, lucene/mahout/trunk/core/build.xml lucene/mahout/trunk/examples/build-deprecated.xml - copied, changed from r739991, lucene/mahout/trunk/examples/build.xml Removed: lucene/mahout/trunk/build.xml lucene/mahout/trunk/common-build.xml lucene/mahout/trunk/core/build.xml lucene/mahout/trunk/examples/build.xml Modified: lucene/mahout/trunk/core/ (props changed) lucene/mahout/trunk/core/pom.xml lucene/mahout/trunk/examples/ (props changed) lucene/mahout/trunk/examples/pom.xml lucene/mahout/trunk/pom.xml Copied: lucene/mahout/trunk/build-deprecated.xml (from r739991, lucene/mahout/trunk/build.xml) URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/build-deprecated.xml?p2=lucene/mahout/trunk/build-deprecated.xml&p1=lucene/mahout/trunk/build.xml&r1=739991&r2=740039&rev=740039&view=diff ============================================================================== --- lucene/mahout/trunk/build.xml (original) +++ lucene/mahout/trunk/build-deprecated.xml Mon Feb 2 17:00:14 2009 @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="mahout" default="dist" basedir="."> - <import file="common-build.xml"/> + <import file="common-build-deprecated.xml"/> <target name="dist" description="Build the distribution"> - <ant dir="core" antfile="build.xml" target="dist-jar"/> - <ant dir="examples" antfile="build.xml" target="dist-jar"/> + <ant dir="core" antfile="build-deprecated.xml" target="dist-jar"/> + <ant dir="examples" antfile="build-deprecated.xml" target="dist-jar"/> </target> <target name="clean" description="Clean out the build output areas"> - <ant dir="core" antfile="build.xml" target="clean"/> - <ant dir="examples" antfile="build.xml" target="clean"/> + <ant dir="core" antfile="build-deprecated.xml" target="clean"/> + <ant dir="examples" antfile="build-deprecated.xml" target="clean"/> <delete dir="build"/> <delete dir="dist"/> </target> @@ -32,8 +32,8 @@ <property name="Name" value="Apache Mahout"/> <target name="javadoc" description="Build the javadocs for the core, examples and both (combined)"> <!-- build separate ones --> - <ant dir="core" antfile="build.xml" target="javadoc"/> - <ant dir="examples" antfile="build.xml" target="javadoc"/> + <ant dir="core" antfile="build-deprecated.xml" target="javadoc"/> + <ant dir="examples" antfile="build-deprecated.xml" target="javadoc"/> <!-- build a full one --> <mkdir dir="${build.javadoc}"/> Propchange: lucene/mahout/trunk/common-build-deprecated.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: lucene/mahout/trunk/core/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Feb 2 17:00:14 2009 @@ -5,3 +5,4 @@ testdata test target +*.iml Copied: lucene/mahout/trunk/core/build-deprecated.xml (from r739991, lucene/mahout/trunk/core/build.xml) URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/build-deprecated.xml?p2=lucene/mahout/trunk/core/build-deprecated.xml&p1=lucene/mahout/trunk/core/build.xml&r1=739991&r2=740039&rev=740039&view=diff ============================================================================== --- lucene/mahout/trunk/core/build.xml (original) +++ lucene/mahout/trunk/core/build-deprecated.xml Mon Feb 2 17:00:14 2009 @@ -18,7 +18,7 @@ --> <project name="mahout-core" default="dist-jar" basedir="."> - <import file="../common-build.xml"/> + <import file="../common-build-deprecated.xml"/> <property file="build.properties" /> <property name="Name" value="Mahout" /> Propchange: lucene/mahout/trunk/core/build-deprecated.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: lucene/mahout/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=740039&r1=740038&r2=740039&view=diff ============================================================================== --- lucene/mahout/trunk/core/pom.xml (original) +++ lucene/mahout/trunk/core/pom.xml Mon Feb 2 17:00:14 2009 @@ -25,8 +25,8 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <encoding>UTF-8</encoding> - <source>6</source> - <target>6</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> @@ -328,7 +328,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-cli</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-20080905.032905-1</version> </dependency> <dependency> <groupId>junit</groupId> Propchange: lucene/mahout/trunk/examples/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Feb 2 17:00:14 2009 @@ -5,3 +5,4 @@ output temp work +*.iml Copied: lucene/mahout/trunk/examples/build-deprecated.xml (from r739991, lucene/mahout/trunk/examples/build.xml) URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/build-deprecated.xml?p2=lucene/mahout/trunk/examples/build-deprecated.xml&p1=lucene/mahout/trunk/examples/build.xml&r1=739991&r2=740039&rev=740039&view=diff ============================================================================== --- lucene/mahout/trunk/examples/build.xml (original) +++ lucene/mahout/trunk/examples/build-deprecated.xml Mon Feb 2 17:00:14 2009 @@ -18,7 +18,7 @@ --> <project name="mahout-examples" default="dist-jar" basedir="."> - <import file="../common-build.xml"/> + <import file="../common-build-deprecated.xml"/> <property file="build.properties" /> <property name="Name" value="Examples" /> @@ -103,7 +103,7 @@ </mahout-javac> </target> <target name="build-core"> - <ant inheritAll="false" dir="../core" antfile="build.xml" target="dist-jar"/> + <ant inheritAll="false" dir="../core" antfile="build-deprecated.xml" target="dist-jar"/> </target> <target name="javadoc" depends="compile" @@ -152,7 +152,7 @@ </copy> </target> <target name="compile-core-test"> - <ant inheritAll="false" dir="../core" antfile="build.xml" target="compile-test"/> + <ant inheritAll="false" dir="../core" antfile="build-deprecated.xml" target="compile-test"/> </target> <target name="test" depends="compile-test, dist-jar" description="Runs unit tests"> Modified: lucene/mahout/trunk/examples/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/pom.xml?rev=740039&r1=740038&r2=740039&view=diff ============================================================================== --- lucene/mahout/trunk/examples/pom.xml (original) +++ lucene/mahout/trunk/examples/pom.xml Mon Feb 2 17:00:14 2009 @@ -25,8 +25,8 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <encoding>UTF-8</encoding> - <source>6</source> - <target>6</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> Modified: lucene/mahout/trunk/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=740039&r1=740038&r2=740039&view=diff ============================================================================== --- lucene/mahout/trunk/pom.xml (original) +++ lucene/mahout/trunk/pom.xml Mon Feb 2 17:00:14 2009 @@ -17,7 +17,7 @@ <kfs.version>0.2.1</kfs.version> <xmlenc.version>0.52</xmlenc.version> <jets3t.version>0.6.1</jets3t.version> - <watchmaker.version>0.4.3</watchmaker.version> + <watchmaker.version>0.5.0</watchmaker.version> </properties> <licenses> From mahout-commits-returnrachelpatel@example.org Mon Feb 02 19:08:24 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 28276 invoked from network); 2 Feb 2009 19:08:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2009 19:08:24 -0000 Received: (qmail 81776 invoked by uid 500); 2 Feb 2009 19:08:24 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 81738 invoked by uid 500); 2 Feb 2009 19:08:24 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 81728 invoked by uid 99); 2 Feb 2009 19:08:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 11:08:24 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 19:08:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 882002388892; Mon, 2 Feb 2009 19:07:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740079 - in /lucene/mahout/trunk/core/src: main/java/org/apache/mahout/cf/taste/impl/model/ main/java/org/apache/mahout/matrix/ test/java/org/apache/mahout/cf/taste/impl/model/file/ Date: Mon, 02 Feb 2009 19:07:58 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: srowen Date: Mon Feb 2 19:07:57 2009 New Revision: 740079 URL: http://svn.apache.org/viewvc?rev=740079&view=rev Log: (empty) Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserGenericDataModel.java lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserGenericDataModel.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserGenericDataModel.java?rev=740079&r1=740078&r2=740079&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserGenericDataModel.java (original) +++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/BooleanUserGenericDataModel.java Mon Feb 2 19:07:57 2009 @@ -33,7 +33,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; /** * A variant on {@link GenericDataModel} which uses the "boolean" classes like {@link BooleanPrefUser}. Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java?rev=740079&r1=740078&r2=740079&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java (original) +++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/matrix/SparseVector.java Mon Feb 2 19:07:57 2009 @@ -63,10 +63,10 @@ public static Vector decodeFormat(String formattedString) { String[] pts = formattedString.split(","); SparseVector result = null; - for (int i = 0; i < pts.length; i++) { - String pt = pts[i].trim(); + for (String pt1 : pts) { + String pt = pt1.trim(); if (pt.startsWith("[s")) { - int c = Integer.parseInt(pts[i].substring(2)); + int c = Integer.parseInt(pt1.substring(2)); result = new SparseVector(c); } else if (pt.charAt(0) != ']') { int ix = pt.indexOf(':'); Modified: lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java?rev=740079&r1=740078&r2=740079&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java (original) +++ lucene/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java Mon Feb 2 19:07:57 2009 @@ -30,20 +30,19 @@ import org.apache.mahout.cf.taste.recommender.Recommender; import java.io.File; -import java.io.FileWriter; +import java.io.PrintWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicBoolean; +import java.nio.charset.Charset; /** * <p>Tests {@link FileDataModel}.</p> */ public final class FileDataModelTest extends TasteTestCase { - //private static final File testFile = new File("src/test/resources/file-data-model-test.txt"); - - private DataModel model; - private static final String [] DATA = { "A123,456,0.1", "A123,789,0.6", @@ -56,6 +55,8 @@ "C345,234,0.5", "D456,456,0.1"}; + private DataModel model; + @Override public void setUp() throws Exception { super.setUp(); @@ -63,13 +64,16 @@ File tmpLoc = new File(tmpDir, "fileDataModel"); tmpLoc.mkdirs(); File testFile = File.createTempFile("test", ".txt", tmpLoc); - FileWriter writer = new FileWriter(testFile); - String lineSep = System.getProperty("line.separator"); - for (int i = 0; i < DATA.length; i++) { - writer.write(DATA[i]); - writer.write(lineSep); + testFile.deleteOnExit(); + PrintWriter writer = + new PrintWriter(new OutputStreamWriter(new FileOutputStream(testFile), Charset.forName("UTF-8"))); + try { + for (String data : DATA) { + writer.println(data); + } + } finally { + writer.close(); } - writer.close(); model = new FileDataModel(testFile); } @@ -158,6 +162,7 @@ public void testRefresh() throws Exception { final AtomicBoolean initialized = new AtomicBoolean(false); Runnable initializer = new Runnable() { + @Override public void run() { try { model.getNumUsers(); From mahout-commits-returnrachelpatel@example.org Mon Feb 02 19:20:01 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 30746 invoked from network); 2 Feb 2009 19:20:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Feb 2009 19:20:01 -0000 Received: (qmail 91863 invoked by uid 500); 2 Feb 2009 19:20:01 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 91795 invoked by uid 500); 2 Feb 2009 19:20:01 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 91786 invoked by uid 99); 2 Feb 2009 19:20:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 11:20:01 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 19:19:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1ABE92388892; Mon, 2 Feb 2009 19:19:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740083 - /lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java Date: Mon, 02 Feb 2009 19:19:37 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: srowen Date: Mon Feb 2 19:19:36 2009 New Revision: 740083 URL: http://svn.apache.org/viewvc?rev=740083&view=rev Log: Oops, minSimilarity should default to Double.NEGATIVE_INFINITY Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java?rev=740083&r1=740082&r2=740083&view=diff ============================================================================== --- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java (original) +++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java Mon Feb 2 19:19:36 2009 @@ -49,7 +49,7 @@ public NearestNUserNeighborhood(int n, UserSimilarity userSimilarity, DataModel dataModel) { - this(n, 0.0, userSimilarity, dataModel, 1.0); + this(n, Double.NEGATIVE_INFINITY, userSimilarity, dataModel, 1.0); } /** @@ -114,12 +114,6 @@ private final User theUser; private final double minSim; - private Estimator(UserSimilarity userSimilarityImpl, User theUser) { - this.userSimilarityImpl = userSimilarityImpl; - this.theUser = theUser; - this.minSim = Double.NEGATIVE_INFINITY; - } - private Estimator(UserSimilarity userSimilarityImpl, User theUser, double minSim) { this.userSimilarityImpl = userSimilarityImpl; this.theUser = theUser; From mahout-commits-returnrachelpatel@example.org Tue Feb 03 06:02:32 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 92973 invoked from network); 3 Feb 2009 06:02:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Feb 2009 06:02:32 -0000 Received: (qmail 40486 invoked by uid 500); 3 Feb 2009 06:02:31 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 40460 invoked by uid 500); 3 Feb 2009 06:02:31 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 40449 invoked by uid 99); 3 Feb 2009 06:02:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2009 22:02:31 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO brutus.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 06:02:23 +0000 Received: from brutus (localhost [83.161.120.155]) by brutus.apache.org (Postfix) with ESMTP id B9631234C4AF for <rachelpatel@example.org>; Mon, 2 Feb 2009 22:02:03 -0800 (PST) Message-ID: <445825798.1233640923758.JavaMail.www-data@brutus> Date: Mon, 2 Feb 2009 22:02:03 -0800 (PST) From: rachelpatel@example.org To: rachelpatel@example.org Subject: [CONF] Apache Lucene Mahout: TwentyNewsgroups (page edited) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org TwentyNewsgroups (MAHOUT) edited by Srinath Page: http://cwiki.apache.org/confluence/display/MAHOUT/TwentyNewsgroups Changes: http://cwiki.apache.org/confluence/pages/diffpagesbyversion.action?pageId=99739&originalVersion=8&revisedVersion=9 Content: --------------------------------------------------------------------- h1. Twenty Newsgroups Classification [Get Mahout|http://cwiki.apache.org/confluence/display/MAHOUT/index#index-Installation%2FSetup] Assume MAHOUT_HOME refers to the location where you checked out/installed Mahout After downloading the distribution, unzip/untar it into the directory of your choice and do: h2. Setup: # cd examples # ant get-files # ant extract-20news-18828 # ant job Then, from Hadoop: # emacs conf/hadoop-site.xml (add in local settings per [quickstart|http://hadoop.apache.org/core/docs/current/quickstart.html]) # bin/hadoop namenode -format //Format the HDFS # bin/start-all.sh //Start Hadoop # bin/hadoop dfs -put &lt;MAHOUT_HOME&gt;/work/20news-18828-collapse 20newsInput //Copies the extracted text to HDFS h2. Bayes Then, to train the Bayes Classifier using tri-grams: {code}hadoop jar <MAHOUT_HOME>/examples/build/apache-mahout-examples-0.1-dev.job org.apache.mahout.classifier.bayes.TrainClassifier -i 20newsInput -o newsmodel -ng 3 -type bayes{code} To Test: {code}hadoop jar <MAHOUT_HOME>/examples/build/apache-mahout-examples-0.1-dev.jar org.apache.mahout.classifier.bayes.TestClassifier -p newsmodel -t work/newstest -ng 3 -type bayes{code} Output might look like: {code} 08/11/07 16:52:39 INFO bayes.TestClassifier: Done loading model: # labels: 20 08/11/07 16:52:39 INFO bayes.TestClassifier: Done generating Model 08/11/07 16:52:57 INFO bayes.TestClassifier: alt.atheism 96.9962453066333 775/799.0 08/11/07 16:53:15 INFO bayes.TestClassifier: comp.graphics 99.28057553956835 966/973.0 08/11/07 16:53:45 INFO bayes.TestClassifier: comp.os.ms-windows.misc 96.95431472081218 955/985.0 08/11/07 16:53:59 INFO bayes.TestClassifier: comp.sys.ibm.pc.hardware 99.59266802443992 978/982.0 08/11/07 16:54:10 INFO bayes.TestClassifier: comp.sys.mac.hardware 99.47970863683663 956/961.0 08/11/07 16:54:28 INFO bayes.TestClassifier: comp.windows.x 99.59183673469387 976/980.0 08/11/07 16:54:38 INFO bayes.TestClassifier: misc.forsale 98.45679012345678 957/972.0 08/11/07 16:54:50 INFO bayes.TestClassifier: rec.autos 99.4949494949495 985/990.0 08/11/07 16:55:04 INFO bayes.TestClassifier: rec.motorcycles 100.0 994/994.0 08/11/07 16:55:16 INFO bayes.TestClassifier: rec.sport.baseball 99.89939637826961 993/994.0 08/11/07 16:55:36 INFO bayes.TestClassifier: rec.sport.hockey 99.89989989989989 998/999.0 08/11/07 16:55:54 INFO bayes.TestClassifier: sci.crypt 99.39455095862765 985/991.0 08/11/07 16:56:05 INFO bayes.TestClassifier: sci.electronics 98.98063200815494 971/981.0 08/11/07 16:56:27 INFO bayes.TestClassifier: sci.med 99.79797979797979 988/990.0 08/11/07 16:56:44 INFO bayes.TestClassifier: sci.space 99.3920972644377 981/987.0 08/11/07 16:57:06 INFO bayes.TestClassifier: soc.religion.christian 99.49849548645938 992/997.0 08/11/07 16:57:24 INFO bayes.TestClassifier: talk.politics.guns 99.45054945054945 905/910.0 08/11/07 16:57:51 INFO bayes.TestClassifier: talk.politics.mideast 98.82978723404256 929/940.0 08/11/07 16:58:13 INFO bayes.TestClassifier: talk.politics.misc 89.93548387096774 697/775.0 08/11/07 16:58:25 INFO bayes.TestClassifier: talk.religion.misc 61.78343949044586 388/628.0 08/11/07 16:58:25 INFO bayes.TestClassifier: ======================================================= Summary ------------------------------------------------------- Correctly Classified Instances : 18119-05-8261% Incorrectly Classified Instances : 459 2.4379% Total Classified Instances : 18828 ======================================================= Confusion Matrix ------------------------------------------------------- a b c d e f g h i j k l m n o p q r s t <--Classified as 994 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 | 994 a = rec.motorcycles 0 976 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 2 1 | 980 b = comp.windows.x 7 0 929 1 0 0 0 0 0 0 0 0 1 0 2 0 0 0 0 0 | 940 c = talk.politics.mideast 0 0 0 905 0 0 1 0 0 0 0 0 0 0 0 0 3 0 1 0 | 910 d = talk.politics.guns 4 1 4 27 388 1 0 1 0 5 1 1 2 2 149 7 2 33 0 0 | 628 e = talk.religion.misc 3 0 0 0 0 985 0 1 0 0 0 0 0 1 0 0 0 0 0 0 | 990 f = rec.autos 0 0 0 0 0 0 993 1 0 0 0 0 0 0 0 0 0 0 0 0 | 994 g = rec.sport.baseball 0 0 0 0 0 0 1 998 0 0 0 0 0 0 0 0 0 0 0 0 | 999 h = rec.sport.hockey 0 0 0 0 0 0 0 0 956 0 2 0 0 0 0 0 0 0 2 1 | 961 i = comp.sys.mac.hardware 0 0 0 0 0 0 0 0 0 981 0 0 5 0 0 1 0 0 0 0 | 987 j = sci.space 0 0 0 0 0 0 0 0 0 0 978 0 1 0 0 0 0 0 2 1 | 982 k = comp.sys.ibm.pc.hardware 1 0 3 36 0 1 2 1 0 5 0 697 4 0 3 3 19 0 0 0 | 775 l = talk.politics.misc 0 2 0 0 0 0 0 0 0 0 2 0 966 0 0 0 0 0 2 1 | 973 m = comp.graphics 1 0 0 0 0 0 0 0 0 0 6 0 0 971 0 0 0 0 3 0 | 981 n = sci.electronics 1 0 0 0 0 0 0 0 1 0 0 0 0 0 992 1 0 1 0 1 | 997 o = soc.religion.christian 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 988 0 0 0 1 | 990 p = sci.med 0 0 0 2 0 0 0 0 0 0 0 0 2 1 0 0 985 0 1 0 | 991 q = sci.crypt 0 0 0 1 1 0 0 0 0 1 0 0 1 0 19 0 1 775 0 0 | 799 r = alt.atheism 1 0 0 0 0 3 1 2 0 0 3 0 0 5 0 0 0 0 957 0 | 972 s = misc.forsale 0 0 0 8 0 0 0 0 0 0 6 0 6 0 0 0 0 0 10 955 | 985 t = comp.os.ms-windows.misc {code} h2. Complementary Naive Bayes To Train a CBayes Classifier using bi-grams {code}hadoop jar <MAHOUT_HOME>/examples/build/apache-mahout-examples-0.1-dev.jar org.apache.mahout.classifier.bayes.TrainClassifier -t -i 20newsInput -o newsmodel -ng 2 -type cbayes{code} To Test a CBayes Classifier using bi-grams {code}hadoop jar <MAHOUT_HOME>/examples/build/apache-mahout-examples-0.1-dev.jar org.apache.mahout.classifier.bayes.TestClassifier -p newsmodel -t work/newstest -ng 2 -type cbayes{code} --------------------------------------------------------------------- CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence From mahout-commits-returnrachelpatel@example.org Tue Feb 03 14:28:25 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 99841 invoked from network); 3 Feb 2009 14:28:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Feb 2009 14:28:24 -0000 Received: (qmail 65870 invoked by uid 500); 3 Feb 2009 14:28:24 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 65847 invoked by uid 500); 3 Feb 2009 14:28:24 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 65838 invoked by uid 99); 3 Feb 2009 14:28:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 06:28:24 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 14:28:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 49CC423888F4; Tue, 3 Feb 2009 14:28:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740309 - in /lucene/mahout/trunk: core/ core/lib/ examples/ examples/lib/ examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/ examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/ examples/src/test/java/org/apache/mahout/ga/wat... Date: Tue, 03 Feb 2009 14:28:02 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsingers Date: Tue Feb 3 14:28:01 2009 New Revision: 740309 URL: http://svn.apache.org/viewvc?rev=740309&view=rev Log: MAHOUT-104: More interim changes. Mvn compile and test should work, but still not release Removed: lucene/mahout/trunk/core/lib/commons-cli-2.0-SNAPSHOT.jar lucene/mahout/trunk/core/lib/commons-cli-LICENSE.txt lucene/mahout/trunk/core/lib/commons-codec-1.3.jar lucene/mahout/trunk/core/lib/commons-codec-LICENSE.txt lucene/mahout/trunk/core/lib/commons-dbcp-1.2.2.jar lucene/mahout/trunk/core/lib/commons-dbcp-LICENSE.txt lucene/mahout/trunk/core/lib/commons-httpclient-3.1.jar lucene/mahout/trunk/core/lib/commons-httpclient-LICENSE.txt lucene/mahout/trunk/core/lib/commons-lang-2.4.jar lucene/mahout/trunk/core/lib/commons-logging-1.1.1.jar lucene/mahout/trunk/core/lib/commons-logging-LICENSE.txt lucene/mahout/trunk/core/lib/commons-pool-1.4.jar lucene/mahout/trunk/core/lib/commons-pool-LICENSE.txt lucene/mahout/trunk/core/lib/log4j-1.2.15.jar lucene/mahout/trunk/core/lib/log4j-LICENSE.txt lucene/mahout/trunk/core/lib/lucene-analyzers-2.3.2.jar lucene/mahout/trunk/core/lib/lucene-core-2.3.2.jar lucene/mahout/trunk/core/lib/slf4j-LICENSE.txt lucene/mahout/trunk/core/lib/slf4j-api-1.5.5.jar lucene/mahout/trunk/core/lib/slf4j-jcl-1.5.5.jar lucene/mahout/trunk/core/lib/xpp3-LICENSE.txt lucene/mahout/trunk/core/lib/xpp3_min-83.161.120.155.O.jar lucene/mahout/trunk/core/lib/xstream-1.2.1.jar lucene/mahout/trunk/core/lib/xstream-LICENSE.txt lucene/mahout/trunk/examples/lib/ Modified: lucene/mahout/trunk/core/pom.xml lucene/mahout/trunk/examples/pom.xml lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java Modified: lucene/mahout/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=740309&r1=740308&r2=740309&view=diff ============================================================================== --- lucene/mahout/trunk/core/pom.xml (original) +++ lucene/mahout/trunk/core/pom.xml Tue Feb 3 14:28:01 2009 @@ -245,6 +245,7 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> + <scope>compile</scope> </dependency> <dependency> Modified: lucene/mahout/trunk/examples/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/pom.xml?rev=740309&r1=740308&r2=740309&view=diff ============================================================================== --- lucene/mahout/trunk/examples/pom.xml (original) +++ lucene/mahout/trunk/examples/pom.xml Tue Feb 3 14:28:01 2009 @@ -42,32 +42,6 @@ <excludes/> </configuration> </plugin> - - <plugin> - <artifactId>maven-install-plugin</artifactId> - - <!-- Copy dependencies with no official Maven artifacts from libs to local Maven repository --> - - <executions> - <execution> - <id>create-javaee-api-artifact</id> - <phase>validate</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>lib/javaee-api-5.0-1.jar</file> - <groupId>javax.ejb</groupId> - <artifactId>javaee-api</artifactId> - <packaging>jar</packaging> - <version>5.0.1</version> - <generatePom>true</generatePom> - <createChecksum>true</createChecksum> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> Modified: lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java?rev=740309&r1=740308&r2=740309&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java (original) +++ lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/CDGA.java Tue Feb 3 14:28:01 2009 @@ -71,7 +71,7 @@ } public static void main(String[] args) throws IOException { - String dataset = "build/classes/wdbc"; + String dataset = "target/classes/wdbc"; int target = 1; double threshold = 0.5; int crosspnts = 1; Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java?rev=740309&r1=740308&r2=740309&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java Tue Feb 3 14:28:01 2009 @@ -32,7 +32,7 @@ public void testSet() throws Exception { FileSystem fs = FileSystem.get(new Configuration()); - Path inpath = new Path("build/test-classes/wdbc"); + Path inpath = new Path("target/test-classes/wdbc"); DataSet dataset = FileInfoParser.parseFile(fs, inpath); DataSet.initialize(dataset); Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java?rev=740309&r1=740308&r2=740309&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java Tue Feb 3 14:28:01 2009 @@ -32,12 +32,12 @@ public void testRanges() throws IOException { FileSystem fs = FileSystem.get(new Configuration()); - Path inpath = new Path("build/test-classes/wdbc"); + Path inpath = new Path("target/test-classes/wdbc"); DataSet dataset = FileInfoParser.parseFile(fs, inpath); DataSet.initialize(dataset); - String filename = "build/test-classes/wdbc/wdbc.data"; + String filename = "target/test-classes/wdbc/wdbc.data"; BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(filename), Charset.forName("UTF-8"))); String line; Modified: lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java?rev=740309&r1=740308&r2=740309&view=diff ============================================================================== --- lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java (original) +++ lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluatorTest.java Tue Feb 3 14:28:01 2009 @@ -43,7 +43,7 @@ } // dataset - Path input = new Path("build/test-classes/wdbc"); + Path input = new Path("target/test-classes/wdbc"); CDMahoutEvaluator.InitializeDataSet(input); // evaluate the rules From mahout-commits-returnrachelpatel@example.org Tue Feb 03 15:09:10 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 61191 invoked from network); 3 Feb 2009 15:09:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Feb 2009 15:09:09 -0000 Received: (qmail 42208 invoked by uid 500); 3 Feb 2009 15:09:09 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 42176 invoked by uid 500); 3 Feb 2009 15:09:09 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 42167 invoked by uid 99); 3 Feb 2009 15:09:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 07:09:09 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 15:09:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0CF9B23888AF; Tue, 3 Feb 2009 15:08:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740316 - in /lucene/mahout/trunk/core: lib/README.txt pom.xml Date: Tue, 03 Feb 2009 15:08:45 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsingers Date: Tue Feb 3 15:08:45 2009 New Revision: 740316 URL: http://svn.apache.org/viewvc?rev=740316&view=rev Log: MAHOUT-104: more intermittent updates Added: lucene/mahout/trunk/core/lib/README.txt (with props) Modified: lucene/mahout/trunk/core/pom.xml Added: lucene/mahout/trunk/core/lib/README.txt URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/lib/README.txt?rev=740316&view=auto ============================================================================== --- lucene/mahout/trunk/core/lib/README.txt (added) +++ lucene/mahout/trunk/core/lib/README.txt Tue Feb 3 15:08:45 2009 @@ -0,0 +1 @@ +This directory contains those libraries that aren't currently published to the Maven repository. We should periodically check back with the repository to see if they become available, then we can remove the JAR from here. Propchange: lucene/mahout/trunk/core/lib/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: lucene/mahout/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=740316&r1=740315&r2=740316&view=diff ============================================================================== --- lucene/mahout/trunk/core/pom.xml (original) +++ lucene/mahout/trunk/core/pom.xml Tue Feb 3 15:08:45 2009 @@ -44,142 +44,66 @@ </execution> </executions> </plugin> - - <plugin> - <artifactId>maven-install-plugin</artifactId> - - <!-- Copy dependencies with no official Maven artifacts from libs to local Maven repository --> - - <!-- hadoop --> - + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.1</version> <executions> <execution> - <id>create-hadoop-core-artifact</id> - <phase>validate</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>lib/hadoop-${hadoop.version}-core.jar</file> - <groupId>org.apache.hadoop</groupId> - <artifactId>core</artifactId> - <packaging>jar</packaging> - <version>${hadoop.version}</version> - <generatePom>true</generatePom> - <createChecksum>true</createChecksum> - </configuration> - </execution> - - <execution> - <id>create-kfs-artifact</id> - <phase>validate</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>lib/kfs-${kfs.version}.jar</file> - <groupId>org.kosmix.kosmofs</groupId> - <artifactId>kfs</artifactId> - <packaging>jar</packaging> - <version>${kfs.version}</version> - <generatePom>true</generatePom> - <createChecksum>true</createChecksum> - </configuration> - </execution> - - <execution> - <id>create-jets3t-artifact</id> - <phase>validate</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>lib/jets3t-${jets3t.version}.jar</file> - <groupId>jets3t</groupId> - <artifactId>jets3t</artifactId> - <packaging>jar</packaging> - <version>${jets3t.version}</version> - <generatePom>true</generatePom> - <createChecksum>true</createChecksum> - </configuration> - </execution> - - - <execution> - <id>create-xmlenc-artifact</id> + <id>attach-artifacts</id> <phase>validate</phase> <goals> - <goal>install-file</goal> + <goal>attach-artifact</goal> </goals> <configuration> - <file>lib/xmlenc-${xmlenc.version}.jar</file> - <groupId>org.znerd.xmlenc</groupId> - <artifactId>xmlenc</artifactId> - <packaging>jar</packaging> - <version>${xmlenc.version}</version> - <generatePom>true</generatePom> - <createChecksum>true</createChecksum> + <artifacts> + <artifact> + <file>lib/hadoop-${hadoop.version}-core.jar</file> + <type>jar</type> + <classifier>hadoop</classifier> + </artifact> + <artifact> + <file>lib/kfs-${kfs.version}.jar</file> + <type>jar</type> + <classifier>kfs</classifier> + </artifact> + <artifact> + <file>lib/jets3t-${jets3t.version}.jar</file> + <type>jar</type> + <classifier>jets3t</classifier> + </artifact> + <artifact> + <file>lib/xmlenc-${xmlenc.version}.jar</file> + <type>jar</type> + <classifier>xmlenc</classifier> + </artifact> + <!-- watchmaker --> + <artifact> + <file>lib/watchmaker-framework-${watchmaker.version}.jar</file> + <type>jar</type> + <classifier>watchmaker-framework</classifier> + </artifact> + <artifact> + <file>lib/watchmaker-swing-${watchmaker.version}.jar</file> + <type>jar</type> + <classifier>watchmaker-swing</classifier> + </artifact> + <artifact> + <!--<groupId>org.apache.hadoop</groupId>--> + <file>lib/uncommons-maths-1.0.2.jar</file> + <type>jar</type> + <classifier>uncommons-math</classifier> + </artifact> + + </artifacts> </configuration> </execution> - - <!-- watchmaker --> - - <execution> - <id>create-watchmaker-framework-artifact</id> - <phase>validate</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>lib/watchmaker-framework-${watchmaker.version}.jar</file> - <groupId>org.uncommons.watchmaker</groupId> - <artifactId>watchmaker-framework</artifactId> - <packaging>jar</packaging> - <version>${watchmaker.version}</version> - <generatePom>true</generatePom> - <createChecksum>true</createChecksum> - </configuration> - </execution> - - <execution> - <id>create-watchmaker-swing-artifact</id> - <phase>validate</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>lib/watchmaker-swing-${watchmaker.version}.jar</file> - <groupId>org.uncommons.watchmaker</groupId> - <artifactId>watchmaker-swing</artifactId> - <packaging>jar</packaging> - <version>${watchmaker.version}</version> - <generatePom>true</generatePom> - <createChecksum>true</createChecksum> - </configuration> - </execution> - - <execution> - <id>create-uncommons-math-artifact</id> - <phase>validate</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>lib/uncommons-maths-1.0.2.jar</file> - <groupId>org.uncommons.math</groupId> - <artifactId>uncommons-math</artifactId> - <packaging>jar</packaging> - <version>1.0.2</version> - <generatePom>true</generatePom> - <createChecksum>true</createChecksum> - </configuration> - </execution> - - </executions> </plugin> + + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> From mahout-commits-returnrachelpatel@example.org Tue Feb 03 16:03:01 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 90446 invoked from network); 3 Feb 2009 16:03:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Feb 2009 16:03:01 -0000 Received: (qmail 59843 invoked by uid 500); 3 Feb 2009 16:03:01 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 59810 invoked by uid 500); 3 Feb 2009 16:03:01 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 59795 invoked by uid 99); 3 Feb 2009 16:03:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 08:03:01 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Feb 2009 16:02:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5577823889BB; Tue, 3 Feb 2009 16:02:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740330 - in /lucene/mahout/trunk: core/lib/README.txt core/lib/commons-cli-2.0-mahout.jar core/pom.xml pom.xml Date: Tue, 03 Feb 2009 16:02:30 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsingers Date: Tue Feb 3 16:02:29 2009 New Revision: 740330 URL: http://svn.apache.org/viewvc?rev=740330&view=rev Log: MAHOUT-104: add back in the install stuff, rename commons-cli-2.0-SNAPSHOT to be 2.0-mahout Added: lucene/mahout/trunk/core/lib/commons-cli-2.0-mahout.jar (with props) Modified: lucene/mahout/trunk/core/lib/README.txt lucene/mahout/trunk/core/pom.xml lucene/mahout/trunk/pom.xml Modified: lucene/mahout/trunk/core/lib/README.txt URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/lib/README.txt?rev=740330&r1=740329&r2=740330&view=diff ============================================================================== --- lucene/mahout/trunk/core/lib/README.txt (original) +++ lucene/mahout/trunk/core/lib/README.txt Tue Feb 3 16:02:29 2009 @@ -1 +1,3 @@ This directory contains those libraries that aren't currently published to the Maven repository. We should periodically check back with the repository to see if they become available, then we can remove the JAR from here. + +Commons CLI version is: commons-cli-2.0-20080905.032905-1.jar but renamed to be 2.0-mahout for release purposes. Added: lucene/mahout/trunk/core/lib/commons-cli-2.0-mahout.jar URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/lib/commons-cli-2.0-mahout.jar?rev=740330&view=auto ============================================================================== Binary file - no diff available. Propchange: lucene/mahout/trunk/core/lib/commons-cli-2.0-mahout.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: lucene/mahout/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=740330&r1=740329&r2=740330&view=diff ============================================================================== --- lucene/mahout/trunk/core/pom.xml (original) +++ lucene/mahout/trunk/core/pom.xml Tue Feb 3 16:02:29 2009 @@ -51,7 +51,7 @@ <executions> <execution> <id>attach-artifacts</id> - <phase>validate</phase> + <phase>package</phase> <goals> <goal>attach-artifact</goal> </goals> @@ -77,6 +77,11 @@ <type>jar</type> <classifier>xmlenc</classifier> </artifact> + <artifact> + <file>lib/commons-cli-2.0-mahout.jar</file> + <type>jar</type> + <classifier>commons-cli</classifier> + </artifact> <!-- watchmaker --> <artifact> <file>lib/watchmaker-framework-${watchmaker.version}.jar</file> @@ -100,7 +105,153 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <!-- Copy dependencies with no official Maven artifacts from libs to local Maven repository --> + + <!-- hadoop --> + + <executions> + <execution> + <id>create-hadoop-core-artifact</id> + <phase>validate</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>lib/hadoop-${hadoop.version}-core.jar</file> + <groupId>org.apache.hadoop</groupId> + <artifactId>core</artifactId> + <packaging>jar</packaging> + <version>${hadoop.version}</version> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + + <execution> + <id>create-kfs-artifact</id> + <phase>validate</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>lib/kfs-${kfs.version}.jar</file> + <groupId>org.kosmix.kosmofs</groupId> + <artifactId>kfs</artifactId> + <packaging>jar</packaging> + <version>${kfs.version}</version> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + + <execution> + <id>create-jets3t-artifact</id> + <phase>validate</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>lib/jets3t-${jets3t.version}.jar</file> + <groupId>jets3t</groupId> + <artifactId>jets3t</artifactId> + <packaging>jar</packaging> + <version>${jets3t.version}</version> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + + + <execution> + <id>create-xmlenc-artifact</id> + <phase>validate</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>lib/xmlenc-${xmlenc.version}.jar</file> + <groupId>org.znerd.xmlenc</groupId> + <artifactId>xmlenc</artifactId> + <packaging>jar</packaging> + <version>${xmlenc.version}</version> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + + <!-- watchmaker --> + + <execution> + <id>create-watchmaker-framework-artifact</id> + <phase>validate</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>lib/watchmaker-framework-${watchmaker.version}.jar</file> + <groupId>org.uncommons.watchmaker</groupId> + <artifactId>watchmaker-framework</artifactId> + <packaging>jar</packaging> + <version>${watchmaker.version}</version> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + + <execution> + <id>create-watchmaker-swing-artifact</id> + <phase>validate</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>lib/watchmaker-swing-${watchmaker.version}.jar</file> + <groupId>org.uncommons.watchmaker</groupId> + <artifactId>watchmaker-swing</artifactId> + <packaging>jar</packaging> + <version>${watchmaker.version}</version> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + + <execution> + <id>create-uncommons-math-artifact</id> + <phase>validate</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>lib/uncommons-maths-1.0.2.jar</file> + <groupId>org.uncommons.math</groupId> + <artifactId>uncommons-math</artifactId> + <packaging>jar</packaging> + <version>1.0.2</version> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + <execution> + <id>create-commons-cli</id> + <phase>validate</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>lib/commons-cli-2.0-mahout.jar</file> + <groupId>org.apache.commons</groupId> + <artifactId>commons-cli</artifactId> + <packaging>jar</packaging> + <version>2.0-mahout</version> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + </executions> + </plugin> @@ -253,7 +404,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-cli</artifactId> - <version>2.0-20080905.032905-1</version> + <version>2.0-mahout</version> </dependency> <dependency> <groupId>junit</groupId> Modified: lucene/mahout/trunk/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=740330&r1=740329&r2=740330&view=diff ============================================================================== --- lucene/mahout/trunk/pom.xml (original) +++ lucene/mahout/trunk/pom.xml Tue Feb 3 16:02:29 2009 @@ -31,7 +31,7 @@ <name>The Apache Software Foundation</name> <url>http://www.apache.org/</url> </organization> - + <mailingLists> <mailingList> <name>User list</name> @@ -80,6 +80,12 @@ <repositories> <repository> + <id>maven2-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url>http://download.java.net/maven/2/</url> + <layout>default</layout> + </repository> + <repository> <id>Apache snapshots</id> <url>http://people.apache.org/maven-snapshot-repository</url> <snapshots> @@ -113,7 +119,7 @@ <layout>default</layout> </snapshotRepository> </distributionManagement> - + <build> <plugins> <plugin> @@ -130,7 +136,7 @@ </executions> </plugin> </plugins> - </build> + </build> </project> From mahout-commits-returnrachelpatel@example.org Wed Feb 04 15:40:50 2009 Return-Path: <mahout-commits-returnrachelpatel@example.org> Delivered-To: rachelpatel@example.org Received: (qmail 22635 invoked from network); 4 Feb 2009 15:40:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Feb 2009 15:40:49 -0000 Received: (qmail 89369 invoked by uid 500); 4 Feb 2009 15:40:49 -0000 Delivered-To: rachelpatel@example.org Received: (qmail 89296 invoked by uid 500); 4 Feb 2009 15:40:49 -0000 Mailing-List: contact rachelpatel@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:rachelpatel@example.org> List-Unsubscribe: <mailto:rachelpatel@example.org> List-Post: <mailto:rachelpatel@example.org> List-Id: <mahout-commits.lucene.apache.org> Reply-To: rachelpatel@example.org Delivered-To: mailing list rachelpatel@example.org Received: (qmail 89286 invoked by uid 99); 4 Feb 2009 15:40:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Feb 2009 07:40:49 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Feb 2009 15:40:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0620023889A0; Wed, 4 Feb 2009 15:40:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740771 - in /lucene/mahout/trunk: ./ core/ core/src/main/java/org/apache/mahout/cf/taste/web/ examples/ maven/ taste-web/ taste-web/src/ taste-web/src/main/ taste-web/src/main/java/ taste-web/src/main/java/org/ taste-web/src/main/java/org/... Date: Wed, 04 Feb 2009 15:40:20 -0000 To: rachelpatel@example.org From: rachelpatel@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <rachelpatel@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsingers Date: Wed Feb 4 15:40:19 2009 New Revision: 740771 URL: http://svn.apache.org/viewvc?rev=740771&view=rev Log: MAHOUT-104: move out webapp stuff, move GPG signing to deploy, add in JOB jar creation Added: lucene/mahout/trunk/maven/ lucene/mahout/trunk/maven/build.xml (with props) lucene/mahout/trunk/taste-web/ (with props) lucene/mahout/trunk/taste-web/pom.xml (with props) lucene/mahout/trunk/taste-web/src/ lucene/mahout/trunk/taste-web/src/main/ lucene/mahout/trunk/taste-web/src/main/java/ lucene/mahout/trunk/taste-web/src/main/java/org/ lucene/mahout/trunk/taste-web/src/main/java/org/apache/ lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/ lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/ lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/ lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/ - copied from r740306, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/web/ lucene/mahout/trunk/taste-web/src/main/resources/ lucene/mahout/trunk/taste-web/src/main/webapp/ lucene/mahout/trunk/taste-web/src/main/webapp/WEB-INF/ lucene/mahout/trunk/taste-web/src/main/webapp/WEB-INF/RecommenderService.jws lucene/mahout/trunk/taste-web/src/main/webapp/WEB-INF/web.xml lucene/mahout/trunk/taste-web/src/test/ lucene/mahout/trunk/taste-web/src/test/java/ Removed: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/web/ lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/RecommenderService.jws lucene/mahout/trunk/taste-web/src/main/java/org/apache/mahout/cf/taste/web/web.xml Modified: lucene/mahout/trunk/core/pom.xml lucene/mahout/trunk/examples/pom.xml lucene/mahout/trunk/pom.xml Modified: lucene/mahout/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=740771&r1=740770&r2=740771&view=diff ============================================================================== --- lucene/mahout/trunk/core/pom.xml (original) +++ lucene/mahout/trunk/core/pom.xml Wed Feb 4 15:40:19 2009 @@ -11,7 +11,7 @@ </parent> <groupId>org.apache.mahout</groupId> - <artifactId>core</artifactId> + <artifactId>mahout-core</artifactId> <version>${parent.version}</version> <name>Mahout core</name> <description>Scalable machine learning libraries</description> @@ -31,7 +31,7 @@ </plugin> - <!-- create test jar so other modules can reuse the core test utillity classes. --> + <!-- create test jar so other modules can reuse the core test utility classes. --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -42,6 +42,8 @@ <goal>test-jar</goal> </goals> </execution> + + </executions> </plugin> <plugin> @@ -105,11 +107,10 @@ </execution> </executions> </plugin> + + <!-- Copy dependencies with no official Maven artifacts from libs to local Maven repository --> <plugin> <artifactId>maven-install-plugin</artifactId> - - <!-- Copy dependencies with no official Maven artifacts from libs to local Maven repository --> - <!-- hadoop --> <executions> @@ -122,7 +123,7 @@ <configuration> <file>lib/hadoop-${hadoop.version}-core.jar</file> <groupId>org.apache.hadoop</groupId> - <artifactId>core</artifactId> + <artifactId>hadoop-core</artifactId> <packaging>jar</packaging> <version>${hadoop.version}</version> <generatePom>true</generatePom> @@ -253,7 +254,49 @@ </executions> </plugin> - + + <!-- Build the Job Jar --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <!-- configure the plugin here --> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <configuration> + <tasks> + <ant antfile="../maven/build.xml"> + <property name="dest" value="${project.build.directory}"/> + <property name="fullnamever" value="${project.artifactId}-${project.version}"/> + <property name="core-lib" value="lib"/> + <property name="shared-lib" value="../lib"/> + </ant> + </tasks> + + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -276,7 +319,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>core</artifactId> + <artifactId>hadoop-core</artifactId> <version>${hadoop.version}</version> </dependency> @@ -315,20 +358,14 @@ <artifactId>commons-dbcp</artifactId> <version>1.2.2</version> </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> <version>1.4</version> </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> Modified: lucene/mahout/trunk/examples/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/pom.xml?rev=740771&r1=740770&r2=740771&view=diff ============================================================================== --- lucene/mahout/trunk/examples/pom.xml (original) +++ lucene/mahout/trunk/examples/pom.xml Wed Feb 4 15:40:19 2009 @@ -11,7 +11,7 @@ </parent> <groupId>org.apache.mahout</groupId> - <artifactId>examples</artifactId> + <artifactId>mahout-examples</artifactId> <version>${parent.version}</version> <name>Mahout examples</name> <description>Scalable machine learning library examples</description> @@ -29,6 +29,29 @@ <target>1.6</target> </configuration> </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <version>1.3</version> + <configuration> + <setupIncludes> + <setupInclude>../core/pom.xml</setupInclude> + </setupIncludes> + <pomIncludes> + <pomInclude>*/pom.xml</pomInclude> + </pomIncludes> + </configuration> + <executions> + <execution> + <id>test</id> + <phase>validate</phase> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -49,18 +72,18 @@ <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>core</artifactId> + <artifactId>mahout-core</artifactId> <version>${parent.version}</version> </dependency> <!-- core test --> <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>core</artifactId> + <artifactId>mahout-core</artifactId> <version>${parent.version}</version> - <classifier>tests</classifier> + <type>test-jar</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.apache.openejb</groupId> Added: lucene/mahout/trunk/maven/build.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/maven/build.xml?rev=740771&view=auto ============================================================================== --- lucene/mahout/trunk/maven/build.xml (added) +++ lucene/mahout/trunk/maven/build.xml Wed Feb 4 15:40:19 2009 @@ -0,0 +1,41 @@ +<?xml version="1.0"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<!-- + + Used by Maven only + + --> + +<project name="mahout" default="job" basedir="."> + + <target name="job" > + <jar jarfile="${dest}/${fullnamever}.job"> + <zipfileset dir="${dest}/classes"/> + <zipfileset dir="${core-lib}" prefix="lib" + includes="**/*.jar" excludes="hadoop-*.jar"/> + <zipfileset dir="${shared-lib}" prefix="lib" + includes="**/*.jar"/> + <zipfileset dir="${dest}/dependency" prefix="lib" + includes="**/*.jar"/> + </jar> + </target> + + +</project> Propchange: lucene/mahout/trunk/maven/build.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: lucene/mahout/trunk/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/pom.xml?rev=740771&r1=740770&r2=740771&view=diff ============================================================================== --- lucene/mahout/trunk/pom.xml (original) +++ lucene/mahout/trunk/pom.xml Wed Feb 4 15:40:19 2009 @@ -75,6 +75,7 @@ <modules> <module>core</module> + <module>taste-web</module> <module>examples</module> </modules> @@ -82,7 +83,7 @@ <repository> <id>maven2-repository.dev.java.net</id> <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/2/</url> + <url>http://download.java.net/maven/2</url> <layout>default</layout> </repository> <repository> @@ -128,7 +129,7 @@ <executions> <execution> <id>sign-artifacts</id> - <phase>verify</phase> + <phase>deploy</phase> <goals> <goal>sign</goal> </goals> Propchange: lucene/mahout/trunk/taste-web/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Feb 4 15:40:19 2009 @@ -0,0 +1,2 @@ +target +*.iml Added: lucene/mahout/trunk/taste-web/pom.xml URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/taste-web/pom.xml?rev=740771&view=auto ============================================================================== --- lucene/mahout/trunk/taste-web/pom.xml (added) +++ lucene/mahout/trunk/taste-web/pom.xml Wed Feb 4 15:40:19 2009 @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-parent</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <groupId>org.apache.mahout</groupId> + <artifactId>mahout-taste-webapp</artifactId> + <version>${parent.version}</version> + <name>Mahout Taste Webapp</name> + <description>Mahout Taste Collaborative Filtering Web App</description> + + <packaging>war</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> +
{'source': 'Apache Software Foundation Public Mail Archives'}