Author: cwiklik
Date: Fri Jan 8 20:38:14 2016
New Revision: 1723791
URL: http://svn.apache.org/viewvc?rev=1723791&view=rev
Log:
UIMA-4730 Fixed bugs in the last commit which prevented building ducc
Modified:
uima/sandbox/uima-ducc/trunk/pom.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java
uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/CasHelper.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/FlowController.java
Modified: uima/sandbox/uima-ducc/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/pom.xml?rev=1723791&r1=1723790&r2=1723791&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/pom.xml Fri Jan 8 20:38:14 2016
@@ -71,9 +71,18 @@
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
+ <artifactId>uima-as</artifactId>
+ <version>${org.apache.uima.as.version}</version>
+ <type>tar.gz</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.uima</groupId>
<artifactId>uima-ducc-common</artifactId>
<version>${project.version}</version>
</dependency>
+
+
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uima-ducc-transport</artifactId>
@@ -138,6 +147,14 @@
</dependencyManagement>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uima-as</artifactId>
+ <type>tar.gz</type>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uima-ducc-common</artifactId>
@@ -292,7 +309,7 @@
<!-- must come before the unpack -->
- <plugin>
+ <!--plugin>
<groupId>org.apache.uima</groupId>
<artifactId>uima-build-helper-maven-plugin</artifactId>
<executions>
@@ -307,7 +324,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin-->
<plugin>
@@ -315,6 +332,10 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
+
+
+
+
<execution>
<!-- use the dependency:unpack goal to unpack the
base binary uima-as distribution -->
@@ -329,7 +350,7 @@
<artifactId>uima-as</artifactId>
<version>${org.apache.uima.as.version}</version>
<type>tar.gz</type>
- <classifier>bin</classifier>
+ <!--classifier>bin</classifier-->
<outputDirectory>${project.build.directory}/uima-as</outputDirectory>
</artifactItem>
</artifactItems>
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java?rev=1723791&r1=1723790&r2=1723791&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/DuccJobProcessFC.java
Fri Jan 8 20:38:14 2016
@@ -28,7 +28,7 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.apache.uima.analysis_engine.metadata.FixedFlow;
import org.apache.uima.analysis_engine.metadata.FlowConstraints;
-import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.ducc.Workitem;
import org.apache.uima.flow.FinalStep;
import org.apache.uima.flow.Flow;
@@ -135,8 +135,8 @@ public class DuccJobProcessFC extends JC
// Parent CAS has been to the initial CM, so see if a special flow has
been requested.
// Get an iterator only if the Workitem type is in the CAS's
typesystem
// (avoids JCAS_TYPE_NOT_IN_CAS error)
-// Iterator<TOP> fsIter = null;
- Iterator<FeatureStructure> fsIter = null;
+ Iterator<TOP> fsIter = null;
+
if (this.getJCas().getTypeSystem().getType(Workitem.class.getName())
!= null) {
fsIter =
this.getJCas().getJFSIndexRepository().getAllIndexedFS(Workitem.type);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml?rev=1723791&r1=1723790&r2=1723791&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml Fri Jan 8 20:38:14
2016
@@ -132,7 +132,7 @@
<org.springframework.version>3.2.11.RELEASE</org.springframework.version>
<org.apache.activemq.version>5.7.0</org.apache.activemq.version>
<org.apache.camel.version>2.15.3</org.apache.camel.version>
- <!-- org.apache.uima.version>2.6.0</org.apache.uima.version
Same as uima-as-->
+ <org.apache.uima.version>2.8.1</org.apache.uima.version>
<!--Same as uima-as-->
<!--
org.apache.uima.as.version>2.6.0</org.apache.uima.as.version-->
<org.apache.uima.as.version>2.8.1-SNAPSHOT</org.apache.uima.as.version>
<com.google.guava.version>14.0.1</com.google.guava.version>
<!-- updated from r09 for cassandra -->
@@ -440,7 +440,7 @@ ${uimaDUCCNoticeText}
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${org.apache.uima.as.version}</version>
+ <version>${org.apache.uima.version}</version>
</dependency>
<dependency>
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/CasHelper.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/CasHelper.java?rev=1723791&r1=1723790&r2=1723791&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/CasHelper.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/CasHelper.java
Fri Jan 8 20:38:14 2016
@@ -21,7 +21,7 @@ package org.apache.uima.ducc;
import java.util.Iterator;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.jcas.cas.TOP;
public class CasHelper {
@@ -31,8 +31,8 @@ public class CasHelper {
retVal = cas.getDocumentText();
}
try {
-// Iterator<TOP> fsIter = null;
- Iterator<FeatureStructure> fsIter = null;
+ Iterator<TOP> fsIter = null;
+
Workitem wi = null;
if
(cas.getJCas().getTypeSystem().getType(Workitem.class.getName()) != null) {
fsIter =
cas.getJCas().getJFSIndexRepository().getAllIndexedFS(Workitem.type);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/FlowController.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/FlowController.java?rev=1723791&r1=1723790&r2=1723791&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/FlowController.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/FlowController.java
Fri Jan 8 20:38:14 2016
@@ -28,7 +28,7 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.apache.uima.analysis_engine.metadata.FixedFlow;
import org.apache.uima.analysis_engine.metadata.FlowConstraints;
-import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.ducc.Workitem;
import org.apache.uima.flow.FinalStep;
import org.apache.uima.flow.Flow;
@@ -134,8 +134,8 @@ public class FlowController extends JCas
// Parent CAS has been to the initial CM, so see if a special flow has
been requested.
// Get an iterator only if the Workitem type is in the CAS's
typesystem
// (avoids JCAS_TYPE_NOT_IN_CAS error)
-// Iterator<TOP> fsIter = null;
- Iterator<FeatureStructure> fsIter = null;
+ Iterator<TOP> fsIter = null;
+
if (this.getJCas().getTypeSystem().getType(Workitem.class.getName())
!= null) {
fsIter =
this.getJCas().getJFSIndexRepository().getAllIndexedFS(Workitem.type);
}
