[jbossws-commits] JBossWS SVN: r2262 - in branches/jbossws-1.2.0/jbossws-tests: src/main/java/org/jboss/test/ws and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-02-03 15:46:08 -0500 (Sat, 03 Feb 2007)
New Revision: 2262

Modified:
   branches/jbossws-1.2.0/jbossws-tests/build.xml
   branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
Log:
Fix tomcat test integration

Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml	2007-02-03 20:16:45 UTC (rev 2261)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml	2007-02-03 20:46:08 UTC (rev 2262)
@@ -227,6 +227,9 @@
   </target>
   
   <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
+    
+    <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/>
+    
     <!-- The test client classpath -->
     <path id="test.client.classpath">
       <path refid="jbossws.classpath"/>

Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java	2007-02-03 20:16:45 UTC (rev 2261)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java	2007-02-03 20:46:08 UTC (rev 2262)
@@ -169,7 +169,7 @@
                integrationTarget = jbossVersion;
             }
          }
-         catch (Exception ex)
+         catch (Throwable th)
          {
             // ignore, we are not running on jboss-4.2 or greater
          }