Blob Blame History Raw
diff -Naur subclipse-1.1.9.original/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java subclipse-1.1.9/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java
--- subclipse-1.1.9.original/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java	2006-11-16 16:31:30.000000000 -0400
+++ subclipse-1.1.9/subclipse/core/src/org/tigris/subversion/subclipse/core/SVNClientManager.java	2006-12-21 08:21:36.000000000 -0400
@@ -52,9 +52,8 @@
      */
     public void setSvnClientInterface(String svnClientInterface) {
         if (svnClientInterface == null) {
-          // if no specific interface is specified, load JavaHL
-          // if JavaHL fails to load, then JavaSVN will load
-            loadJavaHLAdapter();
+          // if no specific interface is specified, load JavaSVN
+            loadSVNKitAdapter();
             try {
                 this.svnClientInterface = SVNClientAdapterFactory.getPreferredSVNClientType();
             } catch (SVNClientException e) {
@@ -138,7 +137,8 @@
 	}
 	
 	public void loadAdapters() {
-	    loadJavaHLAdapter();
+	    // disabling until classloader bug fix is available
+	    // loadJavaHLAdapter();
 	    loadSVNKitAdapter();
 	}
 	
diff -Naur subclipse-1.1.9.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java subclipse-1.1.9/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java
--- subclipse-1.1.9.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java	2006-11-16 16:31:30.000000000 -0400
+++ subclipse-1.1.9/subclipse/ui/src/org/tigris/subversion/subclipse/ui/preferences/SVNPreferencesPage.java	2006-12-21 08:23:40.000000000 -0400
@@ -177,7 +177,9 @@
 		group.setLayoutData(gridData);
 		layout = new GridLayout();
 		group.setLayout(layout); 	
+		// setting disabled until classloader problem is fixed
 		javahlRadio = createRadio(group, Policy.bind("SVNPreferencePage.svnjavahl"),1); //$NON-NLS-1$
+		javahlRadio.setEnabled(false);
 		svnKitRadio = createRadio(group, Policy.bind("SVNPreferencePage.javasvn"),1); //$NON-NLS-1$
         Listener checkInterfaceListener = new Listener() {
             public void handleEvent(Event event) {
diff -Naur subclipse-1.1.9.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java subclipse-1.1.9/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java
--- subclipse-1.1.9.original/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java	2006-11-16 16:31:30.000000000 -0400
+++ subclipse-1.1.9/subclipse/ui/src/org/tigris/subversion/subclipse/ui/Preferences.java	2006-12-21 08:19:46.000000000 -0400
@@ -81,7 +81,7 @@
 		store.setDefault(ISVNUIConstants.PREF_REMOVE_UNADDED_RESOURCES_ON_REPLACE, true);
         store.setDefault(ISVNUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT, false);
         
-        store.setDefault(ISVNUIConstants.PREF_SVNINTERFACE, JhlClientAdapterFactory.JAVAHL_CLIENT);
+        store.setDefault(ISVNUIConstants.PREF_SVNINTERFACE, SvnKitClientAdapterFactory.SVNKIT_CLIENT);
         store.setDefault(ISVNUIConstants.PREF_SVNCONFIGDIR, ""); //$NON-NLS-1$
         
         store.setDefault(ISVNUIConstants.PREF_FETCH_CHANGE_PATH_ON_DEMAND, false);