[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Proposed patch to SVNClientAdapter

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2004-11-22 20:25:54 CET

I am working with a custom build of JavaHL where I do not need BerkeleyDB.
 In this case, Subclipse fails to load the JavaHL library, because it is
doing its own dependency checking.

I do not see any value in the extra checks that were added to the
Subclipse. Perhaps, if when a particular library failed to load it showed
an error message with a reference to that specific library, there could be
some benefit to this, but in general I do not think it is a good idea. On
some platforms, JavaHL could be entirely statically linked. The trapping
of the error in loading the JavaHL library itself should be sufficient to
get what is needed from this feature.

I also changed the order in which it tries to load the JavaHL libraries.
The first value it tries is the current name of the library in Subversion
1.1, at least on Windows.

If no one has any objections, I will commit this tomorrow.

Thanks

Mark

Index:
C:/workspaces/subclipse/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapter.java
===================================================================
---
C:/workspaces/subclipse/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapter.java
(revision 1080)
+++
C:/workspaces/subclipse/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter/javahl/JhlClientAdapter.java
(working copy)
@@ -89,15 +89,6 @@
                    // if library is already loaded, it will not be
reloaded
 
                        //workaround to solve Subclipse ISSUE #83
- if(SystemUtils.IS_OS_WINDOWS) {
- System.loadLibrary("libapr");
- System.loadLibrary("libapriconv");
- System.loadLibrary("libeay32");
- System.loadLibrary("libdb42");
- System.loadLibrary("ssleay32");
- System.loadLibrary("libaprutil");
- }
- //workaround to solve Subclipse ISSUE #83
 
                    /*
                     * first try to load the library by the new name.
@@ -105,13 +96,13 @@
                     */
                    try
                    {
- System.loadLibrary("svnjavahl-1");
+ System.loadLibrary("libsvnjavahl-1");
                    }
                    catch(UnsatisfiedLinkError ex)
                    {
                        try
                        {
- System.loadLibrary("libsvnjavahl-1");
+ System.loadLibrary("svnjavahl-1");
                        }
                        catch (UnsatisfiedLinkError e)
                        {

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Tue Nov 23 06:25:54 2004

This is an archived mail posted to the Subclipse Dev mailing list.