Author: srowen
Date: Mon May 12 04:31:11 2008
New Revision: 655474
URL: http://svn.apache.org/viewvc?rev=655474&view=rev
Log:
Move EJB interface out to examples, as a sort of semi-deprecation. Simplify build files accordingly.
Added:
lucene/mahout/trunk/core/src/main/examples/org/apache/mahout/cf/taste/ejb/
- copied from r655000, lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/ejb/
Removed:
lucene/mahout/trunk/core/lib/ejb-2_1-api.jar
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/ejb/
Modified:
lucene/mahout/trunk/core/pom.xml
lucene/mahout/trunk/core/taste-build.properties
lucene/mahout/trunk/core/taste-build.xml
Modified: lucene/mahout/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/pom.xml?rev=655474&r1=655473&r2=655474&view=diff
==============================================================================
--- lucene/mahout/trunk/core/pom.xml (original)
+++ lucene/mahout/trunk/core/pom.xml Mon May 12 04:31:11 2008
@@ -165,12 +165,6 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.4</version>
Modified: lucene/mahout/trunk/core/taste-build.properties
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/taste-build.properties?rev=655474&r1=655473&r2=655474&view=diff
==============================================================================
--- lucene/mahout/trunk/core/taste-build.properties (original)
+++ lucene/mahout/trunk/core/taste-build.properties Mon May 12 04:31:11 2008
@@ -3,7 +3,6 @@
version=2.0
junit.jar=lib/junit-3.8.2.jar
-ejb.jar=lib/ejb-2_1-api.jar
servlet.jar=lib/servlet-api.jar
dbcp.jar=lib/commons-dbcp-1.2.2.jar
pool.jar=lib/commons-pool-1.4.jar
Modified: lucene/mahout/trunk/core/taste-build.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/taste-build.xml?rev=655474&r1=655473&r2=655474&view=diff
==============================================================================
--- lucene/mahout/trunk/core/taste-build.xml (original)
+++ lucene/mahout/trunk/core/taste-build.xml Mon May 12 04:31:11 2008
@@ -26,7 +26,6 @@
<property environment="env"/>
<property name="name" value="${ant.project.name}"/>
<property name="release-jar" value="${name}.jar"/>
- <property name="release-ejb-jar" value="${name}-ejb.jar"/>
<property name="release-war" value="${name}.war"/>
<target name="init">
@@ -46,7 +45,6 @@
srcdir="src/main/java">
<compilerarg value="-Xlint:all,-serial,-unchecked"/>
<classpath>
- <pathelement location="${ejb.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${dbcp.jar}"/>
<pathelement location="${pool.jar}"/>
@@ -57,7 +55,6 @@
<fileset dir="build">
<include name="org/apache/mahout/cf/taste/**"/>
<exclude name="org/apache/mahout/cf/taste/web/**"/>
- <exclude name="org/apache/mahout/cf/taste/ejb/**"/>
<exclude name="org/apache/mahout/cf/taste/example/**"/>
</fileset>
</jar>
@@ -89,25 +86,6 @@
<delete file="temp.jar"/>
</target>
- <target depends="build,optimize" name="build-ejb" description="Builds deployable EJB component">
- <fail unless="my-recommender.jar" message="Please set -Dmy-recommender.jar=XXX"/>
- <fail unless="my-recommender-class" message="Please set -Dmy-recommender-class=XXX"/>
- <property name="my-ejb-jar.xml" value="${java.io.tmpdir}/ejb-jar.xml"/>
- <copy file="src/main/java/org/apache/mahout/cf/taste/ejb/ejb-jar.xml" tofile="${my-ejb-jar.xml}">
- <filterset>
- <filter token="RECOMMENDER_CLASS" value="${my-recommender-class}"/>
- </filterset>
- </copy>
- <jar jarfile="${release-ejb-jar}">
- <fileset dir="build">
- <include name="org/apache/mahout/cf/taste/ejb/**"/>
- </fileset>
- <zipfileset src="${release-jar}"/>
- <metainf file="${my-ejb-jar.xml}"/>
- </jar>
- <delete file="${my-ejb-jar.xml}"/>
- </target>
-
<target depends="build" name="build-test" description="Builds test classes">
<mkdir dir="build-test"/>
<javac source="1.5"
@@ -229,7 +207,6 @@
<include name="**/*.java"/>
</fileset>
<classpath>
- <pathelement location="${ejb.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${dbcp.jar}"/>
<pathelement location="${pool.jar}"/>