cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r782755 - in /cxf/branches/2.1.x-fixes: ./ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/util...
Date Mon, 08 Jun 2009 19:56:42 GMT
Author: dkulp
Date: Mon Jun  8 19:56:42 2009
New Revision: 782755

URL: http://svn.apache.org/viewvc?rev=782755&view=rev
Log:
Merged revisions 782736 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r782736 | dkulp | 2009-06-08 15:28:06 -0400 (Mon, 08 Jun 2009) | 10 lines
  
  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.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
      - copied unchanged from r782736, cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/
      - copied from r782736, cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/CorbaBindingFactoryConfigurerTest.java
      - copied unchanged from r782736, cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/CorbaBindingFactoryConfigurerTest.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/corba_binding_factory_configurer.xml
      - copied unchanged from r782736, cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/corba_binding_factory_configurer.xml
Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
    cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
    cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun  8 19:56:42 2009
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735
-/cxf/trunk:782181,782728-782729
+/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736
+/cxf/trunk:782181,782728-782730

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java?rev=782755&r1=782754&r2=782755&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
Mon Jun  8 19:56:42 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.1.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.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java?rev=782755&r1=782754&r2=782755&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
Mon Jun  8 19:56:42 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.1.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.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java?rev=782755&r1=782754&r2=782755&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
Mon Jun  8 19:56:42 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,



Mime
View raw message