Author: degenaro
Date: Thu Oct 1 14:40:06 2015
New Revision: 1706267
URL: http://svn.apache.org/viewvc?rev=1706267&view=rev
Log:
UIMA-4624 DUCC uima-ducc-user project should not use duplicate class/interface
names, to avoid confusion
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregate.java
- copied, changed from r1706230,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregateComponent.java
- copied, changed from r1706230,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaDeployableConfiguration.java
- copied, changed from r1706230,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaReferenceByName.java
- copied, changed from r1706230,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaReferenceByName.java
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaReferenceByName.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IIdentity.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaReferenceByName.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/DeployableGeneration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java?rev=1706267&r1=1706266&r2=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DeployableGenerator.java
Thu Oct 1 14:40:06 2015
@@ -52,25 +52,25 @@ public class DeployableGenerator {
userLogDir = value;
}
- public String generate(IDuccUimaDeployableConfiguration configuration,
String jobId) throws Exception {
+ public String generate(IDuccGeneratorUimaDeployableConfiguration
configuration, String jobId) throws Exception {
String retVal = null;
if(configuration != null) {
- if(configuration instanceof IDuccUimaReferenceByName) {
- IDuccUimaReferenceByName
referrenceByNameConfiguration = (IDuccUimaReferenceByName) configuration;
+ if(configuration instanceof
IDuccGeneratorUimaReferenceByName) {
+ IDuccGeneratorUimaReferenceByName
referrenceByNameConfiguration = (IDuccGeneratorUimaReferenceByName)
configuration;
retVal =
generateDd(referrenceByNameConfiguration, jobId);
}
- else if(configuration instanceof IDuccUimaAggregate) {
- IDuccUimaAggregate aggregateConfiguration =
(IDuccUimaAggregate) configuration;
+ else if(configuration instanceof
IDuccGeneratorUimaAggregate) {
+ IDuccGeneratorUimaAggregate
aggregateConfiguration = (IDuccGeneratorUimaAggregate) configuration;
retVal = generateAe(aggregateConfiguration,
jobId);
}
}
return retVal;
}
- private String generateAe(IDuccUimaAggregate aggregateConfiguration,
String jobId) throws Exception {
+ private String generateAe(IDuccGeneratorUimaAggregate
aggregateConfiguration, String jobId) throws Exception {
List<String> descriptorPaths = new ArrayList<String>();
List<List<String>> overrides = new ArrayList<List<String>>();
- for( IDuccUimaAggregateComponent component:
aggregateConfiguration.getComponents()) {
+ for( IDuccGeneratorUimaAggregateComponent component:
aggregateConfiguration.getComponents()) {
descriptorPaths.add(component.getDescriptor());
overrides.add(component.getOverrides());
}
@@ -126,7 +126,7 @@ public class DeployableGenerator {
return file.getAbsolutePath();
}
- private String generateDd(IDuccUimaReferenceByName configuration,
String jobId) throws Exception {
+ private String generateDd(IDuccGeneratorUimaReferenceByName
configuration, String jobId) throws Exception {
// parse DD into DOM
Document doc = parse(configuration.getReferenceByName());
// locate the <inputQueue node within the xml
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java?rev=1706267&r1=1706266&r2=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java
Thu Oct 1 14:40:06 2015
@@ -21,14 +21,14 @@ package org.apache.uima.ducc.user.dgen;
import java.util.ArrayList;
import java.util.List;
-public class DuccUimaAggregate implements IDuccUimaAggregate {
+public class DuccUimaAggregate implements IDuccGeneratorUimaAggregate {
/**
* please increment this sUID when removing or modifying a field
*/
private static final long serialVersionUID = 1L;
- private List<IDuccUimaAggregateComponent> components = new
ArrayList<IDuccUimaAggregateComponent>();
+ private List<IDuccGeneratorUimaAggregateComponent> components = new
ArrayList<IDuccGeneratorUimaAggregateComponent>();
private String name;
private String description;
@@ -46,7 +46,7 @@ public class DuccUimaAggregate implement
setFlowController(flowController);
}
- public DuccUimaAggregate(String name, String description, int
threadCount, String brokerURL, String endpoint, String flowController,
List<IDuccUimaAggregateComponent> components) {
+ public DuccUimaAggregate(String name, String description, int
threadCount, String brokerURL, String endpoint, String flowController,
List<IDuccGeneratorUimaAggregateComponent> components) {
setName(name);
setDescription(description);
setThreadCount(threadCount);
@@ -57,12 +57,12 @@ public class DuccUimaAggregate implement
}
- public List<IDuccUimaAggregateComponent> getComponents() {
+ public List<IDuccGeneratorUimaAggregateComponent> getComponents() {
return components;
}
- public void setComponents(List<IDuccUimaAggregateComponent> components)
{
+ public void setComponents(List<IDuccGeneratorUimaAggregateComponent>
components) {
this.components = components;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java?rev=1706267&r1=1706266&r2=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java
Thu Oct 1 14:40:06 2015
@@ -20,7 +20,7 @@ package org.apache.uima.ducc.user.dgen;
import java.util.List;
-public class DuccUimaAggregateComponent implements IDuccUimaAggregateComponent
{
+public class DuccUimaAggregateComponent implements
IDuccGeneratorUimaAggregateComponent {
/**
* please increment this sUID when removing or modifying a field
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaReferenceByName.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaReferenceByName.java?rev=1706267&r1=1706266&r2=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaReferenceByName.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaReferenceByName.java
Thu Oct 1 14:40:06 2015
@@ -18,7 +18,7 @@
*/
package org.apache.uima.ducc.user.dgen;
-public class DuccUimaReferenceByName implements IDuccUimaReferenceByName {
+public class DuccUimaReferenceByName implements
IDuccGeneratorUimaReferenceByName {
/**
* please increment this sUID when removing or modifying a field
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregate.java
(from r1706230,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregate.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregate.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java&r1=1706230&r2=1706267&rev=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregate.java
Thu Oct 1 14:40:06 2015
@@ -20,10 +20,10 @@ package org.apache.uima.ducc.user.dgen;
import java.util.List;
-public interface IDuccUimaAggregate extends IDuccUimaDeployableConfiguration {
+public interface IDuccGeneratorUimaAggregate extends
IDuccGeneratorUimaDeployableConfiguration {
- public List<IDuccUimaAggregateComponent> getComponents();
- public void setComponents(List<IDuccUimaAggregateComponent> components);
+ public List<IDuccGeneratorUimaAggregateComponent> getComponents();
+ public void setComponents(List<IDuccGeneratorUimaAggregateComponent>
components);
public String getName();
public void setName(String name);
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregateComponent.java
(from r1706230,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregateComponent.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregateComponent.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java&r1=1706230&r2=1706267&rev=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaAggregateComponent.java
Thu Oct 1 14:40:06 2015
@@ -21,7 +21,7 @@ package org.apache.uima.ducc.user.dgen;
import java.io.Serializable;
import java.util.List;
-public interface IDuccUimaAggregateComponent extends Serializable {
+public interface IDuccGeneratorUimaAggregateComponent extends Serializable {
public String getDescriptor();
public void setDescriptor(String descriptor);
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaDeployableConfiguration.java
(from r1706230,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaDeployableConfiguration.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaDeployableConfiguration.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java&r1=1706230&r2=1706267&rev=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaDeployableConfiguration.java
Thu Oct 1 14:40:06 2015
@@ -20,5 +20,5 @@ package org.apache.uima.ducc.user.dgen;
import java.io.Serializable;
-public interface IDuccUimaDeployableConfiguration extends Serializable {
+public interface IDuccGeneratorUimaDeployableConfiguration extends
Serializable {
}
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaReferenceByName.java
(from r1706230,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaReferenceByName.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaReferenceByName.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaReferenceByName.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaReferenceByName.java&r1=1706230&r2=1706267&rev=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaReferenceByName.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccGeneratorUimaReferenceByName.java
Thu Oct 1 14:40:06 2015
@@ -18,7 +18,7 @@
*/
package org.apache.uima.ducc.user.dgen;
-public interface IDuccUimaReferenceByName extends
IDuccUimaDeployableConfiguration {
+public interface IDuccGeneratorUimaReferenceByName extends
IDuccGeneratorUimaDeployableConfiguration {
public String getReferenceByName();
public void setReferenceByName(String referenceByName);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/DeployableGeneration.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/DeployableGeneration.java?rev=1706267&r1=1706266&r2=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/DeployableGeneration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/DeployableGeneration.java
Thu Oct 1 14:40:06 2015
@@ -26,15 +26,15 @@ import org.apache.uima.ducc.user.dgen.De
import org.apache.uima.ducc.user.dgen.DuccUimaAggregate;
import org.apache.uima.ducc.user.dgen.DuccUimaAggregateComponent;
import org.apache.uima.ducc.user.dgen.DuccUimaReferenceByName;
-import org.apache.uima.ducc.user.dgen.IDuccUimaAggregateComponent;
-import org.apache.uima.ducc.user.dgen.IDuccUimaDeployableConfiguration;
+import org.apache.uima.ducc.user.dgen.IDuccGeneratorUimaAggregateComponent;
+import
org.apache.uima.ducc.user.dgen.IDuccGeneratorUimaDeployableConfiguration;
public class DeployableGeneration implements IDeployableGeneration {
public DeployableGeneration() {
}
- private void
conditionalAddComponent(ArrayList<IDuccUimaAggregateComponent> dgenComponents,
String descriptor, List<String> overrides) {
+ private void
conditionalAddComponent(ArrayList<IDuccGeneratorUimaAggregateComponent>
dgenComponents, String descriptor, List<String> overrides) {
if(descriptor != null) {
DuccUimaAggregateComponent dgenComponent = new
DuccUimaAggregateComponent(descriptor, overrides);
dgenComponents.add(dgenComponent);
@@ -108,11 +108,11 @@ public class DeployableGeneration implem
show("ccOverrides", ccOverrides);
String targetDirectory =
fabricateTargetDirectoryName(directory, id);
DeployableGenerator deployableGenerator = new
DeployableGenerator(targetDirectory);
- ArrayList<IDuccUimaAggregateComponent> dgenComponents =
new ArrayList<IDuccUimaAggregateComponent>();
+ ArrayList<IDuccGeneratorUimaAggregateComponent>
dgenComponents = new ArrayList<IDuccGeneratorUimaAggregateComponent>();
conditionalAddComponent(dgenComponents, cmDescriptor,
cmOverrides);
conditionalAddComponent(dgenComponents, aeDescriptor,
aeOverrides);
conditionalAddComponent(dgenComponents, ccDescriptor,
ccOverrides);
- IDuccUimaDeployableConfiguration configuration = new
DuccUimaAggregate(dgenName, dgenDescription, dgenThreadCount, dgenBrokerURL,
dgenEndpoint, dgenFlowController, dgenComponents);
+ IDuccGeneratorUimaDeployableConfiguration configuration
= new DuccUimaAggregate(dgenName, dgenDescription, dgenThreadCount,
dgenBrokerURL, dgenEndpoint, dgenFlowController, dgenComponents);
retVal = deployableGenerator.generate(configuration,
id);
}
catch(Exception e) {
@@ -148,7 +148,7 @@ public class DeployableGeneration implem
show("dgenReferenceByName", dgenReferenceByName);
String targetDirectory =
fabricateTargetDirectoryName(directory, id);
DeployableGenerator deployableGenerator = new
DeployableGenerator(targetDirectory);
- IDuccUimaDeployableConfiguration configuration = new
DuccUimaReferenceByName(dgenName, dgenDescription, dgenThreadCount,
dgenBrokerURL, dgenEndpoint, dgenFlowController, dgenReferenceByName);
+ IDuccGeneratorUimaDeployableConfiguration configuration
= new DuccUimaReferenceByName(dgenName, dgenDescription, dgenThreadCount,
dgenBrokerURL, dgenEndpoint, dgenFlowController, dgenReferenceByName);
retVal = deployableGenerator.generate(configuration,
id);
}
catch(Exception e) {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java?rev=1706267&r1=1706266&r2=1706267&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
Thu Oct 1 14:40:06 2015
@@ -38,8 +38,8 @@ import org.apache.uima.ducc.user.common.
import org.apache.uima.ducc.user.dgen.DeployableGenerator;
import org.apache.uima.ducc.user.dgen.DuccUimaAggregate;
import org.apache.uima.ducc.user.dgen.DuccUimaAggregateComponent;
-import org.apache.uima.ducc.user.dgen.IDuccUimaAggregateComponent;
-import org.apache.uima.ducc.user.dgen.IDuccUimaDeployableConfiguration;
+import org.apache.uima.ducc.user.dgen.IDuccGeneratorUimaAggregateComponent;
+import
org.apache.uima.ducc.user.dgen.IDuccGeneratorUimaDeployableConfiguration;
import org.apache.uima.ducc.user.dgen.iface.DeployableGeneration;
import org.apache.uima.ducc.user.jd.JdUserCollectionReader;
import org.apache.uima.ducc.user.jd.JdUserMetaCas;
@@ -371,21 +371,21 @@ public class TestSuite {
}
}
- private IDuccUimaDeployableConfiguration
getIDuccUimaDeployableConfiguration() {
+ private IDuccGeneratorUimaDeployableConfiguration
getIDuccUimaDeployableConfiguration() {
String aeName = "name";
String aeDescription = "description";
int aeThreadCount = 1;
String aeBrokerURL = "brokerURL";
String aeEndpoint = "endpoint";
String aeFlowController = "flowController";
- ArrayList<IDuccUimaAggregateComponent> aeComponents = new
ArrayList<IDuccUimaAggregateComponent>();
+ ArrayList<IDuccGeneratorUimaAggregateComponent> aeComponents =
new ArrayList<IDuccGeneratorUimaAggregateComponent>();
URL url = this.getClass().getResource("/CR100.xml");
File file = new File(url.getFile());
String aeDescriptor = file.getAbsolutePath();
List<String> aeOverrides = null;
DuccUimaAggregateComponent aeComponent = new
DuccUimaAggregateComponent(aeDescriptor, aeOverrides);
aeComponents.add(aeComponent);
- IDuccUimaDeployableConfiguration configuration = new
DuccUimaAggregate(aeName, aeDescription, aeThreadCount, aeBrokerURL,
aeEndpoint, aeFlowController, aeComponents);
+ IDuccGeneratorUimaDeployableConfiguration configuration = new
DuccUimaAggregate(aeName, aeDescription, aeThreadCount, aeBrokerURL,
aeEndpoint, aeFlowController, aeComponents);
return configuration;
}
@@ -416,7 +416,7 @@ public class TestSuite {
delete(working);
working.mkdir();
DeployableGenerator aeGenerator = new
DeployableGenerator(working.getAbsolutePath());
- IDuccUimaDeployableConfiguration configuration =
getIDuccUimaDeployableConfiguration();
+ IDuccGeneratorUimaDeployableConfiguration configuration
= getIDuccUimaDeployableConfiguration();
String jobId = "12345";
String ae = aeGenerator.generate(configuration, jobId);
debug(ae);
