Finish deorbiting libjuafs.a

Change I2074d5bc26e326db36b16e055431818ef1c69210 removed the separate
compilation/link of a libjuafs.a (since it was functionally identical
to the libuafs.a already being built), but retained a libjuafs.a in
TOP_LIBDIR for use by src/JAVA/libjafs/.

This commit adjusts src/JAVA/libjafs to refer to libuafs.a directly,
and removes references to libjuafs.a which are no longer relevant.

Change-Id: I0d02ea9e4be773ac50a04925c45e5f243650e21a
Reviewed-on: http://gerrit.openafs.org/11526
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: D Brashear <shadow@your-file-system.com>

diff --git a/src/JAVA/libjafs/JAFS_README b/src/JAVA/libjafs/JAFS_README
index 3939201..f504ef6 100644 (file)
--- a/src/JAVA/libjafs/JAFS_README
+++ b/src/JAVA/libjafs/JAFS_README
@@ -73,25 +73,7 @@ the Jafs API.
 *** BUILD ***
 
 The first step in compiling your own versions of the library and jar file
-is to download the OpenAFS source code.  If the code doesn't contain the
-libjuafs version of the libuafs library -- noted by the README file located
-in the src/libuafs directory (if a README file doesn't exist in this directory
-then the libjuafs patch (libuafs.diff) has not been applied) -- you must 
-first apply the libjuafs patch. You can apply the libjuafs patch with the 
-following command, executed from the root directory of the download code 
-(i.e. openafs-1.2.4/):
-
-  patch -p1 < libuafs.diff
-
-Next, if the code doesn't contain the src/JAVA/libjafs directory, you can 
-apply the jafs patch to it with the following command, executed from the 
-root directory of the download code (i.e. openafs-1.2.4/):
-
-  patch -p1 < jafs.diff
-
-Note that the source code you download needs to be newer than 4/22/02,
-in order for the full functionality of the API to be effective.  Otherwise,
-you may experience link errors.
+is to download the OpenAFS source code.
 
 From that same directory, run the configure script as you normally would 
 to compile OpenAFS, but run it with a java_home argument so the script can

diff --git a/src/JAVA/libjafs/Makefile.in b/src/JAVA/libjafs/Makefile.in
index 1e90c84..9bfa65b 100644 (file)
--- a/src/JAVA/libjafs/Makefile.in
+++ b/src/JAVA/libjafs/Makefile.in
@@ -150,7 +150,7 @@ UTILADMINLIB = ${TOP_LIBDIR}/libafsadminutil.a
 CLIENTADMINLIB = ${TOP_LIBDIR}/libclientadmin.a
 
 LIBJAFS_LIBS =\
-       ${TOP_LIBDIR}/libjuafs.a \
+       ${TOP_LIBDIR}/libuafs.a \
        ${TOP_LIBDIR}/libafsutil.a \
        -lresolv \
        -lpthread

diff --git a/src/TechNotes-JavaAPI b/src/TechNotes-JavaAPI
index 52ddd24..e761e28 100644 (file)
--- a/src/TechNotes-JavaAPI
+++ b/src/TechNotes-JavaAPI
@@ -26,12 +26,6 @@ occurs in this code or in another C library, a Java exception is
 constructed with the appropriate error code, and is thrown back to the 
 Java layer to be dealt with.
 
-In order to provide user-level functions such as ACL setting and mount
-point iteration, the shared library needs to be linked with a specialized
-version of libuafs called libjuafs.a. Please view the README file in the 
-src/libuafs directory for more information regarding libjuafs and how it 
-is built. 
-
 Java package
 ------------
 

diff --git a/src/libuafs/Makefile.common.in b/src/libuafs/Makefile.common.in
index fafcbc6..eff5350 100644 (file)
--- a/src/libuafs/Makefile.common.in
+++ b/src/libuafs/Makefile.common.in
@@ -183,7 +183,7 @@ MODULE_INCLUDE = -I. -I.. -I../nfs \
 
 # Build rules - CC and CFLAGS are defined in system specific MakefileProtos.
 
-all: ${TOP_LIBDIR}/libjuafs.a ${TOP_LIBDIR}/libuafs.a libuafs.la \
+all: ${TOP_LIBDIR}/libuafs.a \
        ${TOP_LIBDIR}/libuafs_pic.a linktest @LIBUAFS_BUILD_PERL@
 
 ${TOP_LIBDIR}/libuafs.a: libuafs.a
