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:26 UTC
svn commit: r1646268 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src:
main/java/org/apache/uima/ducc/container/dd/
main/java/org/apache/uima/ducc/container/dd/classload/
main/java/org/apache/uima/ducc/container/dgen/ main/java/org/apache/uim...
Author: degenaro
Date: Wed Dec 17 14:43:25 2014
New Revision: 1646268
URL: http://svn.apache.org/r1646268
Log: (empty)
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenException.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdException.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java
- copied, changed from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/
- copied from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/classload/
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeException.java (with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeGenerate.java (with props)
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdException.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/classload/
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyDDException.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyDDGenerate.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenException.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdException.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenException.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenException.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdException.java&r1=1645722&r2=1646268&rev=1646268&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdException.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenException.java Wed Dec 17 14:43:25 2014
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.container.dd;
+package org.apache.uima.ducc.container.dgen;
-public class DdException extends Exception {
+public class DgenException extends Exception {
private static final long serialVersionUID = 1L;
- public DdException(String text) {
+ public DgenException(String text) {
super(text);
}
- public DdException(Exception e) {
+ public DgenException(Exception e) {
super(e);
}
}
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java (from r1645722, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdManager.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdManager.java&r1=1645722&r2=1646268&rev=1646268&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dd/DdManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/DgenManager.java Wed Dec 17 14:43:25 2014
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/package org.apache.uima.ducc.container.dd;
+*/package org.apache.uima.ducc.container.dgen;
import java.util.List;
@@ -24,22 +24,22 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.common.logger.IComponent;
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
-import org.apache.uima.ducc.container.dd.classload.ProxyDDException;
-import org.apache.uima.ducc.container.dd.classload.ProxyDDGenerate;
+import org.apache.uima.ducc.container.dgen.classload.ProxyAeException;
+import org.apache.uima.ducc.container.dgen.classload.ProxyAeGenerate;
-public class DdManager {
+public class DgenManager {
- private static Logger logger = Logger.getLogger(DdManager.class, IComponent.Id.JD.name());
+ private static Logger logger = Logger.getLogger(DgenManager.class, IComponent.Id.JD.name());
- private String dd = null;
+ private String dgen = null;
- private ProxyDDGenerate pddg = null;
+ private ProxyAeGenerate proxy = null;
- public DdManager() throws DdException {
+ public DgenManager() throws DgenException {
initialize();
}
- private void initialize() throws DdException {
+ private void initialize() throws DgenException {
FlagsExtendedHelper feh = FlagsExtendedHelper.getInstance();
initialize(
feh.getJobDirectory(),
@@ -61,35 +61,35 @@ public class DdManager {
public void initialize(
String jobDirectory,
String jobId,
- String ddName,
- String ddDescription,
- Integer ddThreadCount,
- String ddBrokerURL,
- String ddBrokerEndpoint,
+ String dgenName,
+ String dgenDescription,
+ Integer dgenThreadCount,
+ String dgenBrokerURL,
+ String dgenBrokerEndpoint,
String aeDescriptor,
List<String> aeOverrides,
String ccDescriptor,
List<String> ccOverrides,
String cmDescriptor,
List<String> cmOverrides,
- String dd) throws DdException {
+ String dgen) throws DgenException {
String location = "initialize";
try {
- if(dd == null) {
- pddg = new ProxyDDGenerate();
- String value = pddg.generate(jobDirectory, jobId, ddName, ddDescription, ddThreadCount, ddBrokerURL, ddBrokerEndpoint, cmDescriptor, cmOverrides, aeDescriptor, aeOverrides, ccDescriptor, ccOverrides);
- setDD(value);
- logger.info(location, null, "generated dd: "+value);
+ if(dgen == null) {
+ proxy = new ProxyAeGenerate();
+ String value = proxy.generate(jobDirectory, jobId, dgenName, dgenDescription, dgenThreadCount, dgenBrokerURL, dgenBrokerEndpoint, cmDescriptor, cmOverrides, aeDescriptor, aeOverrides, ccDescriptor, ccOverrides);
+ setAe(value);
+ logger.info(location, null, "generated dgen: "+value);
}
else {
- setDD(dd);
- logger.info(location, null, "specified dd: "+dd);
+ setAe(dgen);
+ logger.info(location, null, "specified dgen: "+dgen);
}
}
- catch(ProxyDDException e) {
+ catch(ProxyAeException e) {
logger.error(location, ILogger.null_id, e);
- throw new DdException(e);
+ throw new DgenException(e);
}
}
@@ -112,11 +112,11 @@ public class DdManager {
return retVal;
}
- public String getDD() {
- return dd;
+ public String getAe() {
+ return dgen;
}
- private void setDD(String value) {
- dd = value;
+ private void setAe(String value) {
+ dgen = value;
}
}
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeException.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeException.java?rev=1646268&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeException.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeException.java Wed Dec 17 14:43:25 2014
@@ -0,0 +1,32 @@
+/*
+ * 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.container.dgen.classload;
+
+public class ProxyAeException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
+ public ProxyAeException(String text) {
+ super(text);
+ }
+
+ public ProxyAeException(Exception e) {
+ super(e);
+ }
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeException.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeGenerate.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeGenerate.java?rev=1646268&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeGenerate.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeGenerate.java Wed Dec 17 14:43:25 2014
@@ -0,0 +1,201 @@
+/*
+ * 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.container.dgen.classload;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.List;
+
+import org.apache.uima.ducc.common.utils.DuccLogger;
+import org.apache.uima.ducc.container.common.FlagsExtendedHelper;
+import org.apache.uima.ducc.container.common.MessageBuffer;
+import org.apache.uima.ducc.container.common.Standardize;
+import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
+
+public class ProxyAeGenerate {
+
+ private static Logger logger = Logger.getLogger(ProxyAeGenerate.class, IComponent.Id.JD.name());
+
+ private URLClassLoader urlClassLoader = null;
+
+ private String[] requiredClasses = {
+ "org.apache.uima.ducc.user.dgen.iface.AeException",
+ "org.apache.uima.ducc.user.dgen.iface.AeGenerate",
+ "org.apache.uima.ducc.user.dgen.iface.IAeGenerate",
+ // implied:
+ //"org.springframework.util.Assert",
+ //"org.apache.xmlbeans.XmlBeans",
+ };
+
+ public ProxyAeGenerate() throws ProxyAeException {
+ initialize();
+ }
+
+ private void show(String text) {
+ String location = "show";
+ logger.info(location, ILogger.null_id, text);
+ System.out.println(text);
+ }
+
+ private void show(String name, String value) {
+ show(name+"="+value);
+ }
+
+ private void show(String name, Integer value) {
+ show(name+"="+value.toString());
+ }
+
+ private void show(String name, List<String> value) {
+ if(value == null) {
+ show(name+"="+value);
+ }
+ else {
+ show(name+"="+value.toString());
+ }
+ }
+
+ public String generate(
+ String directory,
+ String id,
+ 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 ProxyAeException
+ {
+ String retVal = null;
+ try {
+ show("directory", directory);
+ show("id", id);
+ show("dgenName", dgenName);
+ show("dgenDescription", dgenDescription);
+ show("dgenThreadCount", dgenThreadCount);
+ show("dgenBrokerURL", dgenBrokerURL);
+ show("dgenEndpoint", dgenEndpoint);
+ show("cmDescriptor", cmDescriptor);
+ show("cmOverrides", cmOverrides);
+ show("aeDescriptor", aeDescriptor);
+ show("aeOverrides", aeOverrides);
+ show("ccDescriptor", ccDescriptor);
+ show("ccOverrides", ccOverrides);
+ Class<?> clazz = urlClassLoader.loadClass("org.apache.uima.ducc.user.dgen.iface.AeGenerate");
+ Constructor<?> constructor = clazz.getConstructor();
+ Object instance = constructor.newInstance();
+ Class<?>[] parameterTypes = {
+ String.class, // directory
+ String.class, // id
+ String.class, // dgenName
+ String.class, // dgenDescription
+ Integer.class, // dgenThreadCount
+ String.class, // dgenBrokerURL
+ String.class, // dgenEndpoint
+ String.class, // cmDescriptor
+ List.class, // cmOverrides
+ String.class, // aeDescriptor
+ List.class, // aeOverrides
+ String.class, // ccDescriptor
+ List.class, // ccOverrides
+ };
+ Method method = clazz.getMethod("generate", parameterTypes);
+ Object[] args = {
+ directory,
+ id,
+ dgenName,
+ dgenDescription,
+ dgenThreadCount,
+ dgenBrokerURL,
+ dgenEndpoint,
+ cmDescriptor,
+ cmOverrides,
+ aeDescriptor,
+ aeOverrides,
+ ccDescriptor,
+ ccOverrides
+ };
+ String dgen = (String) method.invoke(instance, args);
+ show("generated deployment descriptor", dgen);
+ retVal = dgen;
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ throw new ProxyAeException(e.toString());
+ }
+ return retVal;
+ }
+
+ private void initialize() throws ProxyAeException {
+ FlagsExtendedHelper feh = FlagsExtendedHelper.getInstance();
+ String userClasspath = feh.getUserClasspath();
+ urlClassLoader = createClassLoader(userClasspath);
+ validate();
+ }
+
+ private URLClassLoader createClassLoader(String userClasspath) {
+ String location = "createClassLoader";
+ URLClassLoader retVal = null;
+ try {
+ retVal = PrivateClassLoader.create(userClasspath);
+ }
+ catch(Exception e) {
+ logger.error(location, ILogger.null_id, e);
+ }
+ return retVal;
+ }
+
+ private void validate() throws ProxyAeException {
+ for(String className : requiredClasses) {
+ loadClass(className);
+ }
+ }
+
+ private void loadClass(String className) throws ProxyAeException {
+ String location = "loadClass";
+ try {
+ MessageBuffer mb1 = new MessageBuffer();
+ mb1.append(Standardize.Label.loading.get()+className);
+ logger.debug(location, ILogger.null_id, mb1.toString());
+ URL[] urls = urlClassLoader.getURLs();
+ for(URL url : urls) {
+ logger.trace(location, ILogger.null_id, url);
+ }
+ Class<?> loadedClass = urlClassLoader.loadClass(className);
+ MessageBuffer mb2 = new MessageBuffer();
+ mb2.append(Standardize.Label.loaded.get()+loadedClass.getName());
+ logger.trace(location, ILogger.null_id, mb2.toString());
+ }
+ catch (Exception e) {
+ DuccLogger duccLogger = DuccLogger.getLogger(ProxyAeGenerate.class, "JD");
+ duccLogger.error(location, null, e);
+ logger.error(location, ILogger.null_id, e);
+ throw new ProxyAeException(e);
+ }
+ }
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeGenerate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/dgen/classload/ProxyAeGenerate.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java?rev=1646268&r1=1646267&r2=1646268&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java Wed Dec 17 14:43:25 2014
@@ -28,7 +28,7 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.common.logger.IComponent;
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
-import org.apache.uima.ducc.container.dd.DdManager;
+import org.apache.uima.ducc.container.dgen.DgenManager;
import org.apache.uima.ducc.container.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverErrorHandler;
import org.apache.uima.ducc.container.jd.mh.IMessageHandler;
@@ -71,7 +71,7 @@ public class JobDriver {
private CasManager cm = null;
private ProxyJobDriverErrorHandler pjdeh = null;
private IMessageHandler mh = null; // new MessageHandler();
- private DdManager ddManager = null;
+ private DgenManager ddManager = null;
private IWorkItemStateKeeper wisk = null;
@@ -93,7 +93,7 @@ public class JobDriver {
wisk = new WorkItemStateKeeper(IComponent.Id.JD.name(), feh.getLogDirectory());
cm = new CasManager();
pjdeh = new ProxyJobDriverErrorHandler();
- ddManager = new DdManager();
+ ddManager = new DgenManager();
mh = new MessageHandler();
}
catch(Exception e) {
@@ -130,7 +130,7 @@ public class JobDriver {
return mh;
}
- public DdManager getDdManager() {
+ public DgenManager getDdManager() {
return ddManager;
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java?rev=1646268&r1=1646267&r2=1646268&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java Wed Dec 17 14:43:25 2014
@@ -31,7 +31,7 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.common.logger.id.Id;
import org.apache.uima.ducc.container.common.logger.id.Transform;
-import org.apache.uima.ducc.container.dd.DdManager;
+import org.apache.uima.ducc.container.dgen.DgenManager;
import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.JobDriverHelper;
import org.apache.uima.ducc.container.jd.cas.CasManager;
@@ -84,9 +84,9 @@ public class MessageHandler implements I
CasManagerStats cms = cm.getCasManagerStats();
IWorkItemStatistics wis = jd.getWorkItemStatistics();
IRunningWorkItemStatistics rwis = RunningWorkItemStatistics.getCurrent();
- DdManager ddManager = jd.getDdManager();
+ DgenManager dgenManager = jd.getDdManager();
oi.setJobId(jd.getJobId());
- oi.setJpDd(ddManager.getDD());
+ oi.setJpAe(dgenManager.getAe());
oi.setWorkItemCrTotal(cms.getCrTotal());
oi.setWorkItemCrFetches(cms.getCrGets());
oi.setWorkItemJpGets(gets.get());
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java?rev=1646268&r1=1646267&r2=1646268&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java Wed Dec 17 14:43:25 2014
@@ -26,8 +26,8 @@ public interface IOperatingInfo extends
public void setJobId(String value);
public String getJobId();
- public void setJpDd(String value);
- public String getJpDd();
+ public void setJpAe(String value);
+ public String getJpAe();
public void setWorkItemCrTotal(int value);
public int getWorkItemCrTotal();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java?rev=1646268&r1=1646267&r2=1646268&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java Wed Dec 17 14:43:25 2014
@@ -30,7 +30,7 @@ public class OperatingInfo implements IO
private String jobId = null;
- private String jpDd = null;
+ private String jpAe = null;
private int crTotal = 0;
private int crFetches = 0;
@@ -299,13 +299,13 @@ public class OperatingInfo implements IO
}
@Override
- public void setJpDd(String value) {
- jpDd = value;
+ public void setJpAe(String value) {
+ jpAe = value;
}
@Override
- public String getJpDd() {
- return jpDd;
+ public String getJpAe() {
+ return jpAe;
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java?rev=1646268&r1=1646267&r2=1646268&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java Wed Dec 17 14:43:25 2014
@@ -31,7 +31,7 @@ import java.util.List;
import org.apache.uima.ducc.common.container.FlagsHelper;
import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
-import org.apache.uima.ducc.container.dd.classload.ProxyDDGenerate;
+import org.apache.uima.ducc.container.dgen.classload.ProxyAeGenerate;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverCollectionReader;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverDirective;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverErrorHandler;
@@ -137,7 +137,7 @@ public class TestClassLoading extends AT
try {
String userClasspath = Utilities.getInstance().getUserCP();
System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
- ProxyDDGenerate pddGenerate = new ProxyDDGenerate();
+ ProxyAeGenerate proxy = new ProxyAeGenerate();
//
URL url = this.getClass().getResource("/");
File root = new File(url.getFile());
@@ -151,11 +151,11 @@ public class TestClassLoading extends AT
//
String directory = working.getAbsolutePath();
String id = "12345";
- String ddName = "name";
- String ddDescription = "description";
- Integer ddThreadCount = new Integer(1);
- String ddBrokerURL = "brokerURL";
- String ddEndpoint = "endpoint";
+ String dgenName = "name";
+ String dgenDescription = "description";
+ Integer dgenThreadCount = new Integer(1);
+ String dgenBrokerURL = "brokerURL";
+ String dgenEndpoint = "endpoint";
String cmDescriptor = null;
List<String> cmOverrides = null;
//String aeDescriptor = "org.apache.uima.ducc.test.randomsleep.FixedSleepAE";
@@ -163,14 +163,14 @@ public class TestClassLoading extends AT
List<String> aeOverrides = null;
String ccDescriptor = null;
List<String> ccOverrides = null;
- String dd = pddGenerate.generate(
+ String dgen = proxy.generate(
directory,
id,
- ddName,
- ddDescription,
- ddThreadCount,
- ddBrokerURL,
- ddEndpoint,
+ dgenName,
+ dgenDescription,
+ dgenThreadCount,
+ dgenBrokerURL,
+ dgenEndpoint,
cmDescriptor,
cmOverrides,
aeDescriptor,
@@ -178,7 +178,7 @@ public class TestClassLoading extends AT
ccDescriptor,
ccOverrides
);
- debug(dd);
+ debug(dgen);
//
delete(working);
}