[jbossws-commits] JBossWS SVN: r11236 - common/trunk/src/main/java/org/jboss/wsf/test.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-12-09 15:38:07 -0500 (Wed, 09 Dec 2009)
New Revision: 11236

Modified:
   common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
   common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
[JBWS-2848] fixing common

Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java	2009-12-09 19:53:28 UTC (rev 11235)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java	2009-12-09 20:38:07 UTC (rev 11236)
@@ -211,11 +211,6 @@
       return JBossWSTestHelper.isTargetJBoss51();
    }
 
-   public static boolean isTargetJBoss52()
-   {
-      return JBossWSTestHelper.isTargetJBoss52();
-   }
-
    public static boolean isTargetJBoss50()
    {
       return JBossWSTestHelper.isTargetJBoss50();

Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java	2009-12-09 19:53:28 UTC (rev 11235)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java	2009-12-09 20:38:07 UTC (rev 11236)
@@ -85,7 +85,7 @@
    /** True, if -Djbossws.integration.target=jboss5x */
    public static boolean isTargetJBoss5()
    {
-      return  isTargetJBoss52() || isTargetJBoss51() || isTargetJBoss50();
+      return  isTargetJBoss51() || isTargetJBoss50();
    }
 
    /** True, if -Djbossws.integration.target=jboss50x */
@@ -102,19 +102,12 @@
       return target.startsWith("jboss51");
    }
 
-   /** True, if -Djbossws.integration.target=jboss52x */
-   public static boolean isTargetJBoss52()
-   {
-      String target = getIntegrationTarget();
-      return target.startsWith("jboss52");
-   }
-
    /** True, if -Djbossws.integration.target=jboss6x */
    public static boolean isTargetJBoss6()
    {
       return isTargetJBoss61() || isTargetJBoss60();
    }
-   
+
    /** True, if -Djbossws.integration.target=jboss60x */
    public static boolean isTargetJBoss60()
    {
@@ -155,10 +148,10 @@
          implVendor = obj.getClass().getPackage().getImplementationVendor();
          if (implVendor == null)
             implVendor = getImplementationPackage();
-         
+
          implTitle = obj.getClass().getPackage().getImplementationTitle();
          implVersion = obj.getClass().getPackage().getImplementationVersion();
-         
+
          System.out.println(implVendor + ", " + implTitle + ", " + implVersion);
       }
       return implVendor;
@@ -233,9 +226,7 @@
             if (jbossVersion == null)
                throw new IllegalStateException("Cannot obtain jboss version");
 
-            if (jbossVersion.startsWith("5.2"))
-               jbossVersion = "jboss52";
-            else if (jbossVersion.startsWith("5.1"))
+            if (jbossVersion.startsWith("5.1"))
                jbossVersion = "jboss51";
             else if (jbossVersion.startsWith("5.0"))
                jbossVersion = "jboss50";
@@ -253,7 +244,7 @@
          if (integrationTarget.startsWith(jbossVersion) == false)
             throw new IllegalStateException("Integration target mismatch: " + integrationTarget + ".startsWith(" + jbossVersion + ")");
       }
-      
+
       return integrationTarget;
    }