0002416: Remove jmx.agent.enabled and jmx.agent.port from

symmetric-server.properties
JumpMind · Oct 19, 2015 · d6998e2 · d6998e2
1 parent dfae0ae
commit d6998e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 47 deletions.
diff --git a/symmetric-server/src/main/deploy/conf/sym_service.conf b/symmetric-server/src/main/deploy/conf/sym_service.conf
@@ -24,8 +24,11 @@ wrapper.java.additional.9=-Dfile.encoding=utf-8
 wrapper.java.additional.10=-XX:+HeapDumpOnOutOfMemoryError
 wrapper.java.additional.11=-XX:HeapDumpPath=tmp
 wrapper.java.additional.12=-Djava.net.preferIPv4Stack=true
-# Recommend using the -server option for optimal garbage collection operation
-#wrapper.java.additional.12=-server
+wrapper.java.additional.13=-Dcom.sun.management.jmxremote
+wrapper.java.additional.14=-Dcom.sun.management.jmxremote.authenticate=false
+wrapper.java.additional.15=-Dcom.sun.management.jmxremote.port=31418
+wrapper.java.additional.16=-Dcom.sun.management.jmxremote.ssl=false 
+wrapper.java.additional.17=-Djava.rmi.server.hostname=localhost
 
 # Initial Java Heap Size (in MB)
 wrapper.java.initmemory=256

diff --git a/symmetric-server/src/main/deploy/conf/symmetric-server.properties b/symmetric-server/src/main/deploy/conf/symmetric-server.properties
@@ -51,12 +51,4 @@ jmx.http.enable=true
 
 # Port number for Java Management Extensions (JMX) web console.
 #
-jmx.http.port=31416
-
-# Enable Java Management Extensions (JMX) remote agent.
-#
-jmx.agent.enable=true
-
-# Port number for the Java Management Extensions (JMX) remote agent.
-#
-jmx.agent.port=31418
+jmx.http.port=31416
diff --git a/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperConfig.java b/symmetric-wrapper/src/main/java/org/jumpmind/symmetric/wrapper/WrapperConfig.java
@@ -22,24 +22,20 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 public class WrapperConfig {
 
 	protected String configFile;
 
     protected Map<String, ArrayList<String>> prop;
 
-    protected Properties serverProperties;
-
     protected File workingDirectory;
 
     public WrapperConfig(String configFile) throws IOException {
@@ -56,29 +52,7 @@ public WrapperConfig(String configFile) throws IOException {
                 workingDirectory = new File(configFile.substring(0, index + 1) + "..");
             }
         }
-        loadServerPropertiesFile();
-    }
-
-    protected void loadServerPropertiesFile() throws IOException {
-        serverProperties = new Properties();
-        File serverPropertiesFile = new File(workingDirectory.getCanonicalPath() + "/conf", "symmetric-server.properties");
-        if (serverPropertiesFile.exists()) {
-            FileInputStream fis = null;
-            try {
-                fis = new FileInputStream(serverPropertiesFile);
-                serverProperties.load(fis);
-            } finally {
-                if (fis != null) {
-                    try {
-                        fis.close();
-                    } catch (Exception ex) {
-                    }
-                }
-            }
-        } else {
-            throw new WrapperException(Constants.RC_MISSING_SERVER_PROPERTIES, 0, "Could not locate the " + serverPropertiesFile.getAbsolutePath() + " file");
-        }
-    }
+    }   
 
     public String getWrapperJarPath()  {
         try {
@@ -204,15 +178,6 @@ public ArrayList<String> getCommand(boolean isConsole) {
 
         cmdList.addAll(prop.get("wrapper.java.additional"));
 
-        if ("true".equalsIgnoreCase(serverProperties.getProperty("jmx.agent.enable", "false"))) {
-            String port = serverProperties.getProperty("jmx.agent.port", "31418");
-            cmdList.add("-Dcom.sun.management.jmxremote");
-            cmdList.add("-Dcom.sun.management.jmxremote.authenticate=false");
-            cmdList.add("-Dcom.sun.management.jmxremote.port=" + port);
-            cmdList.add("-Dcom.sun.management.jmxremote.ssl=false"); 
-            cmdList.add("-Djava.rmi.server.hostname=localhost");            
-        }
-
         ArrayList<String> appParams = prop.get("wrapper.app.parameter");
         appParams.remove("--no-log-console");
         cmdList.addAll(appParams);