You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2011/08/26 18:12:17 UTC
svn commit: r1162153 - in /mahout/trunk: examples/ integration/
integration/src/main/java/org/apache/mahout/cf/taste/example/
integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/
integration/src/main/resources/ integration/src/main/w...
Author: srowen
Date: Fri Aug 26 16:12:17 2011
New Revision: 1162153
URL: http://svn.apache.org/viewvc?rev=1162153&view=rev
Log:
Remove remnants of support for auto-building a .war file for a recommender. Fix the Grouplens demo though, which still works and is simple.
Added:
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
- copied, changed from r1160046, mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java
- copied, changed from r1160046, mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java
Removed:
mahout/trunk/integration/recommender.properties
mahout/trunk/integration/src/main/resources/RecommenderService.jws
Modified:
mahout/trunk/examples/build.xml
mahout/trunk/integration/pom.xml
mahout/trunk/integration/src/main/webapp/WEB-INF/web.xml
Modified: mahout/trunk/examples/build.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/build.xml?rev=1162153&r1=1162152&r2=1162153&view=diff
==============================================================================
--- mahout/trunk/examples/build.xml (original)
+++ mahout/trunk/examples/build.xml Fri Aug 26 16:12:17 2011
@@ -24,17 +24,6 @@
-->
<project name="mahout" default="core-job" basedir="../etc">
- <!-- Run in examples during the package phase -->
- <target name="build-grouplens-jar">
- <jar jarfile="${dest}/grouplens.jar">
- <fileset dir="${examples-base}">
- <include name="**/*.dat"/>
- </fileset>
- <fileset dir="${dest}/classes">
- <include name="org/apache/mahout/cf/taste/example/grouplens/**"/>
- </fileset>
- </jar>
- </target>
<!-- Examples -->
<property name="working.dir" value="work"/>
<target name="check-files">
Modified: mahout/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/pom.xml?rev=1162153&r1=1162152&r2=1162153&view=diff
==============================================================================
--- mahout/trunk/integration/pom.xml (original)
+++ mahout/trunk/integration/pom.xml Fri Aug 26 16:12:17 2011
@@ -80,6 +80,12 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
</plugin>
+
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.10</version>
+ </plugin>
</plugins>
</build>
@@ -90,6 +96,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mahout-core</artifactId>
+ <exclusions>
+ <!-- This causes a weird runtime error -->
+ <exclusion>
+ <groupId>org.uncommons.watchmaker</groupId>
+ <artifactId>watchmaker-framework</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Copied: mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java (from r1160046, mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java?p2=mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java&p1=mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java&r1=1160046&r2=1162153&rev=1162153&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java Fri Aug 26 16:12:17 2011
@@ -17,6 +17,14 @@
package org.apache.mahout.cf.taste.example.grouplens;
+import com.google.common.base.Charsets;
+import com.google.common.io.Closeables;
+import com.google.common.io.Files;
+import com.google.common.io.InputSupplier;
+import com.google.common.io.Resources;
+import org.apache.mahout.cf.taste.impl.model.file.FileDataModel;
+import org.apache.mahout.common.iterator.FileLineIterable;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -26,14 +34,6 @@ import java.io.Writer;
import java.net.URL;
import java.util.regex.Pattern;
-import com.google.common.base.Charsets;
-import com.google.common.io.Closeables;
-import com.google.common.io.Files;
-import com.google.common.io.InputSupplier;
-import com.google.common.io.Resources;
-import org.apache.mahout.cf.taste.impl.model.file.FileDataModel;
-import org.apache.mahout.common.iterator.FileLineIterable;
-
public final class GroupLensDataModel extends FileDataModel {
private static final String COLON_DELIMTER = "::";
Copied: mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java (from r1160046, mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java)
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java?p2=mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java&p1=mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java&r1=1160046&r2=1162153&rev=1162153&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensRecommender.java Fri Aug 26 16:12:17 2011
@@ -17,10 +17,6 @@
package org.apache.mahout.cf.taste.example.grouplens;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-
import org.apache.mahout.cf.taste.common.Refreshable;
import org.apache.mahout.cf.taste.common.TasteException;
import org.apache.mahout.cf.taste.impl.recommender.CachingRecommender;
@@ -30,6 +26,10 @@ import org.apache.mahout.cf.taste.recomm
import org.apache.mahout.cf.taste.recommender.RecommendedItem;
import org.apache.mahout.cf.taste.recommender.Recommender;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
/**
* A simple {@link Recommender} implemented for the GroupLens demo.
*/
Modified: mahout/trunk/integration/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/webapp/WEB-INF/web.xml?rev=1162153&r1=1162152&r2=1162153&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/webapp/WEB-INF/web.xml (original)
+++ mahout/trunk/integration/src/main/webapp/WEB-INF/web.xml Fri Aug 26 16:12:17 2011
@@ -28,25 +28,15 @@
<servlet-class>org.apache.mahout.cf.taste.web.RecommenderServlet</servlet-class>
<init-param>
<param-name>recommender-class</param-name>
- <param-value>${recommender.class}</param-value>
+ <param-value>org.apache.mahout.cf.taste.example.grouplens.GroupLensRecommender</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>axis</servlet-name>
- <display-name>Apache-Axis Servlet</display-name>
- <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
- </servlet>
-
<servlet-mapping>
<servlet-name>taste-recommender</servlet-name>
<url-pattern>/RecommenderServlet</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>axis</servlet-name>
- <url-pattern>*.jws</url-pattern>
- </servlet-mapping>
<!-- The rest of the config is adapted from Axis's default web app -->
@@ -54,16 +44,4 @@
<session-timeout>5</session-timeout>
</session-config>
- <!-- currently the W3C havent settled on a media type for WSDL;
- http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
- for now we go with the basic 'it's XML' response -->
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
</web-app>
\ No newline at end of file