Finalizing DAO mods

jottinger · Nov 25, 2010 · f2d6556 · f2d6556
1 parent 47055d3
commit f2d6556
Show file tree

Hide file tree

Showing 84 changed files with 911 additions and 4,025 deletions.
diff --git a/ci-bayes/ci-bayes.iml b/ci-bayes/ci-bayes.iml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration>
+        <fileset id="fileset1" name="My Fileset" removed="false">
+          <file>file://$MODULE_DIR$/src/main/resources/ci-bayes-context.xml</file>
+          <file>file://$MODULE_DIR$/src/test/resources/spring.xml</file>
+          <file>file://$MODULE_DIR$/../interfaces/src/main/resources/interfaces-context.xml</file>
+        </fileset>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -12,6 +23,17 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: hsqldb:hsqldb:1.8.0.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:5.13.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:r06" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.aspectj:aspectjrt:1.5.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
+    <orderEntry type="module" module-name="model" />
+    <orderEntry type="module" module-name="interfaces" />
+    <orderEntry type="module" module-name="db4o-dao" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.db4o:db4o-full-java5:8.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: commons-math:commons-math:1.2" level="project" />
     <orderEntry type="library" name="Maven: javax.transaction:jta:1.0.1B" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:3.3.2.GA" level="project" />
@@ -28,27 +50,29 @@
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-commons-annotations:3.0.0.ga" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate:ejb3-persistence:1.0.1.GA" level="project" />
     <orderEntry type="library" name="Maven: javassist:javassist:3.4.GA" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: hsqldb:hsqldb:1.8.0.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:5.13.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: hsqldb:hsqldb:1.7.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:5.14.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.google.inject:guice:2.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:r06" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:r07" level="project" />
     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers:3.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:3.0.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-tx:3.0.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-test:3.0.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.aspectj:aspectjrt:1.5.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-context:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-aop:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-asm:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-beans:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-core:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-expression:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-tx:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-aspects:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-context-support:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework:spring-test:3.0.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.aspectj:aspectjrt:1.6.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.8.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.8.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: javatar:javatar:2.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-snowball:2.3.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: rome:rome-fetcher:1.0RC2" level="project" />

diff --git a/ci-bayes/pom.xml b/ci-bayes/pom.xml
@@ -16,7 +16,7 @@
     <description>Module for classifying data based on various Bayesian algorithms</description>
     <url>https://ci-bayes.dev.java.net</url>
     <properties>
-        <springVersion>3.0.3.RELEASE</springVersion>
+        <springVersion>3.0.4.RELEASE</springVersion>
     </properties>
     <licenses>
         <license>
@@ -69,15 +69,26 @@
         </extensions>
     </build>
     <dependencies>
+        <dependency>
+            <groupId>com.enigmastation</groupId>
+            <artifactId>model</artifactId>
+            <version>[3.0.0-SNAPSHOT,)</version>
+        </dependency>
+        <dependency>
+            <groupId>com.enigmastation.dao</groupId>
+            <artifactId>db4o-dao</artifactId>
+            <version>[3.0.0-SNAPSHOT,)</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>commons-math</groupId>
             <artifactId>commons-math</artifactId>
-            <version>1.2</version>
+            <version>[1.2,)</version>
         </dependency>
         <dependency>
             <groupId>javax.transaction</groupId>
             <artifactId>jta</artifactId>
-            <version>1.0.1B</version>
+            <version>[1.0.1B,)</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -87,24 +98,24 @@
         <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.7</version>
+            <version>[1.8.0.7,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.13.1</version>
+            <version>5.14.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>r06</version>
+            <version>[r06,)</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-analyzers</artifactId>
-            <version>3.0.2</version>
+            <version>[3.0.2,)</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -118,6 +129,18 @@
             <version>${springVersion}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <version>${springVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${springVersion}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -127,19 +150,19 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.5.4</version>
+            <version>[1.5.4,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.7.0</version>
+            <version>[1.7.0,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javatar</groupId>
             <artifactId>javatar</artifactId>
-            <version>2.5</version>
+            <version>[2.5,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/ci-bayes/src/main/java/com/enigmastation/classifier/Classifier.java b/ci-bayes/src/main/java/com/enigmastation/classifier/Classifier.java
@@ -21,7 +21,5 @@ public interface Classifier extends Serializable {
 
     Set<String> getCategories();
 
-    void addListener(ClassifierListener listener);
-
     void train(Object item, String category);
 }