You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2018/12/20 14:50:11 UTC
svn commit: r1849401 [2/2] - in /uima/uv3/uima-as-v3/trunk/uimaj-as-core: ./
src/main/java/org/apache/uima/aae/ src/main/java/org/apache/uima/aae/client/
src/main/java/org/apache/uima/aae/controller/
src/main/java/org/apache/uima/aae/delegate/ src/main...
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/PrimitiveServiceInfo.java
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/PrimitiveServiceInfo.java?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/PrimitiveServiceInfo.java (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/PrimitiveServiceInfo.java Thu Dec 20 14:50:11 2018
@@ -25,14 +25,10 @@ public class PrimitiveServiceInfo extend
// ServiceInfoMBean
// extends ServiceInfo implements PrimitiveServiceInfoMBean//, ServiceInfoMBean
{
- /**
- *
- */
+
private static final long serialVersionUID = -6416623322329673083L;
- /**
- *
- */
+
public PrimitiveServiceInfo(boolean isaCasMultiplier, AnalysisEngineController controller ) {
super(isaCasMultiplier, controller);
}
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServicePerformance.java
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServicePerformance.java?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServicePerformance.java (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/ServicePerformance.java Thu Dec 20 14:50:11 2018
@@ -154,7 +154,7 @@ public class ServicePerformance implemen
* delegate. Each reply message containing a CAS include the current actual analysis time This is
* not a delta, its the running analysis time.
*
- * @param anAnalysisTime
+ * @param anAnalysisTime analysis time
*/
public synchronized void setAnalysisTime(long anAnalysisTime) {
analysisTime = anAnalysisTime;
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java Thu Dec 20 14:50:11 2018
@@ -23,7 +23,7 @@ import org.apache.uima.aae.jmx.monitor.S
public interface JmxMonitorListener {
/**
* Provides metrics for all UIMA AS services collected during a checkpoint. This method is called
- * by the {@link org.apache.uima.aae.jmx.monitor.JmxMonitor} after each checkpoint with the latest metrics. The metrics are deltas
+ * by the { org.apache.uima.aae.jmx.monitor.JmxMonitor} after each checkpoint with the latest metrics. The metrics are deltas
* except for queue depth attribute.
*
* @param sampleTime
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/AsynchAEMessage.java Thu Dec 20 14:50:11 2018
@@ -20,6 +20,8 @@
package org.apache.uima.aae.message;
public interface AsynchAEMessage {
+ //public static final String TargetSelectorProperty ="TargetServiceId";
+
public static final String TotalTimeSpentInAnalytic = "TimeInAnalytic";
public static final String TimeInService = "TimeInService";
@@ -35,6 +37,8 @@ public interface AsynchAEMessage {
public static final String InputCasReference = "InputCasReference";
public static final String MessageFrom = "MessageFrom";
+
+ public static final String Destination = "Destination";
// 5/2013 xcas not used as a serialization form
// public static final String XCASREFId = "XCASRefId";
@@ -149,4 +153,6 @@ public interface AsynchAEMessage {
public static final String ErrorCause = "Cause";
public static final int PingTimeout = 5001;
+
+ public static final String TargetingSelector = "TargetingSelector";
}
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaEEShutdownTriggerEvent.java
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaEEShutdownTriggerEvent.java?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaEEShutdownTriggerEvent.java (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaEEShutdownTriggerEvent.java Thu Dec 20 14:50:11 2018
@@ -25,14 +25,12 @@ package org.apache.uima.aae.message;
import org.apache.uima.aae.controller.AnalysisEngineController;
import org.springframework.context.ApplicationEvent;
-/**
- *
- */
+
public class UimaEEShutdownTriggerEvent extends ApplicationEvent {
private AnalysisEngineController targetController = null;
/**
- * @param source
+ * @param source trigger source
*/
public UimaEEShutdownTriggerEvent(Object source) {
super(source);
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaMessageValidator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaMessageValidator.java?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaMessageValidator.java (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/message/UimaMessageValidator.java Thu Dec 20 14:50:11 2018
@@ -42,10 +42,10 @@ public class UimaMessageValidator {
*
* @param aMessage
* - jms message retrieved from queue
- * @param properties
- * - map containing message properties
- * @return
- * @throws Exception
+ * @param endpointName
+ * - endpoint name
+ * @return true if valid false otherwise
+ * @throws Exception error
*/
public static boolean validMessageType(UimaMessage aMessage, String endpointName)
@@ -104,10 +104,9 @@ public class UimaMessageValidator {
*
* @param aMessage
* - JMS Message received
- * @param properties
- * - Map containing header properties
+ * @param endpointName endpoint name
* @return - true if the command received is a valid one, false otherwise
- * @throws Exception
+ * @throws Exception error
*/
public static boolean validCommand(UimaMessage aMessage, String endpointName) throws Exception {
if (aMessage.containsProperty(AsynchAEMessage.Command)) {
@@ -141,10 +140,9 @@ public class UimaMessageValidator {
*
* @param aMessage
* - JMS Message received
- * @param properties
- * - Map containing header properties
+ * @param endpointName endpoint name
* @return - true if the payload is valid, false otherwise
- * @throws Exception
+ * @throws Exception error
*/
public static boolean validPayload(UimaMessage aMessage, String endpointName) throws Exception {
if (aMessage.containsProperty(AsynchAEMessage.Command)) {
@@ -216,8 +214,9 @@ public class UimaMessageValidator {
*
* @param aMessage
* - JMS Message to validate
+ * @param controller controller
* @return - true if message is valid, false otherwise
- * @throws Exception
+ * @throws Exception error
*/
public static boolean isValidMessage(UimaMessage aMessage, AnalysisEngineController controller)
throws Exception {
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/monitor/statistics/AnalysisEnginePerformanceMetrics.java
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/monitor/statistics/AnalysisEnginePerformanceMetrics.java?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/monitor/statistics/AnalysisEnginePerformanceMetrics.java (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/monitor/statistics/AnalysisEnginePerformanceMetrics.java Thu Dec 20 14:50:11 2018
@@ -36,6 +36,11 @@ public class AnalysisEnginePerformanceMe
/**
* Creates a performance metrics instance
*
+ * @param name AE name
+ * @param uimaContextPath AE unique name
+ * @param analysisTime analysis time
+ * @param numProcessed num CASes processed so far
+ *
*/
public AnalysisEnginePerformanceMetrics(String name, String uimaContextPath, long analysisTime, long numProcessed ) {
this.name = name;
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/DeploymentDescriptorFactory.java Thu Dec 20 14:50:11 2018
@@ -32,7 +32,6 @@ import org.apache.uima.resourceSpecifier
/**
* Factory class providing static API to generate UIMA AS Deployment Descriptor. Supports
* creation of both Primitive and Aggregate Deployment Descriptors.
- * <p>
*
*/
public final class DeploymentDescriptorFactory {
@@ -56,6 +55,17 @@ public final class DeploymentDescriptorF
public static UimaASDeploymentDescriptor createDeploymentDescriptor(String xmlDescriptor)
throws ResourceInitializationException {
try {
+ // secure the parser
+ org.apache.xmlbeans.XmlOptions options = new org.apache.xmlbeans.XmlOptions();
+ XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+ xmlReader.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ xmlReader.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ xmlReader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd",false);
+ xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl",true);
+ options.setLoadUseXMLReader(xmlReader);
+
+ AnalysisEngineDeploymentDescriptionDocument.Factory.parse(new File(descriptorPath), options);
+
return new UimaASDeploymentDescriptorImpl(AnalysisEngineDeploymentDescriptionDocument.Factory.parse(xmlDescriptor),new ServiceContextImpl("","","","") );
} catch( XmlException e ) {
throw new ResourceInitializationException(e);
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java Thu Dec 20 14:50:11 2018
@@ -48,7 +48,7 @@ public interface Import {
/**
* Sets the location.
*
- * @param name
+ * @param name set the name
*/
public void setByName(String name);
Modified: uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties
URL: http://svn.apache.org/viewvc/uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties?rev=1849401&r1=1849400&r2=1849401&view=diff
==============================================================================
--- uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties (original)
+++ uima/uv3/uima-as-v3/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties Thu Dec 20 14:50:11 2018
@@ -268,4 +268,5 @@ UIMAEE_warmup_dropping_cas__FINE = Aggre
UIMAEE_warmup_start_cas__FINE = Aggregate Warmup Stage - Processing CAS id:{0}
UIMAEE_delivery_to_client_failed_INFO = Service:{0} Unable to Deliver CAS:{1} to Client - Dropping CAS
UIMAEE_unable_to_deliver_msg__INFO=Service:{0} JMS unable to Deliver CAS:{1} - Error:{2}
-UIMAEE_force_cas_abort__INFO="Service:{0} Forcing {1} CAS:{1} to Abort
\ No newline at end of file
+UIMAEE_force_cas_abort__INFO="Service:{0} Forcing {1} CAS:{1} to Abort
+UIMAEE_service_delivery_exception_WARNING=Service:{0} Handling Exception:{1}
\ No newline at end of file