From 1e4dfcfbf00a9b17418bccc0dc746fd9a71f3a06 Mon Sep 17 00:00:00 2001 From: Michael McMahon Date: Tue, 27 Mar 2012 21:08:52 +0100 Subject: [PATCH] 7134701: [macosx] Support legacy native library names Reviewed-by: alanb, dcubed --- jdk/make/java/java/FILES_java.gmk | 1 + .../classes/java/lang/ClassLoaderHelper.java | 47 +++++++++++++++++++ .../share/classes/java/lang/ClassLoader.java | 10 +++- .../classes/java/lang/ClassLoaderHelper.java | 42 +++++++++++++++++ .../classes/java/lang/ClassLoaderHelper.java | 42 +++++++++++++++++ 5 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java create mode 100644 jdk/src/solaris/classes/java/lang/ClassLoaderHelper.java create mode 100644 jdk/src/windows/classes/java/lang/ClassLoaderHelper.java diff --git a/jdk/make/java/java/FILES_java.gmk b/jdk/make/java/java/FILES_java.gmk index 7a6d93a8f37..01529b4f9b1 100644 --- a/jdk/make/java/java/FILES_java.gmk +++ b/jdk/make/java/java/FILES_java.gmk @@ -51,6 +51,7 @@ JAVA_JAVA_java = \ java/lang/SuppressWarnings.java \ java/lang/AbstractStringBuilder.java \ java/lang/ClassLoader.java \ + java/lang/ClassLoaderHelper.java \ java/lang/AssertionStatusDirectives.java \ java/lang/Enum.java \ java/lang/StrictMath.java \ diff --git a/jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java b/jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java new file mode 100644 index 00000000000..22f500f52af --- /dev/null +++ b/jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.lang; + +import java.io.File; + +class ClassLoaderHelper { + + private ClassLoaderHelper() {} + + /** + * Returns an alternate path name for the given file + * such that if the original pathname did not exist, then the + * file may be located at the alternate location. + * For mac, this replaces the final .dylib suffix with .jnilib + */ + static File mapAlternativeName(File lib) { + String name = lib.toString(); + int index = name.lastIndexOf('.'); + if (index < 0) { + return null; + } + return new File(name.substring(0, index) + ".jnilib"); + } +} diff --git a/jdk/src/share/classes/java/lang/ClassLoader.java b/jdk/src/share/classes/java/lang/ClassLoader.java index 3dc1a1076b5..8f73b05f2d2 100644 --- a/jdk/src/share/classes/java/lang/ClassLoader.java +++ b/jdk/src/share/classes/java/lang/ClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1847,6 +1847,10 @@ public abstract class ClassLoader { if (loadLibrary0(fromClass, libfile)) { return; } + libfile = ClassLoaderHelper.mapAlternativeName(libfile); + if (libfile != null && loadLibrary0(fromClass, libfile)) { + return; + } } if (loader != null) { for (int i = 0 ; i < usr_paths.length ; i++) { @@ -1855,6 +1859,10 @@ public abstract class ClassLoader { if (loadLibrary0(fromClass, libfile)) { return; } + libfile = ClassLoaderHelper.mapAlternativeName(libfile); + if (libfile != null && loadLibrary0(fromClass, libfile)) { + return; + } } } // Oops, it failed diff --git a/jdk/src/solaris/classes/java/lang/ClassLoaderHelper.java b/jdk/src/solaris/classes/java/lang/ClassLoaderHelper.java new file mode 100644 index 00000000000..f9baf8ac6c7 --- /dev/null +++ b/jdk/src/solaris/classes/java/lang/ClassLoaderHelper.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.lang; + +import java.io.File; + +class ClassLoaderHelper { + + private ClassLoaderHelper() {} + + /** + * Returns an alternate path name for the given file + * such that if the original pathname did not exist, then the + * file may be located at the alternate location. + * For most platforms, this behavior is not supported and returns null. + */ + static File mapAlternativeName(File lib) { + return null; + } +} diff --git a/jdk/src/windows/classes/java/lang/ClassLoaderHelper.java b/jdk/src/windows/classes/java/lang/ClassLoaderHelper.java new file mode 100644 index 00000000000..f9baf8ac6c7 --- /dev/null +++ b/jdk/src/windows/classes/java/lang/ClassLoaderHelper.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.lang; + +import java.io.File; + +class ClassLoaderHelper { + + private ClassLoaderHelper() {} + + /** + * Returns an alternate path name for the given file + * such that if the original pathname did not exist, then the + * file may be located at the alternate location. + * For most platforms, this behavior is not supported and returns null. + */ + static File mapAlternativeName(File lib) { + return null; + } +}