svn commit: r1792878 - 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

[pa...@apache.org]

Author: pauls
Date: Thu Apr 27 13:03:44 2017
New Revision: 1792878

URL: http://svn.apache.org/viewvc?rev=1792878&view=rev
Log:
Change the fallback for windows native code to win32 (FELIX-5574). This closes #95. Furthermore, add support for windows server 2016 in the normalizeOsName (FELIX-5553).

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=1792878&r1=1792877&r2=1792878&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 Thu Apr 27 13:03:44 2017
@@ -71,6 +71,7 @@ public class NativeLibraryClause
     private static final String OS_WINDOWS_NT = "windowsnt";
     private static final String OS_WINDOWS_SERVER_2008 = "windowsserver2008";
     private static final String OS_WINDOWS_SERVER_2012 = "windowsserver2012";
+    private static final String OS_WINDOWS_SERVER_2016 = "windowsserver2016";
     private static final String OS_WINDOWS_VISTA = "windowsvista";
     private static final String OS_WINDOWS_XP = "windowsxp";
     private static final String OS_WIN_32 = "win32";
@@ -558,7 +559,7 @@ public class NativeLibraryClause
         //If we don't find a match do it the old way for compatibility
         if (value.startsWith("win"))
         {
-            String os = "win";
+            String os = OS_WIN_32;
             if (value.indexOf("32") >= 0 || value.indexOf("*") >= 0)
             {
                 os = OS_WIN_32;
@@ -591,6 +592,10 @@ public class NativeLibraryClause
             {
                 os = OS_WINDOWS_SERVER_2012;
             }
+            else if (value.indexOf("2016") >= 0)
+            {
+                os = OS_WINDOWS_SERVER_2016;
+            }
             else if (value.indexOf("xp") >= 0)
             {
                 os = OS_WINDOWS_XP;

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=1792878&r1=1792877&r2=1792878&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 Thu Apr 27 13:03:44 2017
@@ -24,6 +24,7 @@ public class NativeLibraryClauseTest ext
     public void testNormalizeOSName() {
         assertEquals("win32", NativeLibraryClause.normalizeOSName("win 32"));
         assertEquals("win32", NativeLibraryClause.normalizeOSName("Win*"));
+        assertEquals("win32", NativeLibraryClause.normalizeOSName("Windows NonExistingFutureVersion 4711"));
         assertEquals("windows95", NativeLibraryClause.normalizeOSName("Windows 95"));
         assertEquals("windows98", NativeLibraryClause.normalizeOSName("Windows 98"));
         assertEquals("windowsnt", NativeLibraryClause.normalizeOSName("WinNT"));
@@ -31,6 +32,7 @@ public class NativeLibraryClauseTest ext
         assertEquals("windows2003", NativeLibraryClause.normalizeOSName("Win2003"));
         assertEquals("windowsserver2008", NativeLibraryClause.normalizeOSName("Windows Server 2008"));
         assertEquals("windowsserver2012", NativeLibraryClause.normalizeOSName("Windows Server 2012"));
+        assertEquals("windowsserver2016", NativeLibraryClause.normalizeOSName("Windows Server 2016"));
         assertEquals("windowsxp", NativeLibraryClause.normalizeOSName("WinXP"));
         assertEquals("windowsce", NativeLibraryClause.normalizeOSName("WinCE"));
         assertEquals("windowsvista", NativeLibraryClause.normalizeOSName("WinVista"));