cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r751578 - in /cxf/branches/2.1.x-fixes: ./ rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/
Date Mon, 09 Mar 2009 03:18:42 GMT
Author: ningjiang
Date: Mon Mar  9 03:18:40 2009
New Revision: 751578

URL: http://svn.apache.org/viewvc?rev=751578&view=rev
Log:
Merged revisions 751576 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r751576 | ningjiang | 2009-03-09 10:48:02 +0800 (Mon, 09 Mar 2009) | 1 line
  
  CXF-2076 made CXF work with the XMLBeans wrapper objects
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
    cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelper.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  9 03:18:40 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
 732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
 8223,748305,748313,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749767,749771,749799,749890,750059-750060,750302,750591,750689,750935,751067-751110,751233,751527,751567
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
 732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
 8223,748305,748313,748603-748604,748768,749420,749449,749454-749456,749505,749511,749513,749584,749767,749771,749799,749890,750059-750060,750302,750591,750689,750935,751067-751110,751233,751527,751567,751576

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

Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java?rev=751578&r1=751577&r2=751578&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java
Mon Mar  9 03:18:40 2009
@@ -70,7 +70,7 @@
                 try {
                     SchemaType st = (SchemaType)part.getProperty(SchemaType.class.getName());
                     XmlOptions options = new XmlOptions();
-                    if (!st.isDocumentType() && !isOutClass) {
+                    if (st != null && !st.isDocumentType() && !isOutClass)
{
                         options.setLoadReplaceDocumentElement(null);
                     }
                     Method meth = c.getMethod("parse", XMLStreamReader.class, XmlOptions.class);
@@ -124,7 +124,7 @@
         return obj;
     }
 
-    public Object read(QName name, XMLStreamReader input, Class type) {
+    public Object read(QName name, XMLStreamReader input, Class type) {        
         return null;
     }
 

Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java?rev=751578&r1=751577&r2=751578&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
Mon Mar  9 03:18:40 2009
@@ -94,7 +94,7 @@
                 }
                 SchemaType st = (SchemaType)part.getProperty(SchemaType.class.getName());
 
-                if (!st.isDocumentType()) {
+                if (st != null && !st.isDocumentType()) {
                     if (StringUtils.isEmpty(part.getConcreteName().getNamespaceURI())) {
                         output.writeStartElement(part.getConcreteName().getLocalPart());
                         

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelper.java?rev=751578&r1=751577&r2=751578&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelper.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperHelper.java
Mon Mar  9 03:18:40 2009
@@ -45,10 +45,48 @@
 
     public abstract String getSignature();
     
+    private static Class<?> getXMLBeansValueType(Class<?> wrapperType)  {
+        Class<?> result = wrapperType;
+        for (Method method : wrapperType.getMethods()) {
+            if (method.getName().startsWith("addNew")) {                
+                result = method.getReturnType();
+                break;
+            }
+        }
+        return result;
+    }
+    
+    private static Object createXMLBeansValueObject(Class<?> wrapperType) 
+        throws SecurityException, NoSuchMethodException, IllegalArgumentException,
+            IllegalAccessException, InvocationTargetException {
+        
+        Class<?> cls[] = wrapperType.getDeclaredClasses();
+        Method newType = null;
+        for (Method method : wrapperType.getMethods()) {
+            if (method.getName().startsWith("addNew")) {
+                newType = method;                            
+            }
+        }                     
+        Object obj = null;
+        for (Class<?> c : cls) {                        
+            if ("Factory".equals(c.getSimpleName())) {                            
+                Method method = c.getMethod("newInstance", NO_PARAMS); 
+                // create the instance of document type
+                obj = method.invoke(null, NO_PARAMS);
+                // create the value object
+                obj = newType.invoke(obj, NO_PARAMS);
+                break;
+            }
+        }
+        
+        return obj;
+    }
+       
     public static WrapperHelper createWrapperHelper(Class<?> wrapperType,
                                                     List<String> partNames,
                                                     List<String> elTypeNames,
                                                     List<Class<?>> partClasses)
{
+       
         List<Method> getMethods = new ArrayList<Method>(partNames.size());
         List<Method> setMethods = new ArrayList<Method>(partNames.size());
         List<Method> jaxbMethods = new ArrayList<Method>(partNames.size());
@@ -78,7 +116,7 @@
         }
         
         for (int x = 0; x < partNames.size(); x++) {
-            String partName = partNames.get(x);
+            String partName = partNames.get(x);            
             if (partName == null) {
                 getMethods.add(null);
                 setMethods.add(null);
@@ -93,13 +131,18 @@
             String setAccessor = JAXBUtils.nameToIdentifier(partName, JAXBUtils.IdentifierType.SETTER);
             Method getMethod = null;
             Method setMethod = null;
-            try {
-                getMethod = wrapperType.getMethod(getAccessor, NO_PARAMS); 
+            Class<?> valueClass = wrapperType;
+            try {               
+                if (wrapperType.isInterface()) {
+                    valueClass = getXMLBeansValueType(wrapperType);
+                    allMethods = valueClass.getMethods();
+                }
+                getMethod = valueClass.getMethod(getAccessor, NO_PARAMS); 
             } catch (NoSuchMethodException ex) {
                 //ignore for now
             }
 
-            Field elField = getElField(partName, wrapperType);
+            Field elField = getElField(partName, valueClass);
             if (getMethod == null
                 && elementType != null
                 && "boolean".equals(elementType.toLowerCase())
@@ -118,10 +161,10 @@
                 && "return".equals(partName)) {
                 //RI generated code uses this
                 try {
-                    getMethod = wrapperType.getMethod("get_return", NO_PARAMS);
+                    getMethod = valueClass.getMethod("get_return", NO_PARAMS);
                 } catch (NoSuchMethodException ex) {
                     try {
-                        getMethod = wrapperType.getMethod("is_return",
+                        getMethod = valueClass.getMethod("is_return",
                                                           new Class[0]);
                     } catch (NoSuchMethodException ex2) {
                         //ignore for now
@@ -204,7 +247,7 @@
         if ("javax.xml.bind.JAXBElement".equals(method.getReturnType().getCanonicalName()))
{
             JAXBElement je = (JAXBElement)method.invoke(in);
             return je == null ? je : je.getValue();
-        } else {
+        } else {            
             return method.invoke(in);
         }
     }
@@ -272,10 +315,13 @@
         }
         public Object createWrapperObject(List<?> lst) 
             throws Fault {
-            
             try {
-                Object ret = wrapperType.newInstance();
-
+                Object value = null;
+                if (wrapperType.isInterface()) {
+                    value = createXMLBeansValueObject(wrapperType);
+                } else {
+                    value = wrapperType.newInstance();
+                }
                 for (int x = 0; x < setMethods.length; x++) {
                     if (getMethods[x] == null
                         && setMethods[x] == null 
@@ -289,38 +335,46 @@
                         o = jaxbObjectMethods[x].invoke(objectFactory, o);
                     }
                     if (o instanceof List) {
-                        List<Object> col = CastUtils.cast((List)getMethods[x].invoke(ret));
+                        List<Object> col = CastUtils.cast((List)getMethods[x].invoke(value));
                         if (col == null) {
                             //broken generated java wrappers
                             if (setMethods[x] != null) {
-                                setMethods[x].invoke(ret, o);
+                                setMethods[x].invoke(value, o);
                             } else {
-                                fields[x].set(ret, lst.get(x));
+                                fields[x].set(value, lst.get(x));
                             }
                         } else {
                             List<Object> olst = CastUtils.cast((List)o);
                             col.addAll(olst);
                         }
-                    } else if (setMethods[x] != null) {
-                        setMethods[x].invoke(ret, o);
+                    } else if (setMethods[x] != null) {                        
+                        setMethods[x].invoke(value, o);
                     } else if (fields[x] != null) {
-                        fields[x].set(ret, lst.get(x));
+                        fields[x].set(value, lst.get(x));
                     }
                 }
-                return ret;
+                return value;
             } catch (Exception ex) {
                 throw new Fault(ex);
             }
         }
         
         public List<Object> getWrapperParts(Object o) throws Fault {
+            Object valueObject = o;
             try {
+                if (wrapperType.isInterface()) {                    
+                    Class<?> valueClass = getXMLBeansValueType(wrapperType);
+                    // we need get the real Object first
+                    Method method = wrapperType.getMethod("get" + valueClass.getSimpleName(),
NO_PARAMS);
+                    valueObject = method.invoke(o, NO_PARAMS);
+                }
+            
                 List<Object> ret = new ArrayList<Object>(getMethods.length);
                 for (int x = 0; x < getMethods.length; x++) {
                     if (getMethods[x] != null) {
-                        ret.add(getValue(getMethods[x], o));
+                        ret.add(getValue(getMethods[x], valueObject));                  
     
                     } else if (fields[x] != null) {
-                        ret.add(fields[x].get(o));
+                        ret.add(fields[x].get(valueObject));
                     } else {
                         //placeholder
                         ret.add(null);



Mime
View raw message