You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2014/02/24 19:21:17 UTC

svn commit: r1571380 - in /uima/uima-as/trunk: uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java

Author: cwiklik
Date: Mon Feb 24 18:21:16 2014
New Revision: 1571380

URL: http://svn.apache.org/r1571380
Log:
UIMA-AS 3653 Use major version when checking uima-as compatibility with uima sdk

Modified:
    uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java
    uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java

Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java?rev=1571380&r1=1571379&r2=1571380&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java Mon Feb 24 18:21:16 2014
@@ -583,8 +583,8 @@ public class BaseUIMAAsynchronousEngine_
     shutdownHookThread = new Thread(new UimaASShutdownHook(this));
     Runtime.getRuntime().addShutdownHook(shutdownHookThread);
            
-    // Check the version of uimaj that UIMA AS was built with, against the UIMA Core version. If not the same throw Exception
-    if (!UimaAsVersion.getUimajFullVersionString().equals(UimaVersion.getFullVersionString())) {
+    // Check for compatibility with a version of uima sdk. Only check major versions.
+    if (UimaAsVersion.getMajorVersion() != UimaVersion.getMajorVersion() ) {
       UIMAFramework.getLogger(CLASS_NAME).logrb(
               Level.WARNING,
               CLASS_NAME.getName(), 

Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java?rev=1571380&r1=1571379&r2=1571380&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java Mon Feb 24 18:21:16 2014
@@ -345,7 +345,7 @@ public abstract class BaseAnalysisEngine
       //  this adds the handler to every thread
       Thread.setDefaultUncaughtExceptionHandler(new UimaAsUncaughtExceptionHandler(getComponentName()));
       // Check the version of uimaj that UIMA AS was built with, against the UIMA Core version. If not the same throw Exception
-      if (!UimaAsVersion.getUimajFullVersionString().equals(UimaVersion.getFullVersionString())) {
+      if (UimaAsVersion.getMajorVersion() != UimaVersion.getMajorVersion()) {
         UIMAFramework.getLogger(CLASS_NAME).logrb(
                 Level.WARNING,
                 CLASS_NAME.getName(),