Author: srowen
Date: Sat Jun 4 07:16:33 2011
New Revision: 1131341
URL: http://svn.apache.org/viewvc?rev=1131341&view=rev
Log:
MAHOUT-699 Make utils, taste-webapp into 'integration', for optional components
of the library which at this point is mostly third-party integration stuff.
Remove war packaging. Move JDBC code to integration from core
Added:
mahout/trunk/integration/
- copied from r1131325, mahout/trunk/taste-web/
mahout/trunk/integration/bin/
- copied from r1131325, mahout/trunk/utils/bin/
mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/
- copied from r1131325,
mahout/trunk/utils/src/main/java/org/apache/mahout/benchmark/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/
- copied from r1131325,
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/
- copied from r1131325,
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/AbstractJDBCInMemoryItemSimilarity.java
- copied unchanged from r1131325,
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/AbstractJDBCInMemoryItemSimilarity.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/AbstractJDBCItemSimilarity.java
- copied unchanged from r1131325,
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/AbstractJDBCItemSimilarity.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCInMemoryItemSimilarity.java
- copied unchanged from r1131325,
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCInMemoryItemSimilarity.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java
- copied, changed from r1131325,
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java
mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/
- copied from r1131325,
mahout/trunk/utils/src/main/java/org/apache/mahout/clustering/
mahout/trunk/integration/src/main/java/org/apache/mahout/text/
- copied from r1131325,
mahout/trunk/utils/src/main/java/org/apache/mahout/text/
mahout/trunk/integration/src/main/java/org/apache/mahout/utils/
- copied from r1131325,
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/
mahout/trunk/integration/src/test/java/org/
- copied from r1131325, mahout/trunk/utils/src/test/java/org/
mahout/trunk/integration/src/test/java/org/apache/mahout/cf/
mahout/trunk/integration/src/test/java/org/apache/mahout/cf/taste/
mahout/trunk/integration/src/test/java/org/apache/mahout/cf/taste/impl/
mahout/trunk/integration/src/test/java/org/apache/mahout/cf/taste/impl/similarity/
mahout/trunk/integration/src/test/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/
mahout/trunk/integration/src/test/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCInMemoryItemSimilarityTest.java
- copied unchanged from r1131325,
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCInMemoryItemSimilarityTest.java
Removed:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/slopeone/jdbc/
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/
mahout/trunk/taste-web/
mahout/trunk/utils/
Modified:
mahout/trunk/.gitignore
mahout/trunk/bin/mahout
mahout/trunk/core/pom.xml
mahout/trunk/distribution/pom.xml
mahout/trunk/distribution/src/main/assembly/bin.xml
mahout/trunk/examples/pom.xml
mahout/trunk/integration/pom.xml
mahout/trunk/pom.xml
Modified: mahout/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/mahout/trunk/.gitignore?rev=1131341&r1=1131340&r2=1131341&view=diff
==============================================================================
--- mahout/trunk/.gitignore (original)
+++ mahout/trunk/.gitignore Sat Jun 4 07:16:33 2011
@@ -7,9 +7,8 @@ core/target/*
math/target/*
examples/target/*
buildtools/target/*
-utils/target/*
+integration/target/*
eclipse/target/*
-taste-web/target/*
.settings/
buildtools/.settings/
core/.settings/
@@ -23,5 +22,4 @@ examples/.settings/
foo
math-tests/
math/.settings/
-taste-web/.settings/
-utils/.settings/
+integration/.settings/
Modified: mahout/trunk/bin/mahout
URL:
http://svn.apache.org/viewvc/mahout/trunk/bin/mahout?rev=1131341&r1=1131340&r2=1131341&view=diff
==============================================================================
--- mahout/trunk/bin/mahout (original)
+++ mahout/trunk/bin/mahout Sat Jun 4 07:16:33 2011
@@ -135,7 +135,7 @@ then
else
CLASSPATH=${CLASSPATH}:$MAHOUT_HOME/math/target/classes
CLASSPATH=${CLASSPATH}:$MAHOUT_HOME/core/target/classes
- CLASSPATH=${CLASSPATH}:$MAHOUT_HOME/utils/target/classes
+ CLASSPATH=${CLASSPATH}:$MAHOUT_HOME/integration/target/classes
CLASSPATH=${CLASSPATH}:$MAHOUT_HOME/examples/target/classes
#CLASSPATH=${CLASSPATH}:$MAHOUT_HOME/core/src/main/resources
fi
Modified: mahout/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1131341&r1=1131340&r2=1131341&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Sat Jun 4 07:16:33 2011
@@ -145,16 +145,6 @@
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified: mahout/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/distribution/pom.xml?rev=1131341&r1=1131340&r2=1131341&view=diff
==============================================================================
--- mahout/trunk/distribution/pom.xml (original)
+++ mahout/trunk/distribution/pom.xml Sat Jun 4 07:16:33 2011
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>org.apache.mahout</groupId>
- <artifactId>mahout-utils</artifactId>
+ <artifactId>mahout-integration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -107,11 +107,5 @@
<artifactId>mahout-examples</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.mahout</groupId>
- <artifactId>mahout-taste-webapp</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
</dependencies>
</project>
Modified: mahout/trunk/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/distribution/src/main/assembly/bin.xml?rev=1131341&r1=1131340&r2=1131341&view=diff
==============================================================================
--- mahout/trunk/distribution/src/main/assembly/bin.xml (original)
+++ mahout/trunk/distribution/src/main/assembly/bin.xml Sat Jun 4 07:16:33 2011
@@ -53,7 +53,7 @@
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../utils/target</directory>
+ <directory>${project.basedir}/../integration/target</directory>
<includes>
<include>mahout-*.job</include>
<include>mahout-*.jar</include>
@@ -79,13 +79,6 @@
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../taste-web/target</directory>
- <includes>
- <include>mahout-*.war</include>
- </includes>
- <outputDirectory/>
- </fileSet>
- <fileSet>
<directory>${project.basedir}/../collections/target/apidocs</directory>
<outputDirectory>docs/mahout-collections</outputDirectory>
</fileSet>
@@ -98,8 +91,8 @@
<outputDirectory>docs/mahout-core</outputDirectory>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../utils/target/apidocs</directory>
- <outputDirectory>docs/mahout-utils</outputDirectory>
+ <directory>${project.basedir}/../integration/target/apidocs</directory>
+ <outputDirectory>docs/mahout-integration</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/../examples/target/apidocs</directory>
Modified: mahout/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/examples/pom.xml?rev=1131341&r1=1131340&r2=1131341&view=diff
==============================================================================
--- mahout/trunk/examples/pom.xml (original)
+++ mahout/trunk/examples/pom.xml Sat Jun 4 07:16:33 2011
@@ -154,7 +154,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>mahout-utils</artifactId>
+ <artifactId>mahout-integration</artifactId>
</dependency>
<dependency>
Modified: mahout/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/pom.xml?rev=1131341&r1=1131325&r2=1131341&view=diff
==============================================================================
--- mahout/trunk/integration/pom.xml (original)
+++ mahout/trunk/integration/pom.xml Sat Jun 4 07:16:33 2011
@@ -28,61 +28,16 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>mahout-taste-webapp</artifactId>
- <name>Mahout Taste Webapp</name>
- <description>Mahout Taste Collaborative Filtering Web App</description>
+ <artifactId>mahout-integration</artifactId>
+ <name>Mahout Integration</name>
+ <description>Optional components of Mahout which generally support
interaction with third party systems,
+ formats, APIs, etc.</description>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>lib</directory>
-
<targetPath>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib</targetPath>
- </resource>
- </resources>
<plugins>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
- <configuration>
- <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
- <filters>
- <filter>${basedir}/recommender.properties</filter>
- </filters>
- <webResources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>*.jws</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>7.1.2.v20100523</version>
- <configuration>
-
<webApp>${project.build.directory}/${project.artifactId}-${project.version}.war</webApp>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -94,6 +49,22 @@
</plugin>
<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-remote-resources-plugin</artifactId>
<configuration>
<appendedResourcesDirectory>../src/main/appended-resources</appendedResourcesDirectory>
@@ -106,6 +77,9 @@
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
</plugins>
</build>
@@ -116,17 +90,44 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mahout-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mahout-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mahout-math</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mahout-math</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- 3rd party -->
+
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-commons-csv</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
</dependency>
<dependency>
@@ -151,5 +152,17 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Copied:
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java
(from r1131325,
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java)
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java?p2=mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java&p1=mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java&r1=1131325&r2=1131341&rev=1131341&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/similarity/jdbc/MySQLJDBCItemSimilarity.java
Sat Jun 4 07:16:33 2011
@@ -20,7 +20,6 @@ package org.apache.mahout.cf.taste.impl.
import javax.sql.DataSource;
import org.apache.mahout.cf.taste.common.TasteException;
-import org.apache.mahout.cf.taste.impl.common.jdbc.AbstractJDBCComponent;
/**
* <p>
@@ -81,7 +80,7 @@ public final class MySQLJDBCItemSimilari
}
public MySQLJDBCItemSimilarity(String dataSourceName) throws TasteException {
- this(AbstractJDBCComponent.lookupDataSource(dataSourceName));
+ this(lookupDataSource(dataSourceName));
}
public MySQLJDBCItemSimilarity(DataSource dataSource) {
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1131341&r1=1131340&r2=1131341&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Sat Jun 4 07:16:33 2011
@@ -134,7 +134,7 @@
</dependency>
<dependency>
- <artifactId>mahout-utils</artifactId>
+ <artifactId>mahout-integration</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
@@ -337,12 +337,6 @@
</dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -588,9 +582,8 @@
<module>eclipse</module>
<module>math</module>
<module>core</module>
- <module>taste-web</module>
+ <module>integration</module>
<module>examples</module>
- <module>utils</module>
<module>distribution</module>
</modules>
<profiles>
