cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1553091 - in /cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw: Constants.java handlers/PojoConfigurationTypeHandler.java
Date Mon, 23 Dec 2013 10:40:08 GMT
Author: sergeyb
Date: Mon Dec 23 10:40:07 2013
New Revision: 1553091

URL: http://svn.apache.org/r1553091
Log:
[DOSGI-11] Adding a WS databinding bean property for custom data bindings be loaded from Spring/Blueprint

Modified:
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java?rev=1553091&r1=1553090&r2=1553091&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java Mon
Dec 23 10:40:07 2013
@@ -77,6 +77,7 @@ public final class Constants {
     public static final String WS_FEATURES_PROP_KEY = WS_CONFIG_TYPE + ".features";
 
     public static final String WS_DATABINDING_PROP_KEY = WS_CONFIG_TYPE + ".databinding";
+    public static final String WS_DATABINDING_BEAN_PROP_KEY = WS_DATABINDING_PROP_KEY + ".bean";
     public static final String WS_DATA_BINDING_JAXB = "jaxb";
     public static final String WS_DATA_BINDING_AEGIS = "aegis";
 

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java?rev=1553091&r1=1553090&r2=1553091&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
(original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
Mon Dec 23 10:40:07 2013
@@ -141,6 +141,10 @@ public class PojoConfigurationTypeHandle
     }
 
     private DataBinding getDataBinding(Map<String, Object> sd, Class<?> iClass)
{
+        Object dataBindingBeanProp = sd.get(Constants.WS_DATABINDING_BEAN_PROP_KEY);
+        if (dataBindingBeanProp instanceof DataBinding) {
+            return (DataBinding)dataBindingBeanProp;
+        } 
         return isJAXB(sd, iClass) ? new JAXBDataBinding() : new AegisDatabinding();
     }
 



Mime
View raw message