Author: srowen
Date: Tue Jul 10 14:49:26 2012
New Revision: 1359707
URL: http://svn.apache.org/viewvc?rev=1359707&view=rev
Log:
MAHOUT-1043 Tweak Maven setup for better compatibility with m2e
Added:
mahout/trunk/src/conf/driver.classes.default.props
Removed:
mahout/trunk/src/conf/driver.classes.props
Modified:
mahout/trunk/core/pom.xml
mahout/trunk/distribution/pom.xml
mahout/trunk/examples/pom.xml
mahout/trunk/integration/pom.xml
mahout/trunk/math/pom.xml
mahout/trunk/pom.xml
Modified: mahout/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1359707&r1=1359706&r2=1359707&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Tue Jul 10 14:49:26 2012
@@ -35,11 +35,21 @@
<packaging>jar</packaging>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>../src/conf</directory>
+ <includes>
+ <include>driver.classes.default.props</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
@@ -47,31 +57,11 @@
<optimize>true</optimize>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <copy file="../src/conf/driver.classes.props"
tofile="${project.build.directory}/classes/driver.classes.default.props" />
- </tasks>
-
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<!-- create test jar so other modules can reuse the core test utility
classes. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
@@ -85,7 +75,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>job</id>
@@ -113,7 +102,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.3</version>
<configuration>
<appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
<resourceBundles>
Modified: mahout/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/distribution/pom.xml?rev=1359707&r1=1359706&r2=1359707&view=diff
==============================================================================
--- mahout/trunk/distribution/pom.xml (original)
+++ mahout/trunk/distribution/pom.xml Tue Jul 10 14:49:26 2012
@@ -23,9 +23,7 @@
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.mahout</groupId>
<artifactId>mahout-distribution</artifactId>
- <version>0.8-SNAPSHOT</version>
<name>Mahout Release Package</name>
<description>Distribution Package</description>
<packaging>pom</packaging>
@@ -38,7 +36,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>bin-assembly</id>
@@ -87,22 +84,18 @@
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-math</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-integration</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-examples</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
</project>
Modified: mahout/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/pom.xml?rev=1359707&r1=1359706&r2=1359707&view=diff
==============================================================================
--- mahout/trunk/examples/pom.xml (original)
+++ mahout/trunk/examples/pom.xml Tue Jul 10 14:49:26 2012
@@ -40,7 +40,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>copy-dependencies</id>
@@ -70,7 +68,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>job</id>
@@ -92,7 +89,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.3</version>
<configuration>
<appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
<resourceBundles>
Modified: mahout/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/pom.xml?rev=1359707&r1=1359706&r2=1359707&view=diff
==============================================================================
--- mahout/trunk/integration/pom.xml (original)
+++ mahout/trunk/integration/pom.xml Tue Jul 10 14:49:26 2012
@@ -40,7 +40,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
@@ -51,7 +50,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>copy-dependencies</id>
@@ -68,7 +66,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.3</version>
<configuration>
<appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
<resourceBundles>
Modified: mahout/trunk/math/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/math/pom.xml?rev=1359707&r1=1359706&r2=1359707&view=diff
==============================================================================
--- mahout/trunk/math/pom.xml (original)
+++ mahout/trunk/math/pom.xml Tue Jul 10 14:49:26 2012
@@ -43,7 +43,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.4</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -53,9 +52,9 @@
<plugin>
<groupId>org.apache.mahout</groupId>
<artifactId>mahout-collection-codegen-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
+ <phase>generate-sources</phase>
<goals>
<goal>generate</goal>
</goals>
@@ -68,6 +67,39 @@
<!--<testExcludes>-->
<!--<testExclude>**/BooleanArrayListTest.java</testExclude>-->
<!--</testExcludes>-->
+
<outputDirectory>${project.build.directory}/generated-sources/mahout</outputDirectory>
+
<testOutputDirectory>${project.build.directory}/generated-test-sources/mahout</testOutputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${project.build.directory}/generated-sources/mahout</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${project.build.directory}/generated-test-sources/mahout</source>
+ </sources>
</configuration>
</execution>
</executions>
@@ -77,7 +109,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
@@ -99,7 +130,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.3</version>
<configuration>
<appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
<resourceBundles>
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1359707&r1=1359706&r2=1359707&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Tue Jul 10 14:49:26 2012
@@ -158,6 +158,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <artifactId>mahout-examples</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- 3rd party -->
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -443,6 +449,43 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.4,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-collection-codegen-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
@@ -478,6 +521,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version>
</plugin>
@@ -637,6 +685,16 @@
</supplementalModels>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.mahout</groupId>
+ <artifactId>mahout-collection-codegen-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Added: mahout/trunk/src/conf/driver.classes.default.props
URL:
http://svn.apache.org/viewvc/mahout/trunk/src/conf/driver.classes.default.props?rev=1359707&view=auto
==============================================================================
--- mahout/trunk/src/conf/driver.classes.default.props (added)
+++ mahout/trunk/src/conf/driver.classes.default.props Tue Jul 10 14:49:26 2012
@@ -0,0 +1,68 @@
+#Utils
+org.apache.mahout.utils.vectors.VectorDumper = vectordump : Dump vectors from
a sequence file to text
+org.apache.mahout.utils.clustering.ClusterDumper = clusterdump : Dump cluster
output to text
+org.apache.mahout.utils.SequenceFileDumper = seqdumper : Generic Sequence File
dumper
+org.apache.mahout.utils.vectors.lucene.Driver = lucene.vector : Generate
Vectors from a Lucene index
+org.apache.mahout.utils.vectors.arff.Driver = arff.vector : Generate Vectors
from an ARFF file or directory
+org.apache.mahout.utils.vectors.RowIdJob = rowid : Map
SequenceFile<Text,VectorWritable> to {SequenceFile<IntWritable,VectorWritable>,
SequenceFile<IntWritable,Text>}
+org.apache.mahout.utils.SplitInput = split : Split Input data into test and
train sets
+org.apache.mahout.utils.MatrixDumper = matrixdump : Dump matrix in CSV format
+org.apache.mahout.utils.regex.RegexConverterDriver = regexconverter : Convert
text files on a per line basis based on regular expressions
+org.apache.mahout.text.SequenceFilesFromDirectory = seqdirectory : Generate
sequence files (of Text) from a directory
+org.apache.mahout.vectorizer.SparseVectorsFromSequenceFiles = seq2sparse:
Sparse Vector generation from Text sequence files
+org.apache.mahout.vectorizer.EncodedVectorsFromSequenceFiles = seq2encoded:
Encoded Sparse Vector generation from Text sequence files
+org.apache.mahout.text.WikipediaToSequenceFile = seqwiki : Wikipedia xml dump
to sequence file
+org.apache.mahout.text.SequenceFilesFromMailArchives = seqmailarchives :
Creates SequenceFile from a directory containing gzipped mail archives
+
+#Math
+org.apache.mahout.math.hadoop.TransposeJob = transpose : Take the transpose of
a matrix
+org.apache.mahout.math.hadoop.MatrixMultiplicationJob = matrixmult : Take the
product of two matrices
+org.apache.mahout.math.hadoop.decomposer.DistributedLanczosSolver = svd :
Lanczos Singular Value Decomposition
+org.apache.mahout.math.hadoop.decomposer.EigenVerificationJob = cleansvd :
Cleanup and verification of SVD output
+org.apache.mahout.math.hadoop.similarity.cooccurrence.RowSimilarityJob =
rowsimilarity : Compute the pairwise similarities of the rows of a matrix
+org.apache.mahout.math.hadoop.similarity.VectorDistanceSimilarityJob =
vecdist : Compute the distances between a set of Vectors (or Cluster or Canopy,
they must fit in memory) and a list of Vectors
+org.apache.mahout.math.hadoop.stochasticsvd.SSVDCli = ssvd : Stochastic SVD
+#Clustering
+org.apache.mahout.clustering.kmeans.KMeansDriver = kmeans : K-means clustering
+org.apache.mahout.clustering.fuzzykmeans.FuzzyKMeansDriver = fkmeans : Fuzzy
K-means clustering
+org.apache.mahout.clustering.minhash.MinHashDriver = minhash : Run Minhash
clustering
+org.apache.mahout.clustering.lda.cvb.CVB0Driver = cvb : LDA via Collapsed
Variation Bayes (0th deriv. approx)
+org.apache.mahout.clustering.lda.cvb.InMemoryCollapsedVariationalBayes0 =
cvb0_local : LDA via Collapsed Variation Bayes, in memory locally.
+org.apache.mahout.clustering.dirichlet.DirichletDriver = dirichlet : Dirichlet
Clustering
+org.apache.mahout.clustering.meanshift.MeanShiftCanopyDriver = meanshift :
Mean Shift clustering
+org.apache.mahout.clustering.canopy.CanopyDriver = canopy : Canopy clustering
+org.apache.mahout.clustering.spectral.eigencuts.EigencutsDriver = eigencuts :
Eigencuts spectral clustering
+org.apache.mahout.clustering.spectral.kmeans.SpectralKMeansDriver =
spectralkmeans : Spectral k-means clustering
+org.apache.mahout.clustering.topdown.postprocessor.ClusterOutputPostProcessorDriver
= clusterpp : Groups Clustering Output In Clusters
+#Freq. Itemset Mining
+org.apache.mahout.fpm.pfpgrowth.FPGrowthDriver = fpg : Frequent Pattern Growth
+#Classification
+#new bayes
+org.apache.mahout.classifier.naivebayes.training.TrainNaiveBayesJob = trainnb
: Train the Vector-based Bayes classifier
+org.apache.mahout.classifier.naivebayes.test.TestNaiveBayesDriver = testnb :
Test the Vector-based Bayes classifier
+#SGD
+org.apache.mahout.classifier.sgd.TrainLogistic = trainlogistic : Train a
logistic regression using stochastic gradient descent
+org.apache.mahout.classifier.sgd.RunLogistic = runlogistic : Run a logistic
regression model against CSV data
+org.apache.mahout.classifier.sgd.PrintResourceOrFile = cat : Print a file or
resource as the logistic regression models would see it
+org.apache.mahout.classifier.sgd.TrainAdaptiveLogistic = trainAdaptiveLogistic
: Train an AdaptivelogisticRegression model
+org.apache.mahout.classifier.sgd.ValidateAdaptiveLogistic =
validateAdaptiveLogistic : Validate an AdaptivelogisticRegression model against
hold-out data set
+org.apache.mahout.classifier.sgd.RunAdaptiveLogistic = runAdaptiveLogistic :
Score new production data using a probably trained and validated
AdaptivelogisticRegression model
+#HMM
+org.apache.mahout.classifier.sequencelearning.hmm.BaumWelchTrainer = baumwelch
: Baum-Welch algorithm for unsupervised HMM training
+org.apache.mahout.classifier.sequencelearning.hmm.ViterbiEvaluator = viterbi :
Viterbi decoding of hidden states from given output states sequence
+org.apache.mahout.classifier.sequencelearning.hmm.RandomSequenceGenerator =
hmmpredict : Generate random sequence of observations by given HMM
+#Classifier Utils
+org.apache.mahout.classifier.ConfusionMatrixDumper = cmdump : Dump confusion
matrix in HTML or text formats
+
+#Recommenders
+org.apache.mahout.cf.taste.hadoop.als.DatasetSplitter = splitDataset : split a
rating dataset into training and probe parts
+org.apache.mahout.cf.taste.hadoop.als.FactorizationEvaluator =
evaluateFactorization : compute RMSE and MAE of a rating matrix factorization
against probes
+org.apache.mahout.cf.taste.hadoop.similarity.item.ItemSimilarityJob =
itemsimilarity : Compute the item-item-similarities for item-based
collaborative filtering
+org.apache.mahout.cf.taste.hadoop.item.RecommenderJob = recommenditembased :
Compute recommendations using item-based collaborative filtering
+org.apache.mahout.cf.taste.hadoop.als.ParallelALSFactorizationJob =
parallelALS : ALS-WR factorization of a rating matrix
+org.apache.mahout.cf.taste.hadoop.als.RecommenderJob = recommendfactorized :
Compute recommendations using the factorization of a rating matrix
+prepare20newsgroups = deprecated : Try the new vector backed naivebayes
classifier see examples/bin/classify-20newsgroups.sh
+trainclassifier = deprecated : Try the new vector backed naivebayes classifier
see examples/bin/classify-20newsgroups.sh
+testclassifier = deprecated : Try the new vector backed naivebayes classifier
see examples/bin/classify-20newsgroups.sh
+lda = deprecated : Try the new Collapsed Variation Bayes LDA, try bin/mahout
cvb or bin/mahout cvb0_local
+ldatopics = deprecated : Try the new Collapsed Variation Bayes LDA, try
bin/mahout cvb or bin/mahout cvb0_local
