[jbossweb-commits] JBossWeb SVN: r1719 - trunk/java/org/apache/tomcat/jni.
Author: jfrederic.clere(a)jboss.com
Date: 2011-05-04 10:20:51 -0400 (Wed, 04 May 2011)
New Revision: 1719
Modified:
trunk/java/org/apache/tomcat/jni/Library.java
trunk/java/org/apache/tomcat/jni/Library.properties
trunk/java/org/apache/tomcat/jni/LibraryLoader.java
Log:
Allow the new jbossnative simple packages.
Modified: trunk/java/org/apache/tomcat/jni/Library.java
===================================================================
--- trunk/java/org/apache/tomcat/jni/Library.java 2011-05-04 14:17:17 UTC (rev 1718)
+++ trunk/java/org/apache/tomcat/jni/Library.java 2011-05-04 14:20:51 UTC (rev 1719)
@@ -62,6 +62,7 @@
break;
}
if (!loaded) {
+ err += " (LibraryLoader.load()): ";
try {
LibraryLoader.load(System.getProperty("catalina.home"));
loaded = true;
Modified: trunk/java/org/apache/tomcat/jni/Library.properties
===================================================================
--- trunk/java/org/apache/tomcat/jni/Library.properties 2011-05-04 14:17:17 UTC (rev
1718)
+++ trunk/java/org/apache/tomcat/jni/Library.properties 2011-05-04 14:20:51 UTC (rev
1719)
@@ -22,17 +22,18 @@
#
# Library.properties
#
-windows.count=5
-windows.0=libapr-1.dll
-windows.1=libaprutil-1.dll
-windows.2=?libeay32.dll
-windows.3=?ssleay32.dll
-windows.4=libtcnative-1.dll
+windows.count=6
+windows.0=*tcnative-1.dll
+windows.1=libapr-1.dll
+windows.2=libaprutil-1.dll
+windows.3=?libeay32.dll
+windows.4=?ssleay32.dll
+windows.5=libtcnative-1.dll
linux2.count=7
linux2.0=libapr-1.so
-linux2.1=libexpat.so
-linux2.2=libaprutil-1.so
+linux2.1=?libexpat.so
+linux2.2=?libaprutil-1.so
linux2.3=?libz.so
linux2.4=?libcrypto.so
linux2.5=?libssl.so
@@ -40,8 +41,8 @@
solaris.count=7
solaris.0=libapr-1.so
-solaris.1=libexpat.so
-solaris.2=libaprutil-1.so
+solaris.1=?libexpat.so
+solaris.2=?libaprutil-1.so
solaris.3=?libz.so
solaris.4=?libcrypto.so
solaris.5=?libssl.so
@@ -49,8 +50,8 @@
hpux.count=7
hpux.0=libapr-1.sl
-hpux.1=libexpat.sl
-hpux.2=libaprutil-1.sl
+hpux.1=?libexpat.sl
+hpux.2=?libaprutil-1.sl
hpux.3=?libz.sl
hpux.4=?libcrypto.sl
hpux.5=?libssl.sl
Modified: trunk/java/org/apache/tomcat/jni/LibraryLoader.java
===================================================================
--- trunk/java/org/apache/tomcat/jni/LibraryLoader.java 2011-05-04 14:17:17 UTC (rev
1718)
+++ trunk/java/org/apache/tomcat/jni/LibraryLoader.java 2011-05-04 14:20:51 UTC (rev
1719)
@@ -131,11 +131,17 @@
}
for (int i = 0; i < count; i++) {
boolean optional = false;
+ boolean full = false;
String dlibName = props.getProperty(name + "." + i);
if (dlibName.startsWith("?")) {
dlibName = dlibName.substring(1);
optional = true;
}
+ if (dlibName.startsWith("*")) {
+ /* On windoze we can have a single library that contains all the stuff we
need */
+ dlibName = dlibName.substring(1);
+ full = true;
+ }
String fullPath = metaPath + path +
File.separator + dlibName;
try {
@@ -151,6 +157,8 @@
}
}
}
+ if (full)
+ break;
}
}