[jbossweb-commits] JBossWeb SVN: r1782 - trunk/java/org/apache/tomcat/jni.
Author: jfrederic.clere(a)jboss.com
Date: 2011-07-18 11:33:35 -0400 (Mon, 18 Jul 2011)
New Revision: 1782
Modified:
trunk/java/org/apache/tomcat/jni/Library.properties
trunk/java/org/apache/tomcat/jni/LibraryLoader.java
Log:
Arrange solaris and macosx.
Modified: trunk/java/org/apache/tomcat/jni/Library.properties
===================================================================
--- trunk/java/org/apache/tomcat/jni/Library.properties 2011-07-13 16:31:38 UTC (rev
1781)
+++ trunk/java/org/apache/tomcat/jni/Library.properties 2011-07-18 15:33:35 UTC (rev
1782)
@@ -56,3 +56,12 @@
hpux.4=?libcrypto.sl
hpux.5=?libssl.sl
hpux.6=libtcnative-1.sl
+
+macosx.count=7
+macosx.0=libapr-1.dylib
+macosx.1=?libexpat.dylib
+macosx.2=?libaprutil-1.dylib
+macosx.3=?libz.dylib
+macosx.4=?libcrypto.dylib
+macosx.5=?libssl.dylib
+macosx.6=libtcnative-1.dylib
Modified: trunk/java/org/apache/tomcat/jni/LibraryLoader.java
===================================================================
--- trunk/java/org/apache/tomcat/jni/LibraryLoader.java 2011-07-13 16:31:38 UTC (rev
1781)
+++ trunk/java/org/apache/tomcat/jni/LibraryLoader.java 2011-07-18 15:33:35 UTC (rev
1782)
@@ -54,6 +54,14 @@
else if (name.equals("AIX"))
platform = "aix";
+ return platform;
+ }
+
+ public static String getDefaultPlatformNameVersion()
+ {
+ String platform = getDefaultPlatformName();
+
+
if (platform.equals("solaris")) {
// Add the version...
String version = System.getProperty("os.version");
@@ -90,7 +98,7 @@
public static String getDefaultLibraryPath()
{
- String name = getDefaultPlatformName();
+ String name = getDefaultPlatformNameVersion();
String arch = getDefaultPlatformCpu();
return name + File.separator + arch;
@@ -136,7 +144,7 @@
count = Integer.parseInt(props.getProperty(name + ".count"));
}
catch (Throwable t) {
- throw new UnsatisfiedLinkError("Can't use
Library.properties");
+ throw new UnsatisfiedLinkError("Can't use Library.properties for:
" + name);
}
for (int i = 0; i < count; i++) {
boolean optional = false;