Return-Path: X-Original-To: apmail-karaf-dev-archive@minotaur.apache.org Delivered-To: apmail-karaf-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DC785F4FF for ; Sun, 28 Apr 2013 02:22:54 +0000 (UTC) Received: (qmail 86258 invoked by uid 500); 28 Apr 2013 02:22:54 -0000 Delivered-To: apmail-karaf-dev-archive@karaf.apache.org Received: (qmail 86229 invoked by uid 500); 28 Apr 2013 02:22:54 -0000 Mailing-List: contact dev-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list dev@karaf.apache.org Received: (qmail 86220 invoked by uid 99); 28 Apr 2013 02:22:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Apr 2013 02:22:54 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of freeman.fang@gmail.com designates 209.85.220.50 as permitted sender) Received: from [209.85.220.50] (HELO mail-pa0-f50.google.com) (209.85.220.50) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Apr 2013 02:22:48 +0000 Received: by mail-pa0-f50.google.com with SMTP id bg2so474288pad.9 for ; Sat, 27 Apr 2013 19:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:mime-version:content-type:subject:date:in-reply-to :to:references:message-id:x-mailer; bh=/S0e73VY/p+H0Gg4h32uSc92Ez4SvcVPkjvtGsErYxo=; b=PVQNy+h1IWchbpuoVWkBE9jkY7RBNeK8L+A2UFuEapC+Lsnl/XrSW4rp2oKdeQquWU dNI9SNBDG/wwDWtTOC3c2cui2vFalgSjC4nA3KEs617v9DtUUW9x6tTEDSHjATQu8YXt SksYYXbVdjHxFzT7n8Fwm2mQdsMQDLo4PNpH7FqKYMmCKwDKWjrIo7dhWBQRtPkwhdeU fNRpW99XsuKRf1Be8uhLTXk317zgu8Ip19GxJUto0neayVwN8UHqg6o9s34M1zo2jBr3 qaicguA2VIpNu8L6HdJP0zV/wCNwDXpytZI6QxAZG4HYRUkpqVmVn/L25Dsv3V2qttt6 oY3g== X-Received: by 10.68.37.68 with SMTP id w4mr28631982pbj.105.1367115746580; Sat, 27 Apr 2013 19:22:26 -0700 (PDT) Received: from [192.168.1.102] ([123.119.255.219]) by mx.google.com with ESMTPSA id pa2sm19415871pac.9.2013.04.27.19.22.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 27 Apr 2013 19:22:26 -0700 (PDT) From: Freeman Fang Mime-Version: 1.0 (Apple Message framework v1280) Content-Type: multipart/alternative; boundary="Apple-Mail=_0E39EDA8-4559-4A3F-B0B6-A2650E6C4BE7" Subject: Re: svn commit: r1476704 - in /karaf/branches/karaf-2.x: assemblies/apache-karaf/src/main/distribution/text/etc/ management/server/src/main/java/org/apache/karaf/management/ management/server/src/main/resources/OSGI-INF/blueprint/ management/server/src/mai... Date: Sun, 28 Apr 2013 10:22:19 +0800 In-Reply-To: To: dev@karaf.apache.org References: <20130428014426.5CC9F2388A33@eris.apache.org> Message-Id: X-Mailer: Apple Mail (2.1280) X-Virus-Checked: Checked by ClamAV on apache.org --Apple-Mail=_0E39EDA8-4559-4A3F-B0B6-A2650E6C4BE7 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Yes, I believe so =EF=BC=8D=EF=BC=8D=EF=BC=8D=EF=BC=8D=EF=BC=8D=EF=BC=8D=EF=BC=8D=EF=BC=8D=EF= =BC=8D=EF=BC=8D=EF=BC=8D=EF=BC=8D=EF=BC=8D Freeman(Yue) Fang Red Hat, Inc.=20 FuseSource is now part of Red Hat Web: http://fusesource.com | http://www.redhat.com/ Twitter: freemanfang Blog: http://freemanfang.blogspot.com http://blog.sina.com.cn/u/1473905042 weibo: @Freeman=E5=B0=8F=E5=B1=8B On 2013-4-28, at =E4=B8=8A=E5=8D=8810:08, Dan Tran wrote: > is this backward compatible with existing karaf 2.2.x > org.apache.karaf.managment.cfg file? >=20 >=20 >=20 >=20 > On Sat, Apr 27, 2013 at 6:44 PM, wrote: >=20 >> Author: ffang >> Date: Sun Apr 28 01:44:25 2013 >> New Revision: 1476704 >>=20 >> URL: http://svn.apache.org/r1476704 >> Log: >> [KARAF-2291]make rmiServerHost configurable >>=20 >> Modified: >>=20 >> = karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/tex= t/etc/org.apache.karaf.management.cfg >>=20 >> = karaf/branches/karaf-2.x/management/server/src/main/java/org/apache/karaf/= management/ConnectorServerFactory.java >>=20 >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/blu= eprint/karaf-management.xml >>=20 >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/met= atype/metatype.properties >>=20 >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/met= atype/metatype.xml >>=20 >> Modified: >> = karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/tex= t/etc/org.apache.karaf.management.cfg >> URL: >> = http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-ka= raf/src/main/distribution/text/etc/org.apache.karaf.management.cfg?rev=3D1= 476704&r1=3D1476703&r2=3D1476704&view=3Ddiff >>=20 >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- >> = karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/tex= t/etc/org.apache.karaf.management.cfg >> (original) >> +++ >> = karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/tex= t/etc/org.apache.karaf.management.cfg >> Sun Apr 28 01:44:25 2013 >> @@ -36,6 +36,8 @@ rmiRegistryHost =3D 0.0.0.0 >> # >> rmiServerPort =3D 44444 >>=20 >> +rmiServerHost =3D 0.0.0.0 >> + >> # >> # Name of the JAAS realm used for authentication >> # >> @@ -44,7 +46,7 @@ jmxRealm =3D karaf >> # >> # The service URL for the JMXConnectorServer >> # >> -serviceUrl =3D service:jmx:rmi://0.0.0.0: >> = ${rmiServerPort}/jndi/rmi://${rmiRegistryHost}:${rmiRegistryPort}/karaf-${= >> karaf.name} >> +serviceUrl =3D >> = service:jmx:rmi://${rmiServerHost}:${rmiServerPort}/jndi/rmi://${rmiRegist= ryHost}:${rmiRegistryPort}/karaf-${ >> karaf.name} >>=20 >> # >> # Whether any threads started for the JMXConnectorServer should be >> started as daemon threads >>=20 >> Modified: >> = karaf/branches/karaf-2.x/management/server/src/main/java/org/apache/karaf/= management/ConnectorServerFactory.java >> URL: >> = http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/server/sr= c/main/java/org/apache/karaf/management/ConnectorServerFactory.java?rev=3D= 1476704&r1=3D1476703&r2=3D1476704&view=3Ddiff >>=20 >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- >> = karaf/branches/karaf-2.x/management/server/src/main/java/org/apache/karaf/= management/ConnectorServerFactory.java >> (original) >> +++ >> = karaf/branches/karaf-2.x/management/server/src/main/java/org/apache/karaf/= management/ConnectorServerFactory.java >> Sun Apr 28 01:44:25 2013 >> @@ -20,6 +20,7 @@ import org.apache.karaf.jaas.config.Keys >>=20 >> 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 { >>=20 >> private MBeanServer server; >> private String serviceUrl; >> + private String rmiServerHost; >> private Map environment; >> private ObjectName objectName; >> private boolean threaded =3D false; >> @@ -201,11 +204,12 @@ public class ConnectorServerFactory { >> } >>=20 >> public void init() throws Exception { >> + System.out.println("the serviceUrl is " + serviceUrl); >> if (this.server =3D=3D null) { >> throw new IllegalArgumentException("server must be set"); >> } >> JMXServiceURL url =3D new JMXServiceURL(this.serviceUrl); >> - >> + setupKarafRMIServerSocketFactory(); >> if (isClientAuth()) { >> this.secured =3D true; >> } >> @@ -280,7 +284,7 @@ public class ConnectorServerFactory { >>=20 >> private void setupSsl() throws GeneralSecurityException { >> SSLServerSocketFactory sslServerSocketFactory =3D >> keystoreManager.createSSLServerFactory(null, secureProtocol, = algorithm, >> keyStore, keyAlias, trustStore, keyStoreAvailabilityTimeout); >> - RMIServerSocketFactory rmiServerSocketFactory =3D new >> KarafSslRMIServerSocketFactory(sslServerSocketFactory, = this.isClientAuth()); >> + RMIServerSocketFactory rmiServerSocketFactory =3D new >> KarafSslRMIServerSocketFactory(sslServerSocketFactory, = this.isClientAuth(), >> getRmiServerHost()); >> RMIClientSocketFactory rmiClientSocketFactory =3D new >> SslRMIClientSocketFactory(); >>=20 >> = environment.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE, >> rmiServerSocketFactory); >>=20 >> = environment.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, >> rmiClientSocketFactory); >> @@ -288,20 +292,54 @@ public class ConnectorServerFactory { >> // environment.put("com.sun.jndi.rmi.factory.socket", >> rmiClientSocketFactory); >> } >>=20 >> + private void setupKarafRMIServerSocketFactory() { >> + RMIServerSocketFactory rmiServerSocketFactory =3D new >> KarafRMIServerSocketFactory(getRmiServerHost()); >> + >> = environment.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE, >> rmiServerSocketFactory); >> + } >> + >> + public String getRmiServerHost() { >> + return rmiServerHost; >> + } >> + >> + public void setRmiServerHost(String rmiServerHost) { >> + this.rmiServerHost =3D rmiServerHost; >> + } >> + >> private static class KarafSslRMIServerSocketFactory implements >> RMIServerSocketFactory { >> private SSLServerSocketFactory sslServerSocketFactory; >> private boolean clientAuth; >> + private String rmiServerHost; >>=20 >> - public KarafSslRMIServerSocketFactory(SSLServerSocketFactory >> sslServerSocketFactory, boolean clientAuth) { >> + public KarafSslRMIServerSocketFactory(SSLServerSocketFactory >> sslServerSocketFactory, boolean clientAuth, String rmiServerHost) { >> this.sslServerSocketFactory =3D sslServerSocketFactory; >> this.clientAuth =3D clientAuth; >> + this.rmiServerHost =3D rmiServerHost; >> } >>=20 >> public ServerSocket createServerSocket(int port) throws >> IOException { >> - SSLServerSocket sslServerSocket =3D (SSLServerSocket) >> sslServerSocketFactory.createServerSocket(port); >> + System.out.println(rmiServerHost); >> + = System.out.println(InetAddress.getByName(rmiServerHost)); >> + SSLServerSocket sslServerSocket =3D (SSLServerSocket) >> sslServerSocketFactory.createServerSocket(port, 50, >> InetAddress.getByName(rmiServerHost)); >> sslServerSocket.setNeedClientAuth(clientAuth); >> + System.out.println(sslServerSocket); >> return sslServerSocket; >> } >> } >> + >> + private static class KarafRMIServerSocketFactory implements >> RMIServerSocketFactory { >> + private String rmiServerHost; >> + >> + public KarafRMIServerSocketFactory(String rmiServerHost) { >> + this.rmiServerHost =3D rmiServerHost; >> + } >> + >> + public ServerSocket createServerSocket(int port) throws >> IOException { >> + System.out.println(rmiServerHost); >> + = System.out.println(InetAddress.getByName(rmiServerHost)); >> + ServerSocket serverSocket =3D (ServerSocket) >> ServerSocketFactory.getDefault().createServerSocket(port, 50, >> InetAddress.getByName(rmiServerHost)); >> + System.out.println(serverSocket); >> + return serverSocket; >> + } >> + } >>=20 >> } >>=20 >> Modified: >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/blu= eprint/karaf-management.xml >> URL: >> = http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/server/sr= c/main/resources/OSGI-INF/blueprint/karaf-management.xml?rev=3D1476704&r1=3D= 1476703&r2=3D1476704&view=3Ddiff >>=20 >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/blu= eprint/karaf-management.xml >> (original) >> +++ >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/blu= eprint/karaf-management.xml >> Sun Apr 28 01:44:25 2013 >> @@ -34,6 +34,7 @@ >> >> >> >> + >> >> >> >> @@ -80,6 +81,7 @@ >> destroy-method=3D"destroy"> >> >> >> + >> >> >> >>=20 >> Modified: >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/met= atype/metatype.properties >> URL: >> = http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/server/sr= c/main/resources/OSGI-INF/metatype/metatype.properties?rev=3D1476704&r1=3D= 1476703&r2=3D1476704&view=3Ddiff >>=20 >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/met= atype/metatype.properties >> (original) >> +++ >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/met= atype/metatype.properties >> Sun Apr 28 01:44:25 2013 >> @@ -30,6 +30,9 @@ rmiRegistryHost.description =3D host of th >> rmiRegistryPort.name =3D RMI Registry Port >> rmiRegistryPort.description =3D port of the registry for the exported = RMI >> service >>=20 >> +rmiServerHost.name =3D RMI Server Host >> +rmiServerHost.description =3D host of the server for the exported = RMI >> objects. Blank for all interfaces >> + >> rmiServerPort.name =3D RMI Server Port >> rmiServerPort.description =3D port of the server for the exported RMI >> objects >>=20 >>=20 >> Modified: >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/met= atype/metatype.xml >> URL: >> = http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/server/sr= c/main/resources/OSGI-INF/metatype/metatype.xml?rev=3D1476704&r1=3D1476703= &r2=3D1476704&view=3Ddiff >>=20 >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/met= atype/metatype.xml >> (original) >> +++ >> = karaf/branches/karaf-2.x/management/server/src/main/resources/OSGI-INF/met= atype/metatype.xml >> Sun Apr 28 01:44:25 2013 >> @@ -23,6 +23,8 @@ >> description=3D"%rmiRegistryHost.description"/> >> > name=3D"%rmiRegistryPort.name" >> description=3D"%rmiRegistryPort.description"/> >> + > name=3D"%rmiServerHost.name" >> + description=3D"%rmiServerHost.description"/> >> > name=3D"%rmiServerPort.name" >> description=3D"%rmiServerPort.description"/> >> > name=3D"%jmxRealm.name" >>=20 >>=20 >>=20 --Apple-Mail=_0E39EDA8-4559-4A3F-B0B6-A2650E6C4BE7--