Providing custom environment entries for ASP, closes #369

- introducing new preference page for environment entries
- ASP is restarted when environment entries have been changed by user
- installed asciidoctor version adapter does use this as well
- upgraded to 2.5.0 already because of changed libraries etc.

asciidoctor-editor-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="de.jcup.asciidoctoreditor"
       label="Asciidoctor Editor"
-      version="2.4.1"
+      version="2.5.0"
       provider-name="Albert Tregnaghi">
 
    <description url="https://marketplace.eclipse.org/content/asciidoctor-editor">

asciidoctor-editor-plugin/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Asciidoctor Editor
 Bundle-SymbolicName: de.jcup.asciidoctoreditor;singleton:=true
-Bundle-Version: 2.4.1
+Bundle-Version: 2.5.0
 Bundle-Activator: de.jcup.asciidoctoreditor.AsciiDoctorEditorActivator
 Bundle-Vendor: Albert Tregnaghi
 Require-Bundle: org.eclipse.ui,

asciidoctor-editor-plugin/plugin.xml

@@ -629,6 +629,15 @@
          <keywordReference
                id="asciidoctoreditor.preferences.keyword.tasks">
          </keywordReference>
+      </page>
+       <page
+         id="asciidoctoreditor.eclipse.preferences.AsciiDoctorEditorEnvironmentPreferencePage"
+         class="de.jcup.asciidoctoreditor.preferences.AsciiDoctorEditorEnvironmentPreferencePage"
+         name="Environmemt"
+         category="asciidoctoreditor.eclipse.preferences.AsciiDoctorEditorEditorPreferencePage">
+          <keywordReference
+               id="asciidoctoreditor.preferences.keyword.asciidoctor">
+         </keywordReference>
       </page>
       <!-- plantuml -->
       <page

asciidoctor-editor-plugin/src/main/java-eclipse/de/jcup/asciidoctoreditor/ASPSupport.java

@@ -16,10 +16,12 @@
 package de.jcup.asciidoctoreditor;
 
 import java.io.File;
+import java.util.Map;
 
 import de.jcup.asciidoctoreditor.asciidoc.ASPServerAdapter;
 import de.jcup.asciidoctoreditor.console.AsciiDoctorConsoleUtil;
 import de.jcup.asciidoctoreditor.preferences.AsciiDoctorEditorPreferences;
+import de.jcup.asciidoctoreditor.preferences.CustomEnvironmentEntrySupport;
 import de.jcup.asp.client.AspClient;
 
 public class ASPSupport {
@@ -147,6 +149,13 @@ private void internalUpdateASPServerStart() {
         aspServerAdapter.setMaxPort(preferences.getAspServerMaxPort());
         aspServerAdapter.setConsoleAdapter(AsciiDoctorEclipseConsoleAdapter.INSTANCE);
         aspServerAdapter.setLogAdapter(AsciiDoctorEclipseLogAdapter.INSTANCE);
+
+        Map<String,String> customEnvEntries = null;
+        if (CustomEnvironmentEntrySupport.DEFAULT.areCustomEnvironmentEntriesEnabled()) {
+            customEnvEntries = CustomEnvironmentEntrySupport.DEFAULT.fetchConfiguredEnvironmentEntriesAsMap();
+        }
+        aspServerAdapter.setCustomEnvironmentEntries(customEnvEntries);
+
         aspServerAdapter.startServer();
 
     }

asciidoctor-editor-plugin/src/main/java-eclipse/de/jcup/asciidoctoreditor/asciidoc/InstalledAsciidoctorAdapter.java

@@ -28,6 +28,7 @@
 import de.jcup.asciidoctoreditor.OSUtil;
 import de.jcup.asciidoctoreditor.console.AsciiDoctorConsoleUtil;
 import de.jcup.asciidoctoreditor.preferences.AsciiDoctorEditorPreferences;
+import de.jcup.asciidoctoreditor.preferences.CustomEnvironmentEntrySupport;
 import de.jcup.asciidoctoreditor.util.AsciiDoctorEditorUtil;
 import de.jcup.asp.client.AspClientProgressMonitor;
 
@@ -47,6 +48,10 @@ public void convertFile(File editorFileOrNull, File asciiDocFile, Map<String, Ob
         }
         ProcessBuilder pb = new ProcessBuilder(commands);
         try {
+            CustomEnvironmentEntrySupport customEnvironmentEntrySupport = getCustomEnvEntrySupport();
+            if (customEnvironmentEntrySupport.areCustomEnvironmentEntriesEnabled()) {
+                pb.environment().putAll(customEnvironmentEntrySupport.fetchConfiguredEnvironmentEntriesAsMap());
+            }
             StringBuffer lineStringBuffer = null;
             Process process = pb.start();
             try (InputStream is = process.getErrorStream();) {
@@ -91,6 +96,10 @@ public void convertFile(File editorFileOrNull, File asciiDocFile, Map<String, Ob
 
     }
 
+    private CustomEnvironmentEntrySupport getCustomEnvEntrySupport() {
+        return CustomEnvironmentEntrySupport.DEFAULT;
+    }
+
     protected String createCommandLineString(List<String> commands) {
         StringBuilder commandLine = new StringBuilder();
         for (String command : commands) {