Author: jfrederic.clere(a)jboss.com
Date: 2011-05-06 11:43:33 -0400 (Fri, 06 May 2011)
New Revision: 1720
Modified:
branches/2.1.x/java/org/apache/tomcat/jni/LibraryLoader.java
Log:
Arrange the solaris logic... We need the versions...
Modified: branches/2.1.x/java/org/apache/tomcat/jni/LibraryLoader.java
===================================================================
--- branches/2.1.x/java/org/apache/tomcat/jni/LibraryLoader.java 2011-05-04 14:20:51 UTC
(rev 1719)
+++ branches/2.1.x/java/org/apache/tomcat/jni/LibraryLoader.java 2011-05-06 15:43:33 UTC
(rev 1720)
@@ -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"))
Show replies by date