@@ -192,9 +192,6 @@ ${TOP_LIBDIR}/libuafs.a: libuafs.a
 ${TOP_LIBDIR}/libuafs_pic.a: libuafs_pic.la
        ${INSTALL_DATA} .libs/libuafs_pic.a $@
 
-${TOP_LIBDIR}/libjuafs.a: libuafs.a
-       ${INSTALL_DATA} libuafs.a $@
-
 libuafs.la: h $(LT_objs)
        $(LT_LDLIB_shlib) $(LT_objs)
 
@@ -506,7 +503,6 @@ clean:
 install: libuafs.a libuafs_pic.la @LIBUAFS_BUILD_PERL@
        ${INSTALL} -d ${DESTDIR}${libdir}
        ${INSTALL_DATA} libuafs.a ${DESTDIR}${libdir}/libuafs.a
-       ${INSTALL_DATA} libuafs.a ${DESTDIR}${libdir}/libjuafs.a
        ${INSTALL_DATA} .libs/libuafs_pic.a ${DESTDIR}${libdir}/libuafs_pic.a
        if [ "x$(LIBUAFS_BUILD_PERL)" != "x" ] ; then \
                ${INSTALL} -d ${DESTDIR}${libdir}/perl; \
@@ -537,7 +533,6 @@ dest: $(TOP_INCDIR)/afs/param.h $(TOP_INCDIR)/afs/stds.h \
        ${INSTALL_DATA} $(TOP_SRCDIR)/afs/UKERNEL/afs_usrops.h \
                ${DEST}/root.perf/include/afs/afs_usrops.h
        ${INSTALL_DATA} libuafs.a ${DEST}/root.perf/lib/libuafs.a
-       ${INSTALL_DATA} libuafs.a ${DEST}/root.perf/lib/libjuafs.a
        ${INSTALL_DATA} .libs/libuafs_pic.a ${DEST}/root.perf/lib/libuafs_pic.a
        if [ "x$(LIBUAFS_BUILD_PERL)" != "x" ] ; then \
                ${INSTALL} -d ${DEST}/root.perf/lib/perl; \

diff --git a/src/libuafs/README b/src/libuafs/README
index 051b17d..dc7ff4f 100644 (file)
--- a/src/libuafs/README
+++ b/src/libuafs/README
@@ -5,16 +5,13 @@ This software has been released under the terms of the IBM Public
 License.  For details, see the LICENSE file in the top-level source
 directory or online at http://www.openafs.org/dl/license10.html.
 
-README file for libuafs and libjuafs, Version 1.2 06/04/2003.
+README file for libuafs, Version 1.2 06/04/2003.
 
 
 ### INTRODUCTION ###
 
 This Makefile generates two libraries, the standard libuafs.a and
 libuafs_pic.a, suitable for linking into shared libraries.
-It installs libuafs.a as both itself and libjuafs.a, for use with
-Java-enabled applications which expect that name, for historical
-compatibility (see src/JAVA/libjafsadm/JAFSADM_README).
 
 The libuafs.a library facilitates user authentication at a process
 level and enables access and manipulation of the files and access
@@ -48,9 +45,3 @@ The libuafs/UAFS directory is generated by the Makefile and contains the
 object files and local copy of libuafs.a resulting from the build process.
 The libuafs/UAFS.pic directory is the same as libuafs/UAFS, however it
 contains output files respective to libuafs_pic.a.
-
-
-### CONSIDERATIONS ###
-
-The libjuafs.a library has only been tested using RedHat Linux 7.3 and
-OpenAFS 1.2.6, OpenAFS 1.2.7, OpenAFS 1.2.8, and OpenAFS 1.2.9.

diff --git a/src/packaging/FreeBSD/pkg-plist b/src/packaging/FreeBSD/pkg-plist
index 21f6f26..fac7b53 100644 (file)
--- a/src/packaging/FreeBSD/pkg-plist
+++ b/src/packaging/FreeBSD/pkg-plist
@@ -206,7 +206,6 @@ lib/libuafs.a
 lib/libubik.a
 lib/libafsrpc.a
 lib/pam_afs.krb.so.1
-lib/libjuafs.a
 lib/pam_afs.so.1
 lib/libafsrpc_pic.a
 lib/libafsrpc.so.1.5