[jbossws-commits] JBossWS SVN: r4422 - common/tags/jbossws-common-1.0.0.GA/src/main/java/org/jboss/wsf/test.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-08-17 11:57:29 -0400 (Fri, 17 Aug 2007)
New Revision: 4422

Modified:
   common/tags/jbossws-common-1.0.0.GA/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
Be lenient about an integration target mismatch

Modified: common/tags/jbossws-common-1.0.0.GA/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/tags/jbossws-common-1.0.0.GA/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java	2007-08-17 14:44:43 UTC (rev 4421)
+++ common/tags/jbossws-common-1.0.0.GA/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java	2007-08-17 15:57:29 UTC (rev 4422)
@@ -181,12 +181,21 @@
             ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
             jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
             if (jbossVersion.startsWith("5.0"))
+            {
                jbossVersion = "jboss50";
+            }
             else if (jbossVersion.startsWith("4.2"))
+            {
                jbossVersion = "jboss42";
+            }
             else if (jbossVersion.startsWith("4.0"))
+            {
                jbossVersion = "jboss40";
-            else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
+            }
+            else
+            {
+               log.warn("Unsupported jboss version: " + jbossVersion);
+            }
          }
          catch (Throwable th)
          {
@@ -194,7 +203,9 @@
          }
 
          if (jbossVersion != null && jbossVersion.equals(integrationTarget) == false)
-            throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
+         {
+            log.warn("Integration target mismatch, using: " + integrationTarget);
+         }
       }
       return integrationTarget;
    }