Attachment #124510 for bug #217956

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

Lines 24-27 Link Here

(-)a/selenium.server/src/org/netbeans/modules/selenium/server/Bundle.properties (-1 / +4 lines)
24		24
25	displayName_SingleWindow=Single Window	25	displayName_SingleWindow=Single Window
26	desc_SingleWindow=Should the browser started by selenium server use <br/> \	26	desc_SingleWindow=Should the browser started by selenium server use <br/> \
27	multiple frames in a single window or multiple windows.	27	multiple frames in a single window or multiple windows.
		28
		29	displayName_UserExtensions=Selenium User Extensions
		30	desc_UserExtensions=The User Extension file for Selenium Server




    public static final String START_ON_STARTUP = "Startup"; //NOI18N
    public static final String FIREFOX_PROFILE = "FirefoxProfile"; //NOI18N
    public static final String SINGLE_WINDOW = "SingleWindow"; //NOI18N
    public static final String USER_EXTENSIONS = "UserExtensions"; //NOI18N
    
    private static InstanceProperties instanceProps;
    private static final String NAMESPACE = "Selenium server properties namespace"; //NOI18N

        set.put(new ServerBoolProperty(START_ON_STARTUP, props));
        set.put(new ServerStringProperty(FIREFOX_PROFILE, props));
        set.put(new ServerBoolProperty(SINGLE_WINDOW, props));
        set.put(new ServerStringProperty(USER_EXTENSIONS, props));
        return sheet;
    }


                    instanceProps.putBoolean(START_ON_STARTUP, true);
                    instanceProps.putString(FIREFOX_PROFILE, ""); //NOI18N
                    instanceProps.putBoolean(SINGLE_WINDOW, false);
                    instanceProps.putString(USER_EXTENSIONS, ""); //NOI18N
                    allProps.add(instanceProps);
                }
            }




            }
            switch (action) {
                case START:
                    callSeleniumServerMethod("boot");
                    break;
                case STOP:
                    callSeleniumServerMethod("stop");
                    break;
                case RESTART:
                    callSeleniumServerMethod("stop");
                    callSeleniumServerMethod("boot");
                    break;
                case RELOAD:
                    callSeleniumServerMethod("stop");
                    server = null;
                    initializeServer();
                    callSeleniumServerMethod("boot");
                    break;
                default:
                    assert false : "Invalid option";

						remoteControlConfigurationInstance, ffProfileDir);
				}
		}
        String userExtensionsString = ip.getString(SeleniumProperties.USER_EXTENSIONS, ""); //NOI18N
        if (!userExtensionsString.isEmpty()) {
            File userExtensionFile = new File(userExtensionsString);
            if (userExtensionFile.exists()) {
                remoteControlConfiguration.getMethod("setUserExtensions", File.class).invoke( //NOI18N
                        remoteControlConfigurationInstance, userExtensionFile);
            }
        }
        
        server = seleniumServer.getConstructor(remoteControlConfiguration).
                newInstance(remoteControlConfigurationInstance);
    }

Return to bug 217956

Lines 66-71 Link Here

(-)a/selenium.server/src/org/netbeans/modules/selenium/server/SeleniumProperties.java (+3 lines)
66	public static final String START_ON_STARTUP = "Startup"; //NOI18N	66	public static final String START_ON_STARTUP = "Startup"; //NOI18N
67	public static final String FIREFOX_PROFILE = "FirefoxProfile"; //NOI18N	67	public static final String FIREFOX_PROFILE = "FirefoxProfile"; //NOI18N
68	public static final String SINGLE_WINDOW = "SingleWindow"; //NOI18N	68	public static final String SINGLE_WINDOW = "SingleWindow"; //NOI18N
		69	public static final String USER_EXTENSIONS = "UserExtensions"; //NOI18N
69		70
70	private static InstanceProperties instanceProps;	71	private static InstanceProperties instanceProps;
71	private static final String NAMESPACE = "Selenium server properties namespace"; //NOI18N	72	private static final String NAMESPACE = "Selenium server properties namespace"; //NOI18N
Lines 78-83 Link Here
78	set.put(new ServerBoolProperty(START_ON_STARTUP, props));	79	set.put(new ServerBoolProperty(START_ON_STARTUP, props));
79	set.put(new ServerStringProperty(FIREFOX_PROFILE, props));	80	set.put(new ServerStringProperty(FIREFOX_PROFILE, props));
80	set.put(new ServerBoolProperty(SINGLE_WINDOW, props));	81	set.put(new ServerBoolProperty(SINGLE_WINDOW, props));
		82	set.put(new ServerStringProperty(USER_EXTENSIONS, props));
81	return sheet;	83	return sheet;
82	}	84	}
83		85
Lines 121-126 Link Here
121	instanceProps.putBoolean(START_ON_STARTUP, true);	123	instanceProps.putBoolean(START_ON_STARTUP, true);
122	instanceProps.putString(FIREFOX_PROFILE, ""); //NOI18N	124	instanceProps.putString(FIREFOX_PROFILE, ""); //NOI18N
123	instanceProps.putBoolean(SINGLE_WINDOW, false);	125	instanceProps.putBoolean(SINGLE_WINDOW, false);
		126	instanceProps.putString(USER_EXTENSIONS, ""); //NOI18N
124	allProps.add(instanceProps);	127	allProps.add(instanceProps);
125	}	128	}
126	}	129	}

Lines 116-135 Link Here

(-)a/selenium.server/src/org/netbeans/modules/selenium/server/SeleniumServerRunner.java (-3 / +12 lines)
116	}	116	}
117	switch (action) {	117	switch (action) {
118	case START:	118	case START:
119	callSeleniumServerMethod("start");	119	callSeleniumServerMethod("boot");
120	break;	120	break;
121	case STOP:	121	case STOP:
122	callSeleniumServerMethod("stop");	122	callSeleniumServerMethod("stop");
123	break;	123	break;
124	case RESTART:	124	case RESTART:
125	callSeleniumServerMethod("stop");	125	callSeleniumServerMethod("stop");
126	callSeleniumServerMethod("start");	126	callSeleniumServerMethod("boot");
127	break;	127	break;
128	case RELOAD:	128	case RELOAD:
129	callSeleniumServerMethod("stop");	129	callSeleniumServerMethod("stop");
130	server = null;	130	server = null;
131	initializeServer();	131	initializeServer();
132	callSeleniumServerMethod("start");	132	callSeleniumServerMethod("boot");
133	break;	133	break;
134	default:	134	default:
135	assert false : "Invalid option";	135	assert false : "Invalid option";
Lines 202-207 Link Here
202	remoteControlConfigurationInstance, ffProfileDir);	202	remoteControlConfigurationInstance, ffProfileDir);
203	}	203	}
204	}	204	}
		205	String userExtensionsString = ip.getString(SeleniumProperties.USER_EXTENSIONS, ""); //NOI18N
		206	if (!userExtensionsString.isEmpty()) {
		207	File userExtensionFile = new File(userExtensionsString);
		208	if (userExtensionFile.exists()) {
		209	remoteControlConfiguration.getMethod("setUserExtensions", File.class).invoke( //NOI18N
		210	remoteControlConfigurationInstance, userExtensionFile);
		211	}
		212	}
		213
205	server = seleniumServer.getConstructor(remoteControlConfiguration).	214	server = seleniumServer.getConstructor(remoteControlConfiguration).
206	newInstance(remoteControlConfigurationInstance);	215	newInstance(remoteControlConfigurationInstance);
207	}	216	}