Author: cwiklik
Date: Wed Sep 21 18:01:19 2011
New Revision: 1173774
URL: http://svn.apache.org/viewvc?rev=1173774&view=rev
Log:
UIMA-2228 Expose CAS instance to onBeforeMessageSend() and onBeforeProcessCAS() callbacks
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatus.java
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatusImpl.java
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatus.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatus.java?rev=1173774&r1=1173773&r2=1173774&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatus.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatus.java Wed Sep 21 18:01:19 2011
@@ -18,6 +18,7 @@
*/
package org.apache.uima.aae.client;
+import org.apache.uima.cas.CAS;
import org.apache.uima.collection.EntityProcessStatus;
public interface UimaASProcessStatus extends EntityProcessStatus {
@@ -25,4 +26,6 @@ public interface UimaASProcessStatus ext
public String getCasReferenceId();
public String getParentCasReferenceId();
+
+ public CAS getCAS();
}
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatusImpl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatusImpl.java?rev=1173774&r1=1173773&r2=1173774&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatusImpl.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatusImpl.java Wed Sep 21 18:01:19 2011
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.uima.cas.CAS;
import org.apache.uima.util.ProcessTrace;
public class UimaASProcessStatusImpl implements UimaASProcessStatus {
@@ -50,19 +51,22 @@ public class UimaASProcessStatusImpl imp
private String parentCasId;
+ private CAS cas;
+
public UimaASProcessStatusImpl(ProcessTrace p) {
- this(p, null);
+ this(p, null, null);
}
- public UimaASProcessStatusImpl(ProcessTrace p, String aCasReferenceId) {
- this(p, aCasReferenceId, null);
+ public UimaASProcessStatusImpl(ProcessTrace p, CAS cas, String aCasReferenceId) {
+ this(p, cas, aCasReferenceId, null);
}
- public UimaASProcessStatusImpl(ProcessTrace p, String aCasReferenceId,
+ public UimaASProcessStatusImpl(ProcessTrace p, CAS cas, String aCasReferenceId,
String aParentCasReferenceId) {
prT = p;
casReferenceId = aCasReferenceId;
parentCasId = aParentCasReferenceId;
+ this.cas = cas;
}
public UimaASProcessStatusImpl(ProcessTrace p, boolean aSkip) {
@@ -70,6 +74,9 @@ public class UimaASProcessStatusImpl imp
isSkipped = aSkip;
}
+ public CAS getCAS() {
+ return cas;
+ }
public boolean isException() {
if (failedList.size() > 0) {
return true;
Modified: uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java?rev=1173774&r1=1173773&r2=1173774&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java (original)
+++ uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java Wed Sep 21 18:01:19 2011
@@ -19,37 +19,27 @@
package org.apache.uima.adapter.jms.client;
-import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.Semaphore;
import javax.jms.Connection;
-import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.InvalidDestinationException;
import javax.jms.Message;
import javax.jms.MessageProducer;
-import javax.jms.TextMessage;
import org.apache.uima.UIMAFramework;
import org.apache.uima.aae.UIMAEE_Constants;
import org.apache.uima.aae.client.UimaASProcessStatus;
import org.apache.uima.aae.client.UimaASProcessStatusImpl;
-import org.apache.uima.aae.client.UimaAsynchronousEngine;
import org.apache.uima.aae.delegate.Delegate;
-import org.apache.uima.aae.error.ServiceShutdownException;
import org.apache.uima.aae.message.AsynchAEMessage;
import org.apache.uima.aae.message.UimaMessageValidator;
import org.apache.uima.adapter.jms.JmsConstants;
import org.apache.uima.adapter.jms.client.BaseUIMAAsynchronousEngineCommon_impl.ClientRequest;
-import org.apache.uima.adapter.jms.client.BaseUIMAAsynchronousEngineCommon_impl.SharedConnection;
import org.apache.uima.adapter.jms.message.PendingMessage;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
-import org.apache.uima.cas.CAS;
import org.apache.uima.jms.error.handler.BrokerConnectionException;
import org.apache.uima.util.Level;
-import org.apache.uima.util.ProcessTrace;
import org.apache.uima.util.impl.ProcessTrace_impl;
/**
@@ -336,7 +326,7 @@ public abstract class BaseMessageSender
cacheEntry.setCASDepartureTime(System.nanoTime());
}
cacheEntry.setCASDepartureTime(System.nanoTime());
- UimaASProcessStatus status = new UimaASProcessStatusImpl(new ProcessTrace_impl(),
+ UimaASProcessStatus status = new UimaASProcessStatusImpl(new ProcessTrace_impl(),cacheEntry.getCAS(),
cacheEntry.getCasReferenceId());
// Notify engine before sending a message
engine.onBeforeMessageSend(status);