You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/12/17 15:43:02 UTC
svn commit: r1646267 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-user/src:
main/java/org/apache/uima/ducc/user/dd/
main/java/org/apache/uima/ducc/user/dd/iface/
main/java/org/apache/uima/ducc/user/dgen/
main/java/org/apache/uima/ducc/user/dgen/iface/ ...
Author: degenaro
Date: Wed Dec 17 14:43:01 2014
New Revision: 1646267
URL: http://svn.apache.org/r1646267
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath
Jp Ae from pieces-parts
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/AeGenerator.java (with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DuccUimaAggregate.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DuccUimaAggregateComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaAggregate.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaAggregateComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaDeployableConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IIdentity.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IIdentity.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/InvalidOverrideParameterException.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/InvalidOverrideParameterException.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/UimaUtils.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/UimaUtils.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/Utils.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/Utils.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/
- copied from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/AeException.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/DDException.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/AeGenerate.java
- copied, changed from r1646051, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/DDGenerate.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/IAeGenerate.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/IDDGenerate.java
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DeploymentDescriptorGenerator.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DuccUimaAggregate.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DuccUimaAggregateComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DuccUimaDeploymentDescriptor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaAggregate.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaAggregateComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaDeployableConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaDeploymentDescriptor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IIdentity.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/InvalidOverrideParameterException.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/UimaUtils.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/Utils.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/XStreamUtils.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/DDException.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/DDGenerate.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/IDDGenerate.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/AeGenerator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/AeGenerator.java?rev=1646267&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/AeGenerator.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/AeGenerator.java Wed Dec 17 14:43:01 2014
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.user.dgen;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.uima.analysis_engine.AnalysisEngineDescription;
+
+public class AeGenerator {
+
+ private String userLogDir = null;
+
+ public AeGenerator(String userLogDir) {
+ setUserLogDir(userLogDir);
+ }
+
+ public String generate(IDuccUimaDeployableConfiguration configuration, String jobId) throws Exception {
+ IDuccUimaAggregate aggregateConfiguration = (IDuccUimaAggregate) configuration;
+ return generateAe(aggregateConfiguration, jobId);
+ }
+
+ private String generateAe(IDuccUimaAggregate aggregateConfiguration, String jobId ) throws Exception {
+ List<String> descriptorPaths = new ArrayList<String>();
+ List<List<String>> overrides = new ArrayList<List<String>>();
+ for( IDuccUimaAggregateComponent component: aggregateConfiguration.getComponents()) {
+ descriptorPaths.add(component.getDescriptor());
+ overrides.add(component.getOverrides());
+ }
+ String aed = createAED(
+ aggregateConfiguration.getName(),
+ aggregateConfiguration.getDescription(),
+ aggregateConfiguration.getBrokerURL(),
+ aggregateConfiguration.getEndpoint(),
+ aggregateConfiguration.getThreadCount(),
+ userLogDir,
+ jobId+"-uima-ae-descriptor-"+Utils.getPID()+".xml",
+ overrides,
+ descriptorPaths.toArray(new String[descriptorPaths.size()])
+ );
+ return aed;
+ }
+
+ private static String createAED (
+ String name,
+ String description,
+ String brokerURL,
+ String endpoint,
+ int scaleup,
+ String directory,
+ String fname,
+ List<List<String>> overrides,
+ String... aeDescriptors) throws Exception {
+
+ AnalysisEngineDescription aed = UimaUtils.createAggregateDescription((scaleup > 1),overrides, aeDescriptors);
+ aed.getMetaData().setName(name);
+ File file = null;
+ File dir = new File(directory);
+ if (!dir.exists()) {
+ dir.mkdir();
+ }
+ FileOutputStream fos = null;
+ try {
+ file = new File(dir, fname);//+"-uima-ae-descriptor-"+Utils.getPID()+".xml");
+ fos = new FileOutputStream(file);
+ aed.toXML(fos);
+
+ }
+ catch(Exception e) {
+ throw e;
+ }
+ finally {
+ if( fos != null ) {
+ fos.close();
+ }
+ }
+ return file.getAbsolutePath();
+ }
+
+ private void setUserLogDir(String value) {
+ userLogDir = value;
+ }
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/AeGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/AeGenerator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/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?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DuccUimaAggregate.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DuccUimaAggregate.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregate.java Wed Dec 17 14:43:01 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd;
+package org.apache.uima.ducc.user.dgen;
import java.util.ArrayList;
import java.util.List;
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/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?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DuccUimaAggregateComponent.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/DuccUimaAggregateComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/DuccUimaAggregateComponent.java Wed Dec 17 14:43:01 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd;
+package org.apache.uima.ducc.user.dgen;
import java.util.List;
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/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/IDuccUimaAggregate.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaAggregate.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaAggregate.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregate.java Wed Dec 17 14:43:01 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd;
+package org.apache.uima.ducc.user.dgen;
import java.util.List;
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/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/IDuccUimaAggregateComponent.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaAggregateComponent.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaAggregateComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaAggregateComponent.java Wed Dec 17 14:43:01 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd;
+package org.apache.uima.ducc.user.dgen;
import java.io.Serializable;
import java.util.List;
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/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/IDuccUimaDeployableConfiguration.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaDeployableConfiguration.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IDuccUimaDeployableConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IDuccUimaDeployableConfiguration.java Wed Dec 17 14:43:01 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd;
+package org.apache.uima.ducc.user.dgen;
import java.io.Serializable;
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IIdentity.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IIdentity.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IIdentity.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IIdentity.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IIdentity.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/IIdentity.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/IIdentity.java Wed Dec 17 14:43:01 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd;
+package org.apache.uima.ducc.user.dgen;
import java.io.Serializable;
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/InvalidOverrideParameterException.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/InvalidOverrideParameterException.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/InvalidOverrideParameterException.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/InvalidOverrideParameterException.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/InvalidOverrideParameterException.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/InvalidOverrideParameterException.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/InvalidOverrideParameterException.java Wed Dec 17 14:43:01 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd;
+package org.apache.uima.ducc.user.dgen;
public class InvalidOverrideParameterException extends Exception {
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/UimaUtils.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/UimaUtils.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/UimaUtils.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/UimaUtils.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/UimaUtils.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/UimaUtils.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/UimaUtils.java Wed Dec 17 14:43:01 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd;
+package org.apache.uima.ducc.user.dgen;
import java.io.File;
import java.io.FileOutputStream;
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/Utils.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/Utils.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/Utils.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/Utils.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/Utils.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/Utils.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/Utils.java Wed Dec 17 14:43:01 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd;
+package org.apache.uima.ducc.user.dgen;
import java.io.BufferedReader;
import java.io.DataInputStream;
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/AeException.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/DDException.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/AeException.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/AeException.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/DDException.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/DDException.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/AeException.java Wed Dec 17 14:43:01 2014
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd.iface;
+package org.apache.uima.ducc.user.dgen.iface;
-public class DDException extends Exception {
+public class AeException extends Exception {
private static final long serialVersionUID = 1L;
- public DDException(String message) {
+ public AeException(String message) {
super(message);
}
}
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/AeGenerate.java (from r1646051, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/DDGenerate.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/AeGenerate.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/AeGenerate.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/DDGenerate.java&r1=1646051&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/DDGenerate.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/AeGenerate.java Wed Dec 17 14:43:01 2014
@@ -16,27 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd.iface;
+package org.apache.uima.ducc.user.dgen.iface;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.ducc.user.dd.DeploymentDescriptorGenerator;
-import org.apache.uima.ducc.user.dd.DuccUimaAggregate;
-import org.apache.uima.ducc.user.dd.DuccUimaAggregateComponent;
-import org.apache.uima.ducc.user.dd.IDuccUimaAggregateComponent;
-import org.apache.uima.ducc.user.dd.IDuccUimaDeployableConfiguration;
+import org.apache.uima.ducc.user.dgen.AeGenerator;
+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;
-public class DDGenerate implements IDDGenerate {
+public class AeGenerate implements IAeGenerate {
- public DDGenerate() {
+ public AeGenerate() {
}
- private void conditionalAddComponent(ArrayList<IDuccUimaAggregateComponent> ddComponents, String descriptor, List<String> overrides) {
+ private void conditionalAddComponent(ArrayList<IDuccUimaAggregateComponent> dgenComponents, String descriptor, List<String> overrides) {
if(descriptor != null) {
- DuccUimaAggregateComponent ddComponent = new DuccUimaAggregateComponent(descriptor, overrides);
- ddComponents.add(ddComponent);
+ DuccUimaAggregateComponent dgenComponent = new DuccUimaAggregateComponent(descriptor, overrides);
+ dgenComponents.add(dgenComponent);
}
}
@@ -75,28 +75,28 @@ public class DDGenerate implements IDDGe
public String generate(
String directory,
String id,
- String ddName,
- String ddDescription,
- Integer ddThreadCount,
- String ddBrokerURL,
- String ddEndpoint,
+ String dgenName,
+ String dgenDescription,
+ Integer dgenThreadCount,
+ String dgenBrokerURL,
+ String dgenEndpoint,
String cmDescriptor,
List<String> cmOverrides,
String aeDescriptor,
List<String> aeOverrides,
String ccDescriptor,
List<String> ccOverrides
- ) throws DDException
+ ) throws AeException
{
String retVal = null;
try {
show("directory", directory);
show("id", id);
- show("ddName", ddName);
- show("ddDescription", ddDescription);
- show("ddThreadCount", ddThreadCount.toString());
- show("ddBrokerURL", ddBrokerURL);
- show("ddEndpoint", ddEndpoint);
+ show("dgenName", dgenName);
+ show("dgenDescription", dgenDescription);
+ show("dgenThreadCount", dgenThreadCount.toString());
+ show("dgenBrokerURL", dgenBrokerURL);
+ show("dgenEndpoint", dgenEndpoint);
show("cmDescriptor", cmDescriptor);
show("cmOverrides", cmOverrides);
show("aeDescriptor", aeDescriptor);
@@ -104,17 +104,17 @@ public class DDGenerate implements IDDGe
show("ccDescriptor", ccDescriptor);
show("ccOverrides", ccOverrides);
String targetDirectory = fabricateTargetDirectoryName(directory, id);
- DeploymentDescriptorGenerator ddg = new DeploymentDescriptorGenerator(targetDirectory);
- ArrayList<IDuccUimaAggregateComponent> ddComponents = new ArrayList<IDuccUimaAggregateComponent>();
- conditionalAddComponent(ddComponents, cmDescriptor, cmOverrides);
- conditionalAddComponent(ddComponents, aeDescriptor, aeOverrides);
- conditionalAddComponent(ddComponents, ccDescriptor, ccOverrides);
- IDuccUimaDeployableConfiguration configuration = new DuccUimaAggregate(ddName, ddDescription, ddThreadCount, ddBrokerURL, ddEndpoint, ddComponents);
- retVal = ddg.generate(configuration, id);
+ AeGenerator aeGenerator = new AeGenerator(targetDirectory);
+ ArrayList<IDuccUimaAggregateComponent> dgenComponents = new ArrayList<IDuccUimaAggregateComponent>();
+ conditionalAddComponent(dgenComponents, cmDescriptor, cmOverrides);
+ conditionalAddComponent(dgenComponents, aeDescriptor, aeOverrides);
+ conditionalAddComponent(dgenComponents, ccDescriptor, ccOverrides);
+ IDuccUimaDeployableConfiguration configuration = new DuccUimaAggregate(dgenName, dgenDescription, dgenThreadCount, dgenBrokerURL, dgenEndpoint, dgenComponents);
+ retVal = aeGenerator.generate(configuration, id);
}
catch(Exception e) {
e.printStackTrace();
- throw new DDException(e.toString());
+ throw new AeException(e.toString());
}
return retVal;
}
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/IAeGenerate.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/IDDGenerate.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/IAeGenerate.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/IAeGenerate.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/IDDGenerate.java&r1=1645722&r2=1646267&rev=1646267&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dd/iface/IDDGenerate.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/dgen/iface/IAeGenerate.java Wed Dec 17 14:43:01 2014
@@ -16,25 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.dd.iface;
+package org.apache.uima.ducc.user.dgen.iface;
import java.util.List;
-public interface IDDGenerate {
+public interface IAeGenerate {
public String generate(
String directory,
String id,
- String ddName,
- String ddDescription,
- Integer ddThreadCount,
- String ddBrokerURL,
- String ddEndpoint,
+ String dgenName,
+ String dgenDescription,
+ Integer dgenThreadCount,
+ String dgenBrokerURL,
+ String dgenEndpoint,
String cm,
List<String> cmOverrides,
String ae,
List<String> aeOverrides,
String cc,
List<String> ccOverrides
- ) throws DDException;
+ ) throws AeException;
}
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=1646267&r1=1646266&r2=1646267&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 Wed Dec 17 14:43:01 2014
@@ -28,12 +28,12 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import org.apache.uima.ducc.user.dd.DeploymentDescriptorGenerator;
-import org.apache.uima.ducc.user.dd.DuccUimaAggregate;
-import org.apache.uima.ducc.user.dd.DuccUimaAggregateComponent;
-import org.apache.uima.ducc.user.dd.IDuccUimaAggregateComponent;
-import org.apache.uima.ducc.user.dd.IDuccUimaDeployableConfiguration;
-import org.apache.uima.ducc.user.dd.iface.DDGenerate;
+import org.apache.uima.ducc.user.dgen.AeGenerator;
+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.iface.AeGenerate;
import org.apache.uima.ducc.user.jd.JdUserCollectionReader;
import org.apache.uima.ducc.user.jd.JdUserException;
import org.apache.uima.ducc.user.jd.JdUserMetaCas;
@@ -349,19 +349,19 @@ public class TestSuite {
}
private IDuccUimaDeployableConfiguration getIDuccUimaDeployableConfiguration() {
- String ddName = "name";
- String ddDescription = "description";
- int ddThreadCount = 1;
- String ddBrokerURL = "brokerURL";
- String ddEndpoint = "endpoint";
- ArrayList<IDuccUimaAggregateComponent> ddComponents = new ArrayList<IDuccUimaAggregateComponent>();
+ String aeName = "name";
+ String aeDescription = "description";
+ int aeThreadCount = 1;
+ String aeBrokerURL = "brokerURL";
+ String aeEndpoint = "endpoint";
+ ArrayList<IDuccUimaAggregateComponent> aeComponents = new ArrayList<IDuccUimaAggregateComponent>();
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);
- ddComponents.add(aeComponent);
- IDuccUimaDeployableConfiguration configuration = new DuccUimaAggregate(ddName, ddDescription, ddThreadCount, ddBrokerURL, ddEndpoint, ddComponents);
+ aeComponents.add(aeComponent);
+ IDuccUimaDeployableConfiguration configuration = new DuccUimaAggregate(aeName, aeDescription, aeThreadCount, aeBrokerURL, aeEndpoint, aeComponents);
return configuration;
}
@@ -391,12 +391,12 @@ public class TestSuite {
File working = new File(nameWorking);
delete(working);
working.mkdir();
- DeploymentDescriptorGenerator ddg = new DeploymentDescriptorGenerator(working.getAbsolutePath());
+ AeGenerator aeGenerator = new AeGenerator(working.getAbsolutePath());
IDuccUimaDeployableConfiguration configuration = getIDuccUimaDeployableConfiguration();
String jobId = "12345";
- String dd = ddg.generate(configuration, jobId);
- debug(dd);
- show(dd);
+ String ae = aeGenerator.generate(configuration, jobId);
+ debug(ae);
+ show(ae);
delete(working);
}
catch(Exception e) {
@@ -417,15 +417,15 @@ public class TestSuite {
File working = new File(nameWorking);
delete(working);
working.mkdir();
- DDGenerate ddGenerate = new DDGenerate();
+ AeGenerate aeGenerate = new AeGenerate();
String directory = working.getAbsolutePath();
String id = "99999";
- String ddName = "ddName";
- String ddDescription = "ddDescription";
- Integer ddThreadCount = new Integer(11);
- String ddBrokerURL = "ddBrokerURL";
- String ddBrokerEndpoint = "ddBrokerEndpount";
+ String aeName = "aeName";
+ String aeDescription = "aeDescription";
+ Integer aeThreadCount = new Integer(11);
+ String aeBrokerURL = "aeBrokerURL";
+ String aeBrokerEndpoint = "aeBrokerEndpount";
String cmDescriptor = null;
List<String> cmOverrides = null;
String aeDescriptor = root+File.separator+"FixedSleepAE.xml";
@@ -433,13 +433,13 @@ public class TestSuite {
String ccDescriptor = null;
List<String> ccOverrides = null;
- String dd = ddGenerate.generate(
+ String ae = aeGenerate.generate(
directory,
- id, ddName,
- ddDescription,
- ddThreadCount,
- ddBrokerURL,
- ddBrokerEndpoint,
+ id, aeName,
+ aeDescription,
+ aeThreadCount,
+ aeBrokerURL,
+ aeBrokerEndpoint,
cmDescriptor,
cmOverrides,
aeDescriptor,
@@ -447,8 +447,8 @@ public class TestSuite {
ccDescriptor,
ccOverrides);
- debug(dd);
- show(dd);
+ debug(ae);
+ show(ae);
delete(working);
}
catch(Exception e) {