Attachment #36480 for bug #86555

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 86555
Collapse All | Expand All

Lines 357-363 Link Here

(-)javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ClientRuntime.java (-1 / +2 lines)
357	// I prefer the cvs style, see issue #62683 for details.	357	// I prefer the cvs style, see issue #62683 for details.
358		358
359	String command = extSettings.extCommand;	359	String command = extSettings.extCommand;
360	String cvs_server = System.getProperty("Env-CVS_SERVER", "cvs") + " server"; // NOI18N	360	String cvs_server = System.getenv("CVS_SERVER");
		361	cvs_server = cvs_server != null? cvs_server + " server": "cvs server"; // NOI18N
361	String userOption = ""; // NOI18N	362	String userOption = ""; // NOI18N
362	if ( userName != null ) {	363	if ( userName != null ) {
363	userOption = " -l " + userName; // NOI18N	364	userOption = " -l " + userName; // NOI18N

Lines 143-149 Link Here

(-)javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/CvsModuleConfig.java (-2 / +2 lines)
143	ExtSettings extSettings = rootSettings.extSettings;	143	ExtSettings extSettings = rootSettings.extSettings;
144	if (extSettings != null) {	144	if (extSettings != null) {
145	if (extSettings.extUseInternalSsh == false && extSettings.extCommand == null) {	145	if (extSettings.extUseInternalSsh == false && extSettings.extCommand == null) {
146	extSettings.extCommand = System.getProperty("Env-CVS_RSH"); // NOI18N	146	extSettings.extCommand = System.getenv("CVS_RSH"); // NOI18N
147	}	147	}
148	return extSettings;	148	return extSettings;
149	}	149	}
Lines 152-158 Link Here
152	// hardcoded default value	152	// hardcoded default value
153	ExtSettings defaults = new ExtSettings();	153	ExtSettings defaults = new ExtSettings();
154	defaults.extRememberPassword = false;	154	defaults.extRememberPassword = false;
155	defaults.extCommand = System.getProperty("Env-CVS_RSH"); // NOI18N	155	defaults.extCommand = System.getenv("CVS_RSH"); // NOI18N
156	defaults.extUseInternalSsh = true;	156	defaults.extUseInternalSsh = true;
157	defaults.extPassword = null;	157	defaults.extPassword = null;
158	return defaults;	158	return defaults;

Lines 42-48 Link Here

(-)javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/SSHConnection.java (-1 / +2 lines)
42	*/	42	*/
43	public class SSHConnection extends AbstractConnection {	43	public class SSHConnection extends AbstractConnection {
44		44
45	private static final String CVS_SERVER_COMMAND = System.getProperty("Env-CVS_SERVER", "cvs") + " server"; // NOI18N	45	private static final String CVS_SERVER_COMMAND = System.getenv("CVS_SERVER") != null?
		46	System.getenv("CVS_SERVER") + " server": "cvs server"; // NOI18N
46		47
47	private final SocketFactory socketFactory;	48	private final SocketFactory socketFactory;
48	private final String host;	49	private final String host;

Lines 268-274 Link Here

(-)javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/wizards/RepositoryStep.java (-1 / +2 lines)
268	if ( userName != null) {	268	if ( userName != null) {
269	userOption = " -l " + userName; // NOI18N	269	userOption = " -l " + userName; // NOI18N
270	}	270	}
271	String cvs_server = System.getProperty("Env-CVS_SERVER", "cvs") + " server"; // NOI18N	271	String cvs_server = System.getenv("CVS_SERVER") != null?
		272	System.getenv("CVS_SERVER") + " server": "cvs server"; // NOI18N
272	command += " " + host + userOption + " " + cvs_server; // NOI18N	273	command += " " + host + userOption + " " + cvs_server; // NOI18N
273	ExtConnection econnection = new ExtConnection(command);	274	ExtConnection econnection = new ExtConnection(command);
274	econnection.setRepository(root.getRepository());	275	econnection.setRepository(root.getRepository());




     * Reads the wrappers from the specified System property and populates the specified
     * map. The map is unchanged if the property is not set.
     *
     * @param envVar The system variable name
     * @param wrapperMap The map which is being updated
     */
    private static void readWrappersFromProperty(String envVar, Map wrapperMap) throws IOException {
        String propertyValue = System.getenv(envVar);
        if (propertyValue != null)
        {
            parseWrappers(new BufferedReader(new StringReader(propertyValue)), wrapperMap);

            wrapperSource = CommandException.getLocalMessage("WrapperUtils.environmentWrapper.text"); //NOI18N

            //process the Environment variable CVSWRAPPERS
            readWrappersFromProperty("CVSWRAPPERS", wrappersMap);   //NOI18N
        }
        catch (FileNotFoundException fnex) {
            // should not happen as we check for file existence. Even if it does

Lines 39-45 Link Here

(-)javacvs/libsrc/org/netbeans/lib/cvsclient/connection/LocalConnection.java (-1 / +2 lines)
39	*/	39	*/
40	public class LocalConnection extends AbstractConnection {	40	public class LocalConnection extends AbstractConnection {
41		41
42	private static final String CVS_EXE_COMMAND = System.getProperty("Env-CVS_EXE", "cvs") + " server"; // NOI18N	42	private static final String CVS_EXE_COMMAND = System.getenv("CVS_EXE") != null?
		43	System.getenv("CVS_EXE") + " server": "cvs server"; // NOI18N
43		44
44	/**	45	/**
45	* The CVS process that is being run.	46	* The CVS process that is being run.





        // assemble reasonable localized message

        String cvsServer = System.getenv("CVS_SERVER");  // NOI18N
        if (cvsServer == null) {
            cvsServer = "";  // NOI18N
        } else {
            cvsServer = "=" + cvsServer; // NOI18N
        }

        String cvsExe = System.getenv("CVS_EXE");  // NOI18N
        if (cvsExe == null) {
            cvsExe = "";  // NOI18N
        } else {

Return to bug 86555

Lines 89-99 Link Here

(-)javacvs/libsrc/org/netbeans/lib/cvsclient/command/WrapperUtils.java (-4 / +4 lines)
89	* Reads the wrappers from the specified System property and populates the specified	89	* Reads the wrappers from the specified System property and populates the specified
90	* map. The map is unchanged if the property is not set.	90	* map. The map is unchanged if the property is not set.
91	*	91	*
92	* @param propertyName The system properties name	92	* @param envVar The system variable name
93	* @param wrapperMap The map which is being updated	93	* @param wrapperMap The map which is being updated
94	*/	94	*/
95	public static void readWrappersFromProperty(String propertyName, Map wrapperMap) throws IOException {	95	private static void readWrappersFromProperty(String envVar, Map wrapperMap) throws IOException {
96	String propertyValue = System.getProperty(propertyName);	96	String propertyValue = System.getenv(envVar);
97	if (propertyValue != null)	97	if (propertyValue != null)
98	{	98	{
99	parseWrappers(new BufferedReader(new StringReader(propertyValue)), wrapperMap);	99	parseWrappers(new BufferedReader(new StringReader(propertyValue)), wrapperMap);
Lines 123-129 Link Here
123	wrapperSource = CommandException.getLocalMessage("WrapperUtils.environmentWrapper.text"); //NOI18N	123	wrapperSource = CommandException.getLocalMessage("WrapperUtils.environmentWrapper.text"); //NOI18N
124		124
125	//process the Environment variable CVSWRAPPERS	125	//process the Environment variable CVSWRAPPERS
126	readWrappersFromProperty("Env-CVSWRAPPERS", wrappersMap); //NOI18N	126	readWrappersFromProperty("CVSWRAPPERS", wrappersMap); //NOI18N
127	}	127	}
128	catch (FileNotFoundException fnex) {	128	catch (FileNotFoundException fnex) {
129	// should not happen as we check for file existence. Even if it does	129	// should not happen as we check for file existence. Even if it does

Lines 79-92 Link Here

(-)javacvs/libsrc/org/netbeans/lib/cvsclient/response/ResponseFactory.java (-2 / +2 lines)
79		79
80	// assemble reasonable localized message	80	// assemble reasonable localized message
81		81
82	String cvsServer = System.getProperty("Env-CVS_SERVER"); // XXX defined under NB IDE only // NOI18N	82	String cvsServer = System.getenv("CVS_SERVER"); // NOI18N
83	if (cvsServer == null) {	83	if (cvsServer == null) {
84	cvsServer = ""; // NOI18N	84	cvsServer = ""; // NOI18N
85	} else {	85	} else {
86	cvsServer = "=" + cvsServer; // NOI18N	86	cvsServer = "=" + cvsServer; // NOI18N
87	}	87	}
88		88
89	String cvsExe = System.getProperty("Env-CVS_EXE"); // XXX defined under NB IDE only // NOI18N	89	String cvsExe = System.getenv("CVS_EXE"); // NOI18N
90	if (cvsExe == null) {	90	if (cvsExe == null) {
91	cvsExe = ""; // NOI18N	91	cvsExe = ""; // NOI18N
92	} else {	92	} else {