Author: iocanel
Date: Mon Oct 25 08:44:29 2010
New Revision: 1026970
URL: http://svn.apache.org/viewvc?rev=1026970&view=rev
Log:
[KARAF-253] Added RMI Server port on jmx serviceUrl.
Modified:
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg
karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.properties
karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.xml
Modified:
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg?rev=1026970&r1=1026969&r2=1026970&view=diff
==============================================================================
---
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg
(original)
+++
karaf/trunk/assembly/src/main/distribution/text/etc/org.apache.karaf.management.cfg
Mon Oct 25 08:44:29 2010
@@ -19,8 +19,9 @@
#
rmiRegistryPort = 1099
+rmiServerPort = 44444
jmxRealm = karaf
-serviceUrl =
service:jmx:rmi:///jndi/rmi://localhost:${rmiRegistryPort}/karaf-${karaf.name}
+serviceUrl =
service:jmx:rmi://localhost:${rmiServerPort}/jndi/rmi://localhost:${rmiRegistryPort}/karaf-${karaf.name}
daemon = true
threaded = true
objectName = connector:name=rmi
Modified:
karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml?rev=1026970&r1=1026969&r2=1026970&view=diff
==============================================================================
---
karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
(original)
+++
karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
Mon Oct 25 08:44:29 2010
@@ -28,8 +28,9 @@
<cm:property-placeholder persistent-id="org.apache.karaf.management"
update-strategy="reload">
<cm:default-properties>
<cm:property name="rmiRegistryPort" value="1099"/>
+ <cm:property name="rmiServerPort" value="44444"/>
<cm:property name="jmxRealm" value="karaf"/>
- <cm:property name="serviceUrl"
value="service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-$[karaf.name]"/>
+ <cm:property name="serviceUrl"
value="service:jmx:rmi://localhost:44444/jndi/rmi://localhost:1099/karaf-$[karaf.name]"/>
<cm:property name="daemon" value="true"/>
<cm:property name="threaded" value="true"/>
<cm:property name="objectName" value="connector:name=rmi"/>
Modified:
karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1026970&r1=1026969&r2=1026970&view=diff
==============================================================================
---
karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.properties
Mon Oct 25 08:44:29 2010
@@ -24,9 +24,12 @@
management.name = Apache Karaf JMX Management
management.description = Configuration of Apache Karaf JMX Management
-rmiRegistryPort.name = RMI Port
+rmiRegistryPort.name = RMI Registry Port
rmiRegistryPort.description = port of the registry for the exported RMI service
+rmiServerPort.name = RMI Server Port
+rmiServerPort.description = port of the server for the exported RMI objects
+
jmxRealm.name = Realm
jmxRealm.description = name of the JAAS realm used for authentication
Modified:
karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1026970&r1=1026969&r2=1026970&view=diff
==============================================================================
--- karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.xml
(original)
+++ karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.xml
Mon Oct 25 08:44:29 2010
@@ -21,9 +21,11 @@
<OCD id="org.apache.karaf.management" name="%management.name"
description="%management.description">
<AD id="rmiRegistryPort" type="Integer" default="1099"
name="%rmiRegistryPort.name"
description="%rmiRegistryPort.description"/>
+ <AD id="rmiServerPort" type="Integer" default="44444"
name="%rmiServerPort.name"
+ description="%rmiServerPort.description"/>
<AD id="jmxRealm" type="String" default="karaf" name="%jmxRealm.name"
description="%jmxRealm.description"/>
- <AD id="serviceUrl" type="String"
default="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"
name="%serviceUrl.name"
+ <AD id="serviceUrl" type="String"
default="service:jmx:rmi://localhost:44444/jndi/rmi://localhost:1099/jmxrmi"
name="%serviceUrl.name"
description="%serviceUrl.description"/>
<AD id="daemon" type="Boolean" default="true" name="%daemon.name"
description="%daemon.description"/>
<AD id="threaded" type="Boolean" default="true" name="%threaded.name"
description="%threaded.description"/>
