[jboss-svn-commits] JBL Code SVN: r12357 - in labs/jbossesb/trunk/product/services/smooks: lib/ext and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2007-06-06 11:04:44 -0400 (Wed, 06 Jun 2007)
New Revision: 12357

Modified:
   labs/jbossesb/trunk/product/services/smooks/base-project-build.xml
   labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar
   labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java
   labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
Log:
modifying exception logging - only log notification queue exception on debug

Modified: labs/jbossesb/trunk/product/services/smooks/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/base-project-build.xml	2007-06-06 15:04:43 UTC (rev 12356)
+++ labs/jbossesb/trunk/product/services/smooks/base-project-build.xml	2007-06-06 15:04:44 UTC (rev 12357)
@@ -60,7 +60,7 @@
     <target name="esb" depends="jar">
         <copy todir="build/${ant.project.name}.esb/" >
         	<fileset dir="lib/ext" includes="*.jar"/>
-        	<fileset dir="src/main/resources/" includes="**/*"/>
+        	<fileset dir="src/main/resources/"/>
         	<fileset dir="build" includes="*.jar"/>
          </copy>
     </target>
@@ -69,7 +69,7 @@
 		<!-- copying to jbossesb/lib -->
     	<mkdir dir="${esb.product.lib.dir}/${ant.project.name}.esb"/>
     	<copy todir="${esb.product.lib.dir}/${ant.project.name}.esb">
-    		<fileset dir="build/${ant.project.name}.esb"  includes="**/*" />
+    		<fileset dir="build/${ant.project.name}.esb" />
     	</copy>
 	</target>
     

Modified: labs/jbossesb/trunk/product/services/smooks/lib/ext/milyn-smooks-javabean-0.3-SNAPSHOT.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java	2007-06-06 15:04:43 UTC (rev 12356)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksInstanceManager.java	2007-06-06 15:04:44 UTC (rev 12357)
@@ -337,14 +337,22 @@
 			public void onException(JMSException e) {
 				synchronized (ExceptionListener.class) {
 					if(!hasHandledOneException) {
-						logger.error("JMS Exception on Transformation Configuration Update Listener.", e);
-						close();
+                        if(!logger.isDebugEnabled()) {
+                            logger.warn("JMS Exception on Transformation Configuration Update Listener: " + e.getMessage());
+                        } else {
+                            logger.debug("JMS Exception on Transformation Configuration Update Listener.", e);
+                        }
+                        close();
 						while(!connect()) {
 							try {
 								Thread.sleep(5000);
 							} catch (InterruptedException e1) {
-								logger.error("Interrupted during reconnect attempt.  Aborting reconnect!  Will need restart to reconnect.", e);
-							}
+                                if(!logger.isDebugEnabled()) {
+	    							logger.warn("Interrupted during reconnect attempt.  Aborting reconnect!  Will need restart to reconnect: " + e.getMessage());
+                                } else {
+                                    logger.debug("Interrupted during reconnect attempt.  Aborting reconnect!  Will need restart to reconnect.", e);
+                                }
+                            }
 						}
 						hasHandledOneException = true;
 					}

Modified: labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-06 15:04:43 UTC (rev 12356)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/java/org/jboss/soa/esb/actions/converters/SmooksTransformer.java	2007-06-06 15:04:44 UTC (rev 12357)
@@ -211,6 +211,9 @@
     }
 
     public void destroy() throws ActionLifecycleException {
+        if(smooksInstanceManager != SmooksService.getGlobalSmooksInstanceManager()) {
+            smooksInstanceManager.close();
+        }
     }
 
 	/* (non-Javadoc)