cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r713406 - in /cxf/branches/2.1.x-fixes: ./ rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/ rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/ testutils/src/main/resources/wsdl/
Date Wed, 12 Nov 2008 15:48:48 GMT
Author: dkulp
Date: Wed Nov 12 07:48:48 2008
New Revision: 713406

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

........
  r710076 | seanoc | 2008-11-03 09:56:59 -0500 (Mon, 03 Nov 2008) | 1 line
  
  Added test of xmlbeans data binding
........

Added:
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMine.java
      - copied unchanged from r710076, cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMine.java
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java
      - copied unchanged from r710076, cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java
      - copied unchanged from r710076, cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml
      - copied unchanged from r710076, cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml
      - copied unchanged from r710076, cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl
      - copied unchanged from r710076, cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl
    cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/xmlbeanstest.wsdl
      - copied unchanged from r710076, cxf/trunk/testutils/src/main/resources/wsdl/xmlbeanstest.wsdl
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/XmlBeansSchemaInitializer.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 12 07:48:48 2008
@@ -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,708417,708550,708554,709353-709354,709425,710150,710154,711490,71197
 5,712194,712198,712238,712272,712299,712312,712893,713082
+/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,708417,708550,708554,709353-709354,709425,710076,710150,710154,71149
 0,711975,712194,712198,712238,712272,712299,712312,712893,713082

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/XmlBeansSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java?rev=713406&r1=713405&r2=713406&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java
Wed Nov 12 07:48:48 2008
@@ -28,6 +28,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
@@ -169,11 +170,13 @@
         mapClass(part, clazz);
     }
     private void mapClass(MessagePartInfo part, Class clazz) {
+        
         if (!XmlObject.class.isAssignableFrom(clazz)) {
             
             Class<? extends XmlAnySimpleType> type = CLASS_MAP.get(clazz);
             if (type == null) {
-                System.out.println(clazz);
+                LOG.log(Level.SEVERE, clazz.getName() + " was not found in class map");
+                return;
             }
             SchemaTypeSystem sts = BuiltinSchemaTypeSystem.get();
             SchemaType st2 = sts.typeForClassname(type.getName());
@@ -185,6 +188,7 @@
             part.setXmlSchema(xmlSchema);
             return;
         }
+        
         try {
             Field field = clazz.getField("type");
             SchemaType st = (SchemaType)field.get(null);



Mime
View raw message