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 2016/11/08 22:39:12 UTC
svn commit: r1768801 - in /uima/uimaj/branches/experiment-v3-jcas: uimaj-cpe/
uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/
uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/
uimaj-cpe/src/ma...
Author: schor
Date: Tue Nov 8 22:39:11 2016
New Revision: 1768801
URL: http://svn.apache.org/viewvc?rev=1768801&view=rev
Log: (empty)
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasObjectNetworkCasProcessorImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/ProcessControllerAdapter.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketTransport.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-document-annotation/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-feature-runtime/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-feature-tools/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-feature-tools/src/main/resources/feature.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-update-site/ (props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/ (props changed)
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:39:11 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-cpe:961329-961747
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-cpe:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-cpe:933273-944399
-/uima/uimaj/trunk/uimaj-cpe:1690273-1693269
+/uima/uimaj/trunk/uimaj-cpe:1690273-1768794
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java Tue Nov 8 22:39:11 2016
@@ -239,9 +239,8 @@ public class CPEFactory {
/**
* Creates an object representation from default cpe descriptor.
*
- * @throws InstantiationException -
+ * @throws UIMARuntimeException wraps Exception
*/
-
public void parse() {
defaultConfig = true;
InputStream defaultDescriptorStream = getClass().getResourceAsStream(DEFAULT_CONFIG_FILE);
@@ -278,9 +277,9 @@ public class CPEFactory {
* creates and intializes the Cas Initializer if one is defined and associates it with the
* CollectionReader.
*
- * @return - CollectionReader instance
+ * @return CollectionReader instance
*
- * @throws ConfigurationException -
+ * @throws ResourceConfigurationException
*/
public BaseCollectionReader getCollectionReader() throws ResourceConfigurationException {
checkForErrors();
@@ -1142,12 +1141,14 @@ public class CPEFactory {
/**
* Returns an object containing global CPE configuration including:
+ * <ul>
* <li>Number of documents to process</li>
* <li>Checkpoint configuration</li>
* <li>id of the document begin processing</li>
+ * </ul>
*
- * @return - Global CPE Configuration
- * @throws InstantiationException -
+ * @return Global CPE Configuration
+ * @throws InstantiationException
*/
public CpeConfiguration getCPEConfig() throws InstantiationException {
try {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasObjectNetworkCasProcessorImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasObjectNetworkCasProcessorImpl.java?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasObjectNetworkCasProcessorImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasObjectNetworkCasProcessorImpl.java Tue Nov 8 22:39:11 2016
@@ -161,12 +161,10 @@ public class CasObjectNetworkCasProcesso
}
/**
- * Uses configured transport to delegate given CAS to the remote service
+ * Uses configured transport to delegate given CAS to the remote service.
*
- * @param aCAS -
- * CAS to be analyzed
- *
- * @throws ResourceInitializationException wraps Exception, SocketException
+ * @param aCAS CAS to be analyzed
+ * @throws ResourceProcessException wraps Exception, SocketException
*/
public void processCas(CAS aCAS) throws ResourceProcessException {
try {
@@ -184,7 +182,7 @@ public class CasObjectNetworkCasProcesso
*
* @param aCASes - an array of CASes to be analyzed
*
- * @throws ResourceInitializationException wraps SocketException, SocketTimeoutException
+ * @throws ResourceProcessException wraps SocketException, SocketTimeoutException
*/
public void processCas(CAS[] aCASes) throws ResourceProcessException {
try {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CasProcessorConfigurationJAXBImpl.java Tue Nov 8 22:39:11 2016
@@ -491,11 +491,11 @@ public class CasProcessorConfigurationJA
/**
* Returns an action as String to identify an action to take in case of excessive Cas Processor
* errors.
- * <p>
+ * <ul>
* <li>continue</li>
* <li>terminate</li>
* <li>disable</li>
- * <p>
+ * </ul>
*
* @return - action
*/
@@ -506,11 +506,11 @@ public class CasProcessorConfigurationJA
/**
* Returns an action as String to identify an action to take in case of excessive Cas Processor
* restarts.
- * <p>
+ * <ul>
* <li>continue</li>
* <li>terminate</li>
* <li>disable</li>
- * <p>
+ * </ul>
*
* @return - action
*/
@@ -582,10 +582,11 @@ public class CasProcessorConfigurationJA
/**
* Returns deployment type associated with this Cas Processor
- * <p>
+ * <ul>
* <li>integrated</li>
* <li>local</li>
* <li>remote</li>
+ * </ul>
*
* @return - deployment type
*/
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/NetworkCasProcessorImpl.java Tue Nov 8 22:39:11 2016
@@ -304,7 +304,7 @@ public class NetworkCasProcessorImpl imp
/**
* Notifies Network AE that end-of-batch marker has been reached. The notification can be disabled
- * in the Cpe descriptor by setting batch=0 in the <checkpoint> element.
+ * in the Cpe descriptor by setting batch=0 in the <checkpoint> element.
*
* @see org.apache.uima.collection.base_cpm.CasProcessor#batchProcessComplete(org.apache.uima.util.ProcessTrace)
*/
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java Tue Nov 8 22:39:11 2016
@@ -583,7 +583,7 @@ public Object getLastCas() {
/**
* Returns true if maximum threshold for errors has been exceeded and the CasProcessor is
* configured to force CPE shutdown. It looks at the value of the action attribute of the
- * <errorRateThreshold> element in the cpe descriptor.
+ * <errorRateThreshold> element in the cpe descriptor.
*
* @return - true if the CPE should stop processing, false otherwise
*/
@@ -1062,7 +1062,7 @@ public Object getLastCas() {
/**
* Returns CasProcessor configuration object. This object represents xml configuration defined in
- * the <casProcessor> section of the cpe descriptor.
+ * the <casProcessor> section of the cpe descriptor.
*
* @return {@link CasProcessorConfiguration} instance
*/
@@ -1230,7 +1230,8 @@ public boolean isIntegrated() {
/**
* Determines if instances of CasProcessor managed by this container are abortable. Abortable
- * CasProcessor's action attribute in the <errorRateThreshold> element has a value of 'disable'.
+ * CasProcessor's action attribute in the <errorRateThreshold> element has a value of
+ * 'disable'.
*
* @return true if CasProcessor can be disabled
*/
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/ProcessControllerAdapter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/ProcessControllerAdapter.java?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/ProcessControllerAdapter.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/ProcessControllerAdapter.java Tue Nov 8 22:39:11 2016
@@ -35,10 +35,10 @@ public interface ProcessControllerAdapte
*
* @param howMany - how many CasProcessor instances to deploy
*
- * @return - URL[] - list of URLs containing endpoint info
+ * @return URL[] - list of URLs containing endpoint info
*
- * @throws -
- * Exception-Failure to start fenced CasProcessor
+ * @throws
+ * Exception Failure to start fenced CasProcessor
*/
public URL[] deploy(String aCasProcessorName, int howMany) throws Exception;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketTransport.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketTransport.java?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketTransport.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/socket/SocketTransport.java Tue Nov 8 22:39:11 2016
@@ -44,13 +44,12 @@ public interface SocketTransport {
* Creates a socket connection to a given endpoint. This method blocks until all Connections are
* resolved or an error occurs.
*
- * @param aURI - URI containing service endpoint info: host&port
- * @param aTimeout - max time in millis to wait for response
+ * @param aURI URI containing service endpoint info: host & port
+ * @param aTimeout max time in millis to wait for response
*
- * @return - Socket bound to a given endpoint
+ * @return Socket bound to a given endpoint
*
- * @throws -
- * SocketException - Failed to connect
+ * @throws SocketException Failed to connect
*/
public Socket connect(URL aURI, long aTimeout) throws SocketException;
@@ -62,10 +61,10 @@ public interface SocketTransport {
*
* @return - CAS - CAS returned from the fenced CasProcessor
*
- * @throws -
+ * @throws
* SocketTimeoutException - Socket timesout before receiving response from the fenced
* CasProcessor
- * @throws -
+ * @throws
* SocketException - connection broken
*
*/
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/vinci/VinciCasProcessorDeployer.java Tue Nov 8 22:39:11 2016
@@ -68,10 +68,10 @@ import org.apache.vinci.transport.Servic
* {@link org.apache.uima.collection.impl.base_cpm.container.deployer.CasProcessorDeployer} This
* component enables the CPE to deploy Cas Processors running as a Vinci service. Two deployment
* models are supported in the current implementation:
- *
+ * <ul>
* <li>managed deployment (aka local)</li>
* <li>unmanaged deployment (aka remote)</li>
- *
+ * </ul>
* Managed deployment gives the CPE control over the life cycle of the Cas Processor. The CPE
* starts, restarts and shuts down the Cas Processor running as a Vinci service. This service is
* launched on the same machine as the CPE but in a seperate process.
@@ -117,7 +117,7 @@ public class VinciCasProcessorDeployer i
// Local VNS is a shared instance across all instances of VinciCasProcessorDeployer. It uses
// shared
// portQueue (defined below). VNS and the queue are instantiated once.
- private static LocalVNS vns = null;
+ private static volatile LocalVNS vns = null;
private int restartCount = 0;
@@ -1130,16 +1130,18 @@ public class VinciCasProcessorDeployer i
}
- if (vns == null) {
- try {
- vns = new LocalVNS(startPort, maxPort, vnsPort);
- vns.setConnectionPool(portQueue);
-
- localVNSThread = new Thread(vns);
- localVNSThread.start();
-
- } catch (Exception e) {
- throw new CasProcessorDeploymentException(e);
+ synchronized (VinciCasProcessorDeployer.class) {
+ if (vns == null) {
+ try {
+ vns = new LocalVNS(startPort, maxPort, vnsPort);
+ vns.setConnectionPool(portQueue);
+
+ localVNSThread = new Thread(vns);
+ localVNSThread.start();
+
+ } catch (Exception e) {
+ throw new CasProcessorDeploymentException(e);
+ }
}
}
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/ProcessingUnit.java Tue Nov 8 22:39:11 2016
@@ -677,8 +677,10 @@ public class ProcessingUnit extends Thre
* Processor in the pipeline. Conversions between different types of Cas Processors is done on the
* fly. Two types of Cas Processors are currently supported:
*
+ * <ul>
* <li> CasDataProcessor</li>
* <li> CasObjectProcessor</li>
+ * </ul>
*
* The first operates on instances of CasData the latter operates on instances of CAS. The results
* produced by Cas Processors are added to the output queue.
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-document-annotation/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:39:11 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-document-annotation:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-document-annotation:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-document-annotation:933273-944399
-/uima/uimaj/trunk/uimaj-document-annotation:1690273-1693269
+/uima/uimaj/trunk/uimaj-document-annotation:1690273-1768794
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-feature-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:39:11 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-runtime:961329-961746
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-runtime:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-runtime:933273-944399
-/uima/uimaj/trunk/uimaj-eclipse-feature-runtime:1690273-1693269
+/uima/uimaj/trunk/uimaj-eclipse-feature-runtime:1690273-1768795
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-feature-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:39:11 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-feature-tools:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-feature-tools:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-eclipse-feature-tools:933273-944402
-/uima/uimaj/trunk/uimaj-eclipse-feature-tools:1690273-1693269
+/uima/uimaj/trunk/uimaj-eclipse-feature-tools:1690273-1768795
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-feature-tools/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-feature-tools/src/main/resources/feature.xml?rev=1768801&r1=1768800&r2=1768801&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-feature-tools/src/main/resources/feature.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-feature-tools/src/main/resources/feature.xml Tue Nov 8 22:39:11 2016
@@ -42,7 +42,6 @@
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.jdt.debug.ui"/>
<import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui.workbench.texteditor"/>
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-eclipse-update-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:39:11 2016
@@ -3,4 +3,4 @@
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-eclipse-update-site:961329-961747
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-eclipse-update-site:1436573-1462257
/uima/uimaj/branches/mavenAlign/uimaj-eclipse-update-site:933273-944402
-/uima/uimaj/trunk/uimaj-eclipse-update-site:1690273-1693269
+/uima/uimaj/trunk/uimaj-eclipse-update-site:1690273-1768795
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-ep-cas-editor/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 8 22:39:11 2016
@@ -1,4 +1,4 @@
/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-ep-cas-editor:963167-964468
/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-ep-cas-editor:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-ep-cas-editor:1436573-1462257
-/uima/uimaj/trunk/uimaj-ep-cas-editor:1690273-1760084
+/uima/uimaj/trunk/uimaj-ep-cas-editor:1690273-1768794