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 2016/09/22 17:26:26 UTC

svn commit: r1761983 - in /uima/uima-as/trunk: uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngine_impl.java uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/service/Dd2spring.java

Author: cwiklik
Date: Thu Sep 22 17:26:26 2016
New Revision: 1761983

URL: http://svn.apache.org/viewvc?rev=1761983&view=rev
Log:
UIMA-5117 modified Dd2spring to re-throw exceptions from saxon and log them in the uima-as.

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-jms/src/main/java/org/apache/uima/adapter/jms/service/Dd2spring.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=1761983&r1=1761982&r2=1761983&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 Thu Sep 22 17:26:26 2016
@@ -910,8 +910,14 @@ public class BaseUIMAAsynchronousEngine_
         springDeployer.startListeners();
       }
       return id;
-    } catch (ResourceInitializationException e) {
+    } catch (Exception e) {
       running = true;
+      if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.WARNING)) {
+          UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),
+                  "main", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
+                  "UIMAJMS_exception__WARNING", e);
+      }
+
       throw e;
     } finally {
 	  String uimaAsDebug = (String) anApplicationContext.get(UimaAsynchronousEngine.UimaEeDebug);

Modified: uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/service/Dd2spring.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/service/Dd2spring.java?rev=1761983&r1=1761982&r2=1761983&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/service/Dd2spring.java (original)
+++ uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/service/Dd2spring.java Thu Sep 22 17:26:26 2016
@@ -30,6 +30,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.uima.UIMAFramework;
+import org.apache.uima.aae.UIMAEE_Constants;
 import org.apache.uima.adapter.jms.JmsConstants;
 import org.apache.uima.util.Level;
 
@@ -45,11 +46,16 @@ public class Dd2spring {
    * @param args
    */
   public static void main(String[] args) {
-    new Dd2spring().convertDd2Spring(args[0], args[1], args[2], args[3]);
+	  try {
+		    new Dd2spring().convertDd2Spring(args[0], args[1], args[2], args[3]);
+		  
+	  } catch ( Exception e) {
+		  e.printStackTrace();
+	  }
   }
 
   public File convertDd2Spring(String ddFilePath, String dd2SpringXsltFilePath,
-          String saxonClasspath, String uimaAsDebug) {
+          String saxonClasspath, String uimaAsDebug) throws Exception {
 
     URL urlForSaxonClassPath;
     try {
@@ -101,7 +107,7 @@ public class Dd2spring {
    *          classpath for saxon8.jar
    */
   public void convertDd2Spring(File tempFile, String ddFilePath, String dd2SpringXsltFilePath,
-          URL saxonClasspathURL) {
+          URL saxonClasspathURL) throws Exception {
 
     if (null == saxonClassLoader) {
       URL[] classLoaderUrls = new URL[] { saxonClasspathURL };
@@ -121,7 +127,7 @@ public class Dd2spring {
       UIMAFramework.getLogger(THIS_CLASS).logrb(Level.CONFIG, THIS_CLASS.getName(),
               "convertDD2Spring", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
               "UIMA_dd2spring_saxon_missing_SEVERE");
-      return;
+      throw e;
     }
 
     // args for saxon
@@ -155,16 +161,13 @@ public class Dd2spring {
       mainMethod = mainStartClass.getMethod("main", String[].class);
     } catch (SecurityException e) {
       e.printStackTrace();
-      UIMAFramework.getLogger(THIS_CLASS).logrb(Level.CONFIG, THIS_CLASS.getName(),
+      UIMAFramework.getLogger(THIS_CLASS).logrb(Level.INFO, THIS_CLASS.getName(),
               "convertDD2Spring", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
               "UIMA_dd2spring_security_exception_calling_saxon");
-      return;
+		throw e;
     } catch (NoSuchMethodException e) {
-      e.printStackTrace();
-      UIMAFramework.getLogger(THIS_CLASS).logrb(Level.CONFIG, THIS_CLASS.getName(),
-              "convertDD2Spring", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
-              "UIMA_dd2spring_internal_error_calling_saxon");
-      return;
+        e.printStackTrace();
+		throw e;
     }
 
     try {
@@ -172,22 +175,25 @@ public class Dd2spring {
               new Object[] { argsForSaxon.toArray(new String[argsForSaxon.size()]) });
     } catch (IllegalArgumentException e) {
       e.printStackTrace();
-      UIMAFramework.getLogger(THIS_CLASS).logrb(Level.CONFIG, THIS_CLASS.getName(),
+      UIMAFramework.getLogger(THIS_CLASS).logrb(Level.INFO, THIS_CLASS.getName(),
               "convertDD2Spring", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
               "UIMA_dd2spring_internal_error_calling_saxon");
-      return;
+ 	  throw e;
     } catch (IllegalAccessException e) {
       e.printStackTrace();
-      UIMAFramework.getLogger(THIS_CLASS).logrb(Level.CONFIG, THIS_CLASS.getName(),
+      UIMAFramework.getLogger(THIS_CLASS).logrb(Level.INFO, THIS_CLASS.getName(),
               "convertDD2Spring", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
               "UIMA_dd2spring_internal_error_calling_saxon");
-      return;
+	  throw e;
     } catch (InvocationTargetException e) {
       e.printStackTrace();
-      UIMAFramework.getLogger(THIS_CLASS).logrb(Level.CONFIG, THIS_CLASS.getName(),
+      UIMAFramework.getLogger(THIS_CLASS).logrb(Level.INFO, THIS_CLASS.getName(),
               "convertDD2Spring", JmsConstants.JMS_LOG_RESOURCE_BUNDLE,
               "UIMA_dd2spring_internal_error_calling_saxon");
-      return;
+      throw e;
+    } catch( Exception e) {
+    	e.printStackTrace();
+		throw e;
     }
 
     return;