Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7C252100F2 for ; Sat, 29 Aug 2015 14:24:18 +0000 (UTC) Received: (qmail 34426 invoked by uid 500); 29 Aug 2015 14:24:18 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 34379 invoked by uid 500); 29 Aug 2015 14:24:18 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 34370 invoked by uid 99); 29 Aug 2015 14:24:18 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Aug 2015 14:24:18 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 17A56AC006A for ; Sat, 29 Aug 2015 14:24:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1700038 - in /felix/trunk/framework/src: main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java test/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClauseTest.java Date: Sat, 29 Aug 2015 14:24:18 -0000 To: commits@felix.apache.org From: bob@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150829142418.17A56AC006A@hades.apache.org> Author: bob Date: Sat Aug 29 14:24:17 2015 New Revision: 1700038 URL: http://svn.apache.org/r1700038 Log: FELIX-5014 - Added case for Windows versions with no space. Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java felix/trunk/framework/src/test/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClauseTest.java Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java?rev=1700038&r1=1700037&r2=1700038&view=diff ============================================================================== --- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java (original) +++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java Sat Aug 29 14:24:17 2015 @@ -602,19 +602,23 @@ public class NativeLibraryClause { os = OS_WINDOWS_VISTA; } - else if ((value.indexOf(" 7") >= 0) || value.equals("win7")) + else if ((value.indexOf(" 7") >= 0) || value.startsWith(OS_WINDOWS_7) + || value.equals("win7")) { os = OS_WINDOWS_7; } - else if ((value.indexOf(" 8") >= 0) || value.equals("win8")) + else if ((value.indexOf(" 8") >= 0) || value.startsWith(OS_WINDOWS_8) + || value.equals("win8")) { os = OS_WINDOWS_8; } - else if ((value.indexOf(" 9") >= 0) || value.equals("win9")) + else if ((value.indexOf(" 9") >= 0) || value.startsWith(OS_WINDOWS_9) + || value.equals("win9")) { os = OS_WINDOWS_9; } - else if ((value.indexOf(" 10") >= 0) || value.equals("win10")) + else if ((value.indexOf(" 10") >= 0) || value.startsWith(OS_WINDOWS_10) + || value.equals("win10")) { os = OS_WINDOWS_10; } Modified: felix/trunk/framework/src/test/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClauseTest.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/test/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClauseTest.java?rev=1700038&r1=1700037&r2=1700038&view=diff ============================================================================== --- felix/trunk/framework/src/test/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClauseTest.java (original) +++ felix/trunk/framework/src/test/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClauseTest.java Sat Aug 29 14:24:17 2015 @@ -36,6 +36,7 @@ public class NativeLibraryClauseTest ext assertEquals("windowsvista", NativeLibraryClause.normalizeOSName("WinVista")); assertEquals("windows7", NativeLibraryClause.normalizeOSName("Windows 7")); assertEquals("windows8", NativeLibraryClause.normalizeOSName("Win8")); + assertEquals("windows10", NativeLibraryClause.normalizeOSName("Windows 10")); assertEquals("linux", NativeLibraryClause.normalizeOSName("Linux1.2.3")); assertEquals("aix", NativeLibraryClause.normalizeOSName("AIX-4.5.6")); assertEquals("digitalunix", NativeLibraryClause.normalizeOSName("digitalunix_blah")); @@ -71,6 +72,7 @@ public class NativeLibraryClauseTest ext assertEquals("windows7", NativeLibraryClause.normalizeOSName("windows7")); assertEquals("windows8", NativeLibraryClause.normalizeOSName("windows8")); assertEquals("windows9", NativeLibraryClause.normalizeOSName("windows9")); + assertEquals("windows10", NativeLibraryClause.normalizeOSName("windows10")); assertEquals("windows95", NativeLibraryClause.normalizeOSName("windows95")); assertEquals("windows98", NativeLibraryClause.normalizeOSName("windows98")); assertEquals("windowsce", NativeLibraryClause.normalizeOSName("windowsce")); @@ -98,6 +100,7 @@ public class NativeLibraryClauseTest ext assertTrue(NativeLibraryClause.getOsNameWithAliases("Windows 7").contains("windows7")); assertTrue(NativeLibraryClause.getOsNameWithAliases("Windows7").contains("windows7")); assertTrue(NativeLibraryClause.getOsNameWithAliases("Win8").contains("windows8")); + assertTrue(NativeLibraryClause.getOsNameWithAliases("Windows 10").contains("windows10")); assertTrue(NativeLibraryClause.getOsNameWithAliases("Linux1.2.3").contains("linux")); assertTrue(NativeLibraryClause.getOsNameWithAliases("AIX-4.5.6").contains("aix")); assertTrue(NativeLibraryClause.getOsNameWithAliases("digitalunix_blah").contains("digitalunix")); @@ -133,6 +136,7 @@ public class NativeLibraryClauseTest ext assertTrue(NativeLibraryClause.getOsNameWithAliases("windows7").contains("windows7")); assertTrue(NativeLibraryClause.getOsNameWithAliases("windows8").contains("windows8")); assertTrue(NativeLibraryClause.getOsNameWithAliases("windows9").contains("windows9")); + assertTrue(NativeLibraryClause.getOsNameWithAliases("windows10").contains("windows10")); assertTrue(NativeLibraryClause.getOsNameWithAliases("windows95").contains("windows95")); assertTrue(NativeLibraryClause.getOsNameWithAliases("windows98").contains("windows98")); assertTrue(NativeLibraryClause.getOsNameWithAliases("windowsce").contains("windowsce"));