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