[jbossweb-commits] JBossWeb SVN: r1722 - branches/3.0.x/java/org/apache/tomcat/jni.

Author: jfrederic.clere(a)jboss.com Date: 2011-05-10 05:22:21 -0400 (Tue, 10 May 2011) New Revision: 1722 Modified: branches/3.0.x/java/org/apache/tomcat/jni/LibraryLoader.java Log: Arrange the solaris logic... We need the versions... Modified: branches/3.0.x/java/org/apache/tomcat/jni/LibraryLoader.java =================================================================== --- branches/3.0.x/java/org/apache/tomcat/jni/LibraryLoader.java 2011-05-10 09:20:56 UTC (rev 1721) +++ branches/3.0.x/java/org/apache/tomcat/jni/LibraryLoader.java 2011-05-10 09:22:21 UTC (rev 1722) @@ -54,6 +54,17 @@ else if (name.equals("AIX")) platform = "aix"; + if (platform.equals("solaris")) { + // Add the version... + String version = System.getProperty("os.version"); + if (version.equals("5.10")) + platform = "solaris10"; + else if (version.equals("5.9")) + platform = "solaris9"; + else + platform = "solaris11"; + } + return platform; } @@ -68,8 +79,6 @@ cpu = "parisc2"; else if (arch.startsWith("IA64")) cpu = "i64"; - else if (arch.startsWith("sparc")) - cpu = "sparcv9"; else if (arch.equals("x86_64")) cpu = "x64"; else if (arch.equals("amd64"))