Author: thomas.diesler(a)jboss.com Date: 2008-04-07 13:10:56 -0400 (Mon, 07 Apr 2008) New Revision: 6260 Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [CXF-1506] No Implementation-Vendor in manifest Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-07 17:01:19 UTC (rev 6259) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-07 17:10:56 UTC (rev 6260) @@ -76,63 +76,54 @@ public boolean isTargetJBoss50() { String target = getIntegrationTarget(); - return "jboss50".startsWith(target); + return target.startsWith("jboss50"); } /** True, if -Djbossws.integration.target=jboss42x */ public boolean isTargetJBoss42() { String target = getIntegrationTarget(); - return "jboss42".startsWith(target); + return target.startsWith("jboss42"); } /** True, if -Djbossws.integration.target=jboss40x */ public boolean isTargetJBoss40() { String target = getIntegrationTarget(); - return "jboss40".startsWith(target); + return target.startsWith("jboss40"); } public boolean isIntegrationNative() { String vendor = getImplementationVendor(); - - // http://issues.apache.org/jira/browse/CXF-1506 if (vendor == null) { System.out.println("FIXME: [CXF-1506] - No Implementation-Vendor in manifest"); return false; } - - return "JBoss".indexOf(vendor) != -1; + return vendor.indexOf("JBoss") != -1; } public boolean isIntegrationMetro() { String vendor = getImplementationVendor(); - - // http://issues.apache.org/jira/browse/CXF-1506 if (vendor == null) { System.out.println("FIXME: [CXF-1506] - No Implementation-Vendor in manifest"); return false; } - - return "Sun".indexOf(vendor) != -1; + return vendor.indexOf("Sun") != -1; } public boolean isIntegrationCXF() { String vendor = getImplementationVendor(); - - // http://issues.apache.org/jira/browse/CXF-1506 if (vendor == null) { System.out.println("FIXME: [CXF-1506] - No Implementation-Vendor in manifest"); return true; } - - return vendor == null || "Apache".indexOf(vendor) != -1; + return vendor.indexOf("Apache") != -1; } private String getImplementationVendor()