Attachment #157531 for bug #245778

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 245778
Collapse All | Expand All

Lines 1-2 Link Here

(-)libs.svnClientAdapter.javahl/external/binaries-list (-2 / +2 lines)
1	D08E473A4D0510FB329D64E4CC4F2963D000699C svnClientAdapter-javahl-1.10.3.jar	1	A0B50778562564256D1212206774924C346B8EFD svnClientAdapter-javahl-1.11.3.jar
2	24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2 svnjavahl-1.8.4.jar	2	90F6B5D1DB94BC748CB265DDB832E189C615D009 svnjavahl-1.9.2.jar

Lines 43-50 Link Here

(-)libs.svnClientAdapter.javahl/nbproject/project.properties (-2 / +2 lines)
43		43
44	is.eager=true	44	is.eager=true
45	javac.source=1.6	45	javac.source=1.6
46	release.external/svnClientAdapter-javahl-1.10.3.jar=modules/ext/svnClientAdapter-javahl.jar	46	release.external/svnClientAdapter-javahl-1.11.3.jar=modules/ext/svnClientAdapter-javahl.jar
47	release.external/svnjavahl-1.8.4.jar=modules/ext/svnjavahl.jar	47	release.external/svnjavahl-1.9.2.jar=modules/ext/svnjavahl.jar
48		48
49	# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine	49	# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine
50	# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine	50	# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine

Lines 104-114 Link Here

(-)libs.svnClientAdapter.javahl/nbproject/project.xml (-2 / +2 lines)
104	<public-packages/>	104	<public-packages/>
105	<class-path-extension>	105	<class-path-extension>
106	<runtime-relative-path>ext/svnClientAdapter-javahl.jar</runtime-relative-path>	106	<runtime-relative-path>ext/svnClientAdapter-javahl.jar</runtime-relative-path>
107	<binary-origin>external/svnClientAdapter-javahl-1.10.3.jar</binary-origin>	107	<binary-origin>external/svnClientAdapter-javahl-1.11.3.jar</binary-origin>
108	</class-path-extension>	108	</class-path-extension>
109	<class-path-extension>	109	<class-path-extension>
110	<runtime-relative-path>ext/svnjavahl.jar</runtime-relative-path>	110	<runtime-relative-path>ext/svnjavahl.jar</runtime-relative-path>
111	<binary-origin>external/svnjavahl-1.8.4.jar</binary-origin>	111	<binary-origin>external/svnjavahl-1.9.2.jar</binary-origin>
112	</class-path-extension>	112	</class-path-extension>
113	</data>	113	</data>
114	</configuration>	114	</configuration>

Lines 1-4 Link Here

(-)libs.svnClientAdapter.svnkit/external/binaries-list (+1 lines)
1	5D37A7FE167A1D44731192748C79B2D7905D474F svnClientAdapter-svnkit-1.10.3.jar	1	5D37A7FE167A1D44731192748C79B2D7905D474F svnClientAdapter-svnkit-1.10.3.jar
		2	39CC9E12AD77EBE0E991A547547F3D9FA91299DA svnClientAdapter-svnkit-1.11.3.jar
2	8307A44D3F150F1BB317532097A0C7D125C00F2D org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar	3	8307A44D3F150F1BB317532097A0C7D125C00F2D org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
3	EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA sqljet-1.1.10.jar	4	EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA sqljet-1.1.10.jar
4	ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5 com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar	5	ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5 com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar

Lines 43-49 Link Here

(-)libs.svnClientAdapter.svnkit/nbproject/project.properties (-1 / +1 lines)
43		43
44	is.eager=true	44	is.eager=true
45	javac.source=1.6	45	javac.source=1.6
46	release.external/svnClientAdapter-svnkit-1.10.3.jar=modules/ext/svnClientAdapter-svnkit.jar	46	release.external/svnClientAdapter-svnkit-1.11.3.jar=modules/ext/svnClientAdapter-svnkit.jar
47	release.external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar=modules/ext/svnkit.jar	47	release.external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar=modules/ext/svnkit.jar
48	release.external/sqljet-1.1.10.jar=modules/ext/sqljet.jar	48	release.external/sqljet-1.1.10.jar=modules/ext/sqljet.jar
49	release.external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar=modules/ext/trilead.ssh2.jar	49	release.external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar=modules/ext/trilead.ssh2.jar

Lines 97-103 Link Here

(-)libs.svnClientAdapter.svnkit/nbproject/project.xml (-1 / +1 lines)
97	<public-packages/>	97	<public-packages/>
98	<class-path-extension>	98	<class-path-extension>
99	<runtime-relative-path>ext/svnClientAdapter-svnkit.jar</runtime-relative-path>	99	<runtime-relative-path>ext/svnClientAdapter-svnkit.jar</runtime-relative-path>
100	<binary-origin>external/svnClientAdapter-svnkit-1.10.3.jar</binary-origin>	100	<binary-origin>external/svnClientAdapter-svnkit-1.11.3.jar</binary-origin>
101	</class-path-extension>	101	</class-path-extension>
102	<class-path-extension>	102	<class-path-extension>
103	<runtime-relative-path>ext/svnkit.jar</runtime-relative-path>	103	<runtime-relative-path>ext/svnkit.jar</runtime-relative-path>

Line 1 Link Here

(-)libs.svnClientAdapter/external/binaries-list (-1 / +1 lines)
1	2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D svnClientAdapter-main-1.10.3.jar	1	2D7BC3E7B4F459C612AD41ABCC7645D1D3F39BA2 svnClientAdapter-main-1.11.3.jar

Lines 43-49 Link Here

(-)libs.svnClientAdapter/nbproject/project.properties (-1 / +1 lines)
43	is.autoload=true	43	is.autoload=true
44		44
45	javac.source=1.6	45	javac.source=1.6
46	release.external/svnClientAdapter-main-1.10.3.jar=modules/ext/svnClientAdapter-main.jar	46	release.external/svnClientAdapter-main-1.11.3.jar=modules/ext/svnClientAdapter-main.jar
47		47
48	# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine	48	# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine
49	# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine	49	# Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine

Lines 92-98 Link Here

(-)libs.svnClientAdapter/nbproject/project.xml (-1 / +1 lines)
92	</friend-packages>	92	</friend-packages>
93	<class-path-extension>	93	<class-path-extension>
94	<runtime-relative-path>ext/svnClientAdapter-main.jar</runtime-relative-path>	94	<runtime-relative-path>ext/svnClientAdapter-main.jar</runtime-relative-path>
95	<binary-origin>external/svnClientAdapter-main-1.10.3.jar</binary-origin>	95	<binary-origin>external/svnClientAdapter-main-1.11.3.jar</binary-origin>
96	</class-path-extension>	96	</class-path-extension>
97	</data>	97	</data>
98	</configuration>	98	</configuration>




    private static final SvnModuleConfig INSTANCE = new SvnModuleConfig();    
        
    private Map<String, Object[]> urlCredentials;
    private String userPreferredFactory = "";
    
    public static SvnModuleConfig getDefault() {
        return INSTANCE;

            getPreferences().put(PROP_PREFERRED_FACTORY, preferredFactory);
            setForceCommnandlineClient(false);
            factory = ""; // override the global setting
            userPreferredFactory = preferredFactory;
        }
    }


        }
        return factory;
    }

    public String getForcedSvnFactory () {
        String fact = getGlobalSvnFactory();
        if (fact.isEmpty()) {
            fact = userPreferredFactory;
        }
        return fact;
    }
}




        String jhlInitFile = Places.getUserDirectory().getAbsolutePath() + "/config/svn/jhlinit";
        File initFile = new File(jhlInitFile);

        if(checkJavahlCrash(initFile) && !SvnClientFactory.FACTORY_TYPE_JAVAHL.equals(SvnModuleConfig.getDefault().getForcedSvnFactory())) {
            return false;
        }
        try {
            initFile.delete();
            initFile.createNewFile();
        } catch (IOException ex) {
            // should not happen
            LOG.log(Level.INFO, null, ex);

Return to bug 245778

Lines 284-294 Link Here

(-)subversion/src/org/netbeans/modules/subversion/client/SvnClientFactory.java (-2 / +3 lines)
284	String jhlInitFile = Places.getUserDirectory().getAbsolutePath() + "/config/svn/jhlinit";	284	String jhlInitFile = Places.getUserDirectory().getAbsolutePath() + "/config/svn/jhlinit";
285	File initFile = new File(jhlInitFile);	285	File initFile = new File(jhlInitFile);
286		286
287	if(checkJavahlCrash(initFile)) {	287	if(checkJavahlCrash(initFile) && !SvnClientFactory.FACTORY_TYPE_JAVAHL.equals(SvnModuleConfig.getDefault().getForcedSvnFactory())) {
288	return false;	288	return false;
289	}	289	}
290	try {	290	try {
291	if(!initFile.exists()) initFile.createNewFile();	291	initFile.delete();
		292	initFile.createNewFile();
292	} catch (IOException ex) {	293	} catch (IOException ex) {
293	// should not happen	294	// should not happen
294	LOG.log(Level.INFO, null, ex);	295	LOG.log(Level.INFO, null, ex);

Lines 110-115 Link Here

(-)subversion/src/org/netbeans/modules/subversion/SvnModuleConfig.java (+10 lines)
110	private static final SvnModuleConfig INSTANCE = new SvnModuleConfig();	110	private static final SvnModuleConfig INSTANCE = new SvnModuleConfig();
111		111
112	private Map<String, Object[]> urlCredentials;	112	private Map<String, Object[]> urlCredentials;
		113	private String userPreferredFactory = "";
113		114
114	public static SvnModuleConfig getDefault() {	115	public static SvnModuleConfig getDefault() {
115	return INSTANCE;	116	return INSTANCE;
Lines 596-601 Link Here
596	getPreferences().put(PROP_PREFERRED_FACTORY, preferredFactory);	597	getPreferences().put(PROP_PREFERRED_FACTORY, preferredFactory);
597	setForceCommnandlineClient(false);	598	setForceCommnandlineClient(false);
598	factory = ""; // override the global setting	599	factory = ""; // override the global setting
		600	userPreferredFactory = preferredFactory;
599	}	601	}
600	}	602	}
601		603
Lines 605-608 Link Here
605	}	607	}
606	return factory;	608	return factory;
607	}	609	}
		610
		611	public String getForcedSvnFactory () {
		612	String fact = getGlobalSvnFactory();
		613	if (fact.isEmpty()) {
		614	fact = userPreferredFactory;
		615	}
		616	return fact;
		617	}
608	}	618	}