0001663: Windows authentication with SQL-Server

JumpMind · Apr 22, 2020 · c1c4f11 · c1c4f11
1 parent dbd3bf8
commit c1c4f11
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/symmetric-server/src/main/deploy/bin/setenv.bat b/symmetric-server/src/main/deploy/bin/setenv.bat
@@ -48,3 +48,4 @@ set SYM_JAVA=java
 if /i NOT "%JAVA_HOME%" == "" set SYM_JAVA=%JAVA_HOME%\bin\java
 
 set CLASSPATH=%SYM_HOME%\patches;%SYM_HOME%\patches\*;%SYM_HOME%\lib\*;%SYM_HOME%\web\WEB-INF\lib\*
+set PATH=%PATH%;%SYM_HOME%\lib
diff --git a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WindowsService.java b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WindowsService.java
@@ -27,6 +27,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -91,6 +92,15 @@ public void init() {
         }
     }
 
+    @Override
+    protected void initEnvironment(ProcessBuilder pb) {
+        Map<String, String> env = pb.environment();
+        String path = env.get("PATH");
+        path = System.getProperty("user.dir") + "\\lib;" + (path != null ? path : "");
+        env.put("PATH", path);
+        logger.log(Level.INFO, "PATH is " + path);
+    }
+
     @Override
     public void start() {
         if (isRunning()) {

diff --git a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperService.java b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperService.java
@@ -156,6 +156,7 @@ protected void execJava(boolean isConsole) {
                     startTime = System.currentTimeMillis();
                     ProcessBuilder pb = new ProcessBuilder(cmd);
                     pb.redirectErrorStream(true);
+                    initEnvironment(pb);
 
                     try {
                         child = pb.start();
@@ -252,6 +253,9 @@ protected void execJava(boolean isConsole) {
         }
     }
 
+    protected void initEnvironment(ProcessBuilder pb) {
+    }
+
     public void stop() {
         stopProcesses(false);
         deletePidFile(config.getServerPidFile());