svn commit: r1476706 - in /karaf/trunk/management/server/src/main: java/org/apache/karaf/management/ resources/OSGI-INF/blueprint/ resources/OSGI-INF/metatype/

[ff...@apache.org]

Author: ffang
Date: Sun Apr 28 01:53:09 2013
New Revision: 1476706

URL: http://svn.apache.org/r1476706
Log:
[KARAF-2291]make rmiServerHost configurable

Modified:
    karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
    karaf/trunk/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
    karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties
    karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml

Modified: karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=1476706&r1=1476705&r2=1476706&view=diff
==============================================================================
--- karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java (original)
+++ karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java Sun Apr 28 01:53:09 2013
@@ -20,6 +20,7 @@ import org.apache.karaf.jaas.config.Keys
 
 import java.io.IOException;
 import java.net.BindException;
+import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.rmi.server.RMIClientSocketFactory;
 import java.rmi.server.RMIServerSocketFactory;
@@ -33,6 +34,7 @@ import javax.management.remote.JMXConnec
 import javax.management.remote.JMXConnectorServerFactory;
 import javax.management.remote.JMXServiceURL;
 import javax.management.remote.rmi.RMIConnectorServer;
+import javax.net.ServerSocketFactory;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
@@ -44,6 +46,7 @@ public class ConnectorServerFactory {
 
     private MBeanServer server;
     private String serviceUrl;
+    private String rmiServerHost;
     private Map environment;
     private ObjectName objectName;
     private boolean threaded = false;

Modified: karaf/trunk/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml?rev=1476706&r1=1476705&r2=1476706&view=diff
==============================================================================
--- karaf/trunk/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml (original)
+++ karaf/trunk/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml Sun Apr 28 01:53:09 2013
@@ -34,6 +34,7 @@
         <cm:default-properties>
             <cm:property name="rmiRegistryHost" value=""/>
             <cm:property name="rmiRegistryPort" value="1099"/>
+            <cm:property name="rmiServerHost" value="0.0.0.0"/>
             <cm:property name="rmiServerPort" value="44444"/>
             <cm:property name="jmxRealm" value="karaf"/>
             <cm:property name="jmxRole" value="$[karaf.admin.role]"/>
@@ -81,6 +82,7 @@
           destroy-method="destroy">
         <property name="server" ref="mbeanServer"/>
         <property name="serviceUrl" value="${serviceUrl}"/>
+        <property name="rmiServerHost" value="${rmiServerHost}"/>
         <property name="daemon" value="${daemon}"/>
         <property name="threaded" value="${threaded}"/>
         <property name="objectName" value="${objectName}"/>

Modified: karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1476706&r1=1476705&r2=1476706&view=diff
==============================================================================
--- karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties Sun Apr 28 01:53:09 2013
@@ -30,6 +30,9 @@ rmiRegistryHost.description = host of th
 rmiRegistryPort.name = RMI Registry Port
 rmiRegistryPort.description = port of the registry for the exported RMI service
 
+rmiServerHost.name = RMI Server Host
+rmiServerHost.description = host of the server for the exported RMI objects. Blank for all interfaces
+
 rmiServerPort.name = RMI Server Port
 rmiServerPort.description = port of the server for the exported RMI objects
 

Modified: karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1476706&r1=1476705&r2=1476706&view=diff
==============================================================================
--- karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml Sun Apr 28 01:53:09 2013
@@ -23,6 +23,8 @@
             description="%rmiRegistryHost.description"/>
         <AD id="rmiRegistryPort" type="Integer" default="1099" name="%rmiRegistryPort.name"
             description="%rmiRegistryPort.description"/>
+        <AD id="rmiServerHost" type="String" default="" name="%rmiServerHost.name"
+            description="%rmiServerHost.description"/>
         <AD id="rmiServerPort" type="Integer" default="44444" name="%rmiServerPort.name"
             description="%rmiServerPort.description"/>
         <AD id="jmxRealm" type="String" default="karaf" name="%jmxRealm.name"