You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2016/12/22 05:15:35 UTC

karaf git commit: [KARAF-4904]instance:create should use next free ssh port

Repository: karaf
Updated Branches:
  refs/heads/master cb0d88e7a -> 6baf47d33


[KARAF-4904]instance:create should use next free ssh port


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6baf47d3
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6baf47d3
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6baf47d3

Branch: refs/heads/master
Commit: 6baf47d332587b45b48c4f899aa2a12c92e1fc00
Parents: cb0d88e
Author: Freeman Fang <fr...@gmail.com>
Authored: Thu Dec 22 13:15:20 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Thu Dec 22 13:15:20 2016 +0800

----------------------------------------------------------------------
 .../instance/core/internal/InstanceServiceImpl.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/6baf47d3/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
----------------------------------------------------------------------
diff --git a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index 060f3ac..c5a6e19 100644
--- a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -105,6 +105,22 @@ public class InstanceServiceImpl implements InstanceService {
         int defaultRmiRegistryPortStart = 1099;
         int defaultRmiServerPortStart = 44444;
         Map<String, InstanceState> instances;
+        public State() {
+            //read port start value from the root instance configuration
+            try {
+                Properties shellProperty = new Properties();
+                shellProperty.load(new FileInputStream(new File(System.getProperty("karaf.etc"), "org.apache.karaf.shell.cfg")));
+                defaultSshPortStart = Integer.valueOf((String)shellProperty.getOrDefault("sshPort", 8101));
+                Properties managementProperty = new Properties();
+                managementProperty.load(new FileInputStream(new File(System.getProperty("karaf.etc"), "org.apache.karaf.management.cfg")));
+                defaultRmiRegistryPortStart = Integer.valueOf((String)managementProperty.getOrDefault("rmiRegistryPort", 1099));
+                defaultRmiServerPortStart = Integer.valueOf((String)managementProperty.getOrDefault("rmiServerPort", 1099));
+            } catch (Exception e) {
+                LOGGER.debug("Could not read port start value from the root instance configuration.", e);
+            }
+        }
+        
+        
     }
 
     public InstanceServiceImpl() {