You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by to...@apache.org on 2013/04/04 13:28:45 UTC
svn commit: r1464460 - in /uima/sandbox/trunk/uima-bsp: pom.xml src/main/java/org/apache/uima/bsp/AEProcessingBSPJob.java src/main/java/org/apache/uima/bsp/BSPAnalysisEngineExecutor.java src/main/java/org/apache/uima/bsp/BasicAEProcessingBSPJob.java

Author: tommaso
Date: Thu Apr  4 11:28:44 2013
New Revision: 1464460

URL: http://svn.apache.org/r1464460
Log:
UIMA-2502 - removed unnnecessary hama-examples dependency and switched to 0.6.1 version

Added:
    uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BasicAEProcessingBSPJob.java
      - copied, changed from r1421802, uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/AEProcessingBSPJob.java
Removed:
    uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/AEProcessingBSPJob.java
Modified:
    uima/sandbox/trunk/uima-bsp/pom.xml
    uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BSPAnalysisEngineExecutor.java

Modified: uima/sandbox/trunk/uima-bsp/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/uima-bsp/pom.xml?rev=1464460&r1=1464459&r2=1464460&view=diff
==============================================================================
--- uima/sandbox/trunk/uima-bsp/pom.xml (original)
+++ uima/sandbox/trunk/uima-bsp/pom.xml Thu Apr  4 11:28:44 2013
@@ -45,12 +45,7 @@
     <dependency>
       <groupId>org.apache.hama</groupId>
       <artifactId>hama-core</artifactId>
-      <version>0.6.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hama</groupId>
-      <artifactId>hama-examples</artifactId>
-      <version>0.6.0</version>
+      <version>0.6.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BSPAnalysisEngineExecutor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BSPAnalysisEngineExecutor.java?rev=1464460&r1=1464459&r2=1464460&view=diff
==============================================================================
--- uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BSPAnalysisEngineExecutor.java (original)
+++ uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BSPAnalysisEngineExecutor.java Thu Apr  4 11:28:44 2013
@@ -23,7 +23,7 @@ import org.apache.hama.HamaConfiguration
 import org.apache.hama.bsp.BSPJob;
 
 /**
- * Convenience class to execute a {@link AEProcessingBSPJob}
+ * Convenience class to execute a {@link BasicAEProcessingBSPJob}
  */
 public class BSPAnalysisEngineExecutor {
 
@@ -37,9 +37,9 @@ public class BSPAnalysisEngineExecutor {
 
     BSPJob job = new BSPJob(conf);
     // set the BSP class which shall be executed
-    job.setBspClass(AEProcessingBSPJob.class);
+    job.setBspClass(BasicAEProcessingBSPJob.class);
     // help Hama to locale the jar to be distributed
-    job.setJarByClass(AEProcessingBSPJob.class);
+    job.setJarByClass(BasicAEProcessingBSPJob.class);
     // give it a name
     job.setJobName("BSP based UIMA AE executor");
     // use 4 tasks

Copied: uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BasicAEProcessingBSPJob.java (from r1421802, uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/AEProcessingBSPJob.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BasicAEProcessingBSPJob.java?p2=uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BasicAEProcessingBSPJob.java&p1=uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/AEProcessingBSPJob.java&r1=1421802&r2=1464460&rev=1464460&view=diff
==============================================================================
--- uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/AEProcessingBSPJob.java (original)
+++ uima/sandbox/trunk/uima-bsp/src/main/java/org/apache/uima/bsp/BasicAEProcessingBSPJob.java Thu Apr  4 11:28:44 2013
@@ -43,7 +43,7 @@ import java.util.Random;
  * A {@link BSP} which gets files from a directory and pass them to an {@link AnalysisEngine} for processing.
  * Finally a file is written which collects all the {@link ProcessTrace}s from the different nodes.
  */
-public class AEProcessingBSPJob<KI, VI, KO, VO, M extends ByteMessage> extends BSP<KI, VI, KO, VO, BSPMessage> {
+public class BasicAEProcessingBSPJob<KI, VI, KO, VO, M extends ByteMessage> extends BSP<KI, VI, KO, VO, BSPMessage> {
 
   private CasPool casPool;