Author: dkulp
Date: Mon Jun 8 19:28:06 2009
New Revision: 782736
URL: http://svn.apache.org/viewvc?rev=782736&view=rev
Log:
Merged revisions 782730 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r782730 | dkulp | 2009-06-08 15:17:00 -0400 (Mon, 08 Jun 2009) | 2 lines
[CXF-2245] Update corba binding to make it easier to configure the ORB.
Patch from Eamonn Dwyer applied.
........
Added:
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
- copied unchanged from r782730,
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/
- copied from r782730,
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/CorbaBindingFactoryConfigurerTest.java
- copied unchanged from r782730,
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/CorbaBindingFactoryConfigurerTest.java
cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/corba_binding_factory_configurer.xml
- copied unchanged from r782730,
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/corba_binding_factory_configurer.xml
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 8 19:28:06 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782729
+/cxf/trunk:782728-782730
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 8 19:28:06 2009
@@ -1 +1 @@
-/cxf/trunk:1-782619,782728-782729
+/cxf/trunk:1-782619,782728-782730
Modified:
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java?rev=782736&r1=782735&r2=782736&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
Mon Jun 8 19:28:06 2009
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.logging.Logger;
import org.apache.cxf.binding.corba.runtime.CorbaDSIServant;
@@ -192,6 +193,8 @@
public void activate() {
java.util.Properties props = new java.util.Properties();
+ Properties configSpecifiedOrbProperties = orbConfig.getOrbProperties();
+ props.putAll(configSpecifiedOrbProperties);
if (orbConfig.getOrbClass() != null) {
props.put("org.omg.CORBA.ORBClass", orbConfig.getOrbClass());
}
Modified:
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java?rev=782736&r1=782735&r2=782736&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
Mon Jun 8 19:28:06 2009
@@ -45,6 +45,8 @@
public static synchronized ORB getDefaultORB(OrbConfig config) {
if (defaultORB == null) {
Properties props = System.getProperties();
+ Properties configSpecifiedOrbProperties =
config.getOrbProperties();
+ props.putAll(configSpecifiedOrbProperties);
if (config.getOrbClass() != null) {
props.put("org.omg.CORBA.ORBClass", config.getOrbClass());
}
@@ -205,5 +207,5 @@
orbUseCount.put(getORBNameFromAddress(address), count);
}
}
-
+
}
Modified:
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java?rev=782736&r1=782735&r2=782736&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
Mon Jun 8 19:28:06 2009
@@ -28,6 +28,7 @@
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import org.apache.cxf.binding.corba.CorbaBindingException;
import org.apache.cxf.binding.corba.interceptors.SystemExceptionHelper;
@@ -47,6 +48,7 @@
protected String orbClass;
protected String orbSingletonClass;
protected List<String> orbArgs = new ArrayList<String>();
+ protected Properties orbProperties = new Properties();
public OrbConfig() {
//nothing
@@ -76,6 +78,13 @@
return orbArgs;
}
+ public void setOrbProperties(Properties props) {
+ orbProperties = props;
+ }
+
+ public Properties getOrbProperties() {
+ return orbProperties;
+ }
public void addPOAPolicies(ORB orb,
String poaName,
