You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/12/17 21:33:43 UTC
svn commit: r727504 -
/geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java
Author: dwoods
Date: Wed Dec 17 12:33:43 2008
New Revision: 727504
URL: http://svn.apache.org/viewvc?rev=727504&view=rev
Log:
GERONIMO-4442 Properly configure ORBConfigAdapter host bindings. Patch from Shawn Jiang.
Modified:
geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java
Modified: geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java?rev=727504&r1=727503&r2=727504&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java (original)
+++ geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java Wed Dec 17 12:33:43 2008
@@ -172,7 +172,16 @@
try {
// create a name service using the supplied host and publish under the name "NameService"
TransientNameService service = new TransientNameService(host, port, "NameService");
- service.run();
+ // Create an ORB object
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
+ props.put("org.omg.CORBA.ORBServerId", "1000000" ) ;
+ props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
+ props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
+ props.put("yoko.orb.oa.endpoint", "iiop --bind " + host + " --host " + host + " --port " + port );
+ log.debug("Creating ORB endpoint with host=" + host + ", port=" + port);
+ ORB createdOrb = ORB.init((String[])null, props) ;
+ service.initialize(createdOrb);
// the service instance is returned as an opaque object.
return service;
} catch (TransientServiceException e) {
@@ -272,10 +281,10 @@
result.put("org.omg.PortableInterceptor.ORBInitializerClass.org.apache.geronimo.yoko.ORBInitializer", "");
// don't specify the port if we're allowing this to default.
if (server.getPort() > 0) {
- result.put("yoko.orb.oa.endpoint", "iiop --host " + server.getHost() + " --port " + server.getPort());
+ result.put("yoko.orb.oa.endpoint", "iiop --bind " + server.getHost() + " --host " + server.getHost() + " --port " + server.getPort());
}
else {
- result.put("yoko.orb.oa.endpoint", "iiop --host " + server.getHost());
+ result.put("yoko.orb.oa.endpoint", "iiop --bind " + server.getHost()+ " --host " + server.getHost());
}
// this gives us a connection we can use to retrieve the ORB configuration in the