You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2013/12/06 20:02:59 UTC
svn commit: r1548663 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main:
java/org/apache/uima/ducc/test/ddjob/
java/org/apache/uima/ducc/test/randomsleep/
resources/org/apache/uima/ducc/test/ddjob/
resources/org/apache/uima/ducc/test/random...
Author: challngr
Date: Fri Dec 6 19:02:59 2013
New Revision: 1548663
URL: http://svn.apache.org/r1548663
Log:
UIMA-3450 Add class comments. Remove userid in comments. Remove dead code. Consolidate and simplify dir structure.
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepConsumer.java
- copied, changed from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepConsumer.java
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.java
- copied, changed from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepMultiplier.java
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepAggregate.xml
- copied, changed from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepAggregate.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml
- copied, changed from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepDescriptor.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepConsumer.xml
- copied, changed from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepConsumer.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.xml
- copied, changed from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepMultiplier.xml
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/DDSleepCR.java
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepConsumer.java
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepMultiplier.java
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepAggregate.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepDescriptor.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepConsumer.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepMultiplier.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/NoSleepAE.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/NoSleepCR.xml
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepConsumer.java (from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepConsumer.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepConsumer.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepConsumer.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepConsumer.java&r1=1548559&r2=1548663&rev=1548663&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepConsumer.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepConsumer.java Fri Dec 6 19:02:59 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.ducc.test.ddjob;
+package org.apache.uima.ducc.test.randomsleep;
import java.util.StringTokenizer;
@@ -28,10 +28,8 @@ import org.apache.uima.cas.CAS;
import org.apache.uima.resource.ResourceInitializationException;
/**
- * challngr@us.ibm.com
- * May, 2011
+ * Minimal CAS consumer for the DD version of the system tests.
*/
-
public class SleepConsumer extends CasAnnotator_ImplBase
{
String CC_Identifier = "*@@@@@@@@@ CC ";
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.java (from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepMultiplier.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepMultiplier.java&r1=1548559&r2=1548663&rev=1548663&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/ddjob/SleepMultiplier.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.java Fri Dec 6 19:02:59 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.ducc.test.ddjob;
+package org.apache.uima.ducc.test.randomsleep;
import java.util.LinkedList;
import java.util.StringTokenizer;
@@ -30,7 +30,8 @@ import org.apache.uima.cas.CAS;
import org.apache.uima.resource.ResourceInitializationException;
/**
- * An example CasMultiplier, which generates the specified number of output CASes.
+ * An example CasMultiplier, which generates the specified number of output CASes,
+ * used in the DD version of the system tests.
*/
public class SleepMultiplier extends CasMultiplier_ImplBase
{
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepAggregate.xml (from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepAggregate.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepAggregate.xml?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepAggregate.xml&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepAggregate.xml&r1=1548559&r2=1548663&rev=1548663&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepAggregate.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepAggregate.xml Fri Dec 6 19:02:59 2013
@@ -29,7 +29,7 @@
<delegateAnalysisEngineSpecifiers>
<delegateAnalysisEngine key="SleepMultiplier">
- <import name="org.apache.uima.ducc.test.ddjob.SleepMultiplier"/>
+ <import name="org.apache.uima.ducc.test.randomsleep.SleepMultiplier"/>
</delegateAnalysisEngine>
<delegateAnalysisEngine key="SleepAe">
@@ -37,7 +37,7 @@
</delegateAnalysisEngine>
<delegateAnalysisEngine key="SleepConsumer">
- <import name="org.apache.uima.ducc.test.ddjob.SleepConsumer"/>
+ <import name="org.apache.uima.ducc.test.randomsleep.SleepConsumer"/>
</delegateAnalysisEngine>
</delegateAnalysisEngineSpecifiers>
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml (from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepDescriptor.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepDescriptor.xml&r1=1548559&r2=1548663&rev=1548663&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/DDSleepDescriptor.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/DDSleepDescriptor.xml Fri Dec 6 19:02:59 2013
@@ -34,7 +34,7 @@
<service>
<inputQueue endpoint="TopLevelTaeQueue" brokerURL="${DefaultBrokerURL}" prefetch="1"/>
<topDescriptor>
- <import name="org.apache.uima.ducc.test.ddjob.DDSleepAggregate"/>
+ <import name="org.apache.uima.ducc.test.randomsleep.DDSleepAggregate"/>
</topDescriptor>
<analysisEngine>
<delegates>
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepConsumer.xml (from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepConsumer.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepConsumer.xml?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepConsumer.xml&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepConsumer.xml&r1=1548559&r2=1548663&rev=1548663&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepConsumer.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepConsumer.xml Fri Dec 6 19:02:59 2013
@@ -28,7 +28,7 @@
<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
<primitive>true</primitive>
- <annotatorImplementationName>org.apache.uima.ducc.test.ddjob.SleepConsumer</annotatorImplementationName>
+ <annotatorImplementationName>org.apache.uima.ducc.test.randomsleep.SleepConsumer</annotatorImplementationName>
<analysisEngineMetaData>
<name>DefaultAE</name>
<description>Receives CASes with modified index; does nothing (echos).</description>
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.xml (from r1548559, uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepMultiplier.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.xml?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.xml&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepMultiplier.xml&r1=1548559&r2=1548663&rev=1548663&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/ddjob/SleepMultiplier.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/test/randomsleep/SleepMultiplier.xml Fri Dec 6 19:02:59 2013
@@ -25,7 +25,7 @@
<collectionReaderDescription xmlns="http://uima.apache.org/resourceSpecifier">
<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
- <implementationName>org.apache.uima.ducc.test.ddjob.SleepMultiplier</implementationName>
+ <implementationName>org.apache.uima.ducc.test.randomsleep.SleepMultiplier</implementationName>
<processingResourceMetaData>
<name>Driver Collection Reader</name>
<description>CM part of the test pipeline.</description>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc?rev=1548663&r1=1548662&r2=1548663&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc Fri Dec 6 19:02:59 2013
@@ -184,7 +184,7 @@ class DuccProcess(Thread):
if ( self.runner.style == 'AE' ):
ae = 'org.apache.uima.ducc.test.randomsleep.FixedSleepAE'
elif ( self.runner.style == 'DD' ):
- dd = 'org.apache.uima.ducc.test.ddjob.DDSleepDescriptor'
+ dd = 'org.apache.uima.ducc.test.randomsleep.DDSleepDescriptor'
else:
ae = 'UimaAsFailAgg_' + services