# HG changeset patch
# User Martin Fousek <marfous@netbeans.org>
# Date 1351759996 -3600
# Node ID 7ceebbb201a777ec030850ee461c93fc3b2c15ae
# Parent  305bc5d5bf98d4cf1f6d143f5adf24a6a003c368
#217956 - UI Element / User-extensions are not configurable via Selenium Server Configuartion

diff -r 305bc5d5bf98 -r 7ceebbb201a7 selenium.server/src/org/netbeans/modules/selenium/server/Bundle.properties
--- a/selenium.server/src/org/netbeans/modules/selenium/server/Bundle.properties	Mon Oct 15 23:38:26 2012 +0200
+++ b/selenium.server/src/org/netbeans/modules/selenium/server/Bundle.properties	Thu Nov 01 09:53:16 2012 +0100
@@ -24,4 +24,7 @@
 
 displayName_SingleWindow=Single Window
 desc_SingleWindow=Should the browser started by selenium server use <br/> \
-multiple frames in a single window or multiple windows.
\ No newline at end of file
+multiple frames in a single window or multiple windows.
+
+displayName_UserExtensions=Selenium User Extensions
+desc_UserExtensions=The User Extension file for Selenium Server
diff -r 305bc5d5bf98 -r 7ceebbb201a7 selenium.server/src/org/netbeans/modules/selenium/server/SeleniumProperties.java
--- a/selenium.server/src/org/netbeans/modules/selenium/server/SeleniumProperties.java	Mon Oct 15 23:38:26 2012 +0200
+++ b/selenium.server/src/org/netbeans/modules/selenium/server/SeleniumProperties.java	Thu Nov 01 09:53:16 2012 +0100
@@ -66,6 +66,7 @@
     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
@@ -78,6 +79,7 @@
         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;
     }
 
@@ -121,6 +123,7 @@
                     instanceProps.putBoolean(START_ON_STARTUP, true);
                     instanceProps.putString(FIREFOX_PROFILE, ""); //NOI18N
                     instanceProps.putBoolean(SINGLE_WINDOW, false);
+                    instanceProps.putString(USER_EXTENSIONS, ""); //NOI18N
                     allProps.add(instanceProps);
                 }
             }
diff -r 305bc5d5bf98 -r 7ceebbb201a7 selenium.server/src/org/netbeans/modules/selenium/server/SeleniumServerRunner.java
--- a/selenium.server/src/org/netbeans/modules/selenium/server/SeleniumServerRunner.java	Mon Oct 15 23:38:26 2012 +0200
+++ b/selenium.server/src/org/netbeans/modules/selenium/server/SeleniumServerRunner.java	Thu Nov 01 09:53:16 2012 +0100
@@ -116,6 +116,7 @@
             }
             switch (action) {
                 case START:
+                    callSeleniumServerMethod("boot");
                     callSeleniumServerMethod("start");
                     break;
                 case STOP:
@@ -123,12 +124,14 @@
                     break;
                 case RESTART:
                     callSeleniumServerMethod("stop");
+                    callSeleniumServerMethod("boot");
                     callSeleniumServerMethod("start");
                     break;
                 case RELOAD:
                     callSeleniumServerMethod("stop");
                     server = null;
                     initializeServer();
+                    callSeleniumServerMethod("boot");
                     callSeleniumServerMethod("start");
                     break;
                 default:
@@ -202,6 +205,15 @@
 						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);
     }