make the config set/setconf message use the interactive flag (#2157)

Author: Vladimir Kotal

src/org/opensolaris/opengrok/configuration/RuntimeEnvironment.java

@@ -787,7 +787,7 @@ public void setRepositories(String dir) {
 
     /**
      * Add repositories to the list.
-     * @param repositories 
+     * @param repositories list of repositories
      */
     public void addRepositories(List<RepositoryInfo> repositories) {
         threadConfig.get().addRepositories(repositories);
@@ -1508,7 +1508,22 @@ public void populateGroups(Set<Group> groups, Set<Project> projects) {
     public void setConfiguration(Configuration configuration) {
         setConfiguration(configuration, null, false);
     }
+    
+    /**
+     * Sets the configuration and performs necessary actions.
+     * @param configuration new configuration
+     * @param interactive true if in interactive mode
+     */
+    public void setConfiguration(Configuration configuration, boolean interactive) {
+        setConfiguration(configuration, null, interactive);
+    }
 
+    /**
+     * Sets the configuration and performs necessary actions.
+     * @param configuration new configuration
+     * @param subFileList list of repositories
+     * @param interactive true if in interactive mode
+     */
     public void setConfiguration(Configuration configuration, List<String> subFileList, boolean interactive) {
         this.configuration = configuration;
         // HistoryGuru constructor uses environment properties so register()
@@ -1843,10 +1858,11 @@ public void stopConfigurationListenerThread() {
      *
      * @param m message containing the configuration
      * @param reindex is the message result of reindex
+     * @param interactive true if in interactive mode
      * @see #applyConfig(org.opensolaris.opengrok.configuration.Configuration,
-     * boolean) applyConfig(config, reindex)
+     * boolean, boolean) applyConfig(config, reindex, interactive)
      */
-    public void applyConfig(Message m, boolean reindex) {
+    public void applyConfig(Message m, boolean reindex, boolean interactive) {
         Configuration config;
         try {
             config = makeXMLStringAsConfiguration(m.getText());
@@ -1855,7 +1871,7 @@ public void applyConfig(Message m, boolean reindex) {
             return;
         }
 
-        applyConfig(config, reindex);
+        applyConfig(config, reindex, interactive);
     }
 
     /**
@@ -1865,11 +1881,12 @@ public void applyConfig(Message m, boolean reindex) {
      *
      * @param config the incoming configuration
      * @param reindex is the message result of reindex
+     * @param interactive true if in interactive mode
      *
      */
-    public void applyConfig(Configuration config, boolean reindex) {
+    public void applyConfig(Configuration config, boolean reindex, boolean interactive) {
 
-        setConfiguration(config);
+        setConfiguration(config, interactive);
         LOGGER.log(Level.INFO, "Configuration updated: {0}",
                 configuration.getSourceRoot());
 

src/org/opensolaris/opengrok/configuration/messages/ConfigMessage.java

@@ -67,7 +67,7 @@ protected byte[] applyMessage(RuntimeEnvironment env) throws IOException {
                         matcher.group(2) // value
                 );
                 // apply the configuration - let the environment reload the configuration if necessary
-                env.applyConfig(env.getConfiguration(), false);
+                env.applyConfig(env.getConfiguration(), false, true);
                 return String.format("Variable \"%s\" set to \"%s\".", matcher.group(1), matcher.group(2)).getBytes();
             } else {
                 // invalid pattern
@@ -79,7 +79,7 @@ protected byte[] applyMessage(RuntimeEnvironment env) throws IOException {
         } else if (hasTag("get")) {
             return ClassUtil.invokeGetter(env.getConfiguration(), getText()).getBytes();
         } else if (hasTag("setconf")) {
-            env.applyConfig(this, hasTag("reindex"));
+            env.applyConfig(this, hasTag("reindex"), !hasTag("reindex"));
         }
 
         return null;