cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r808509 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
Date Thu, 27 Aug 2009 16:46:53 GMT
Author: dkulp
Date: Thu Aug 27 16:46:52 2009
New Revision: 808509

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

........
  r806981 | bimargulies | 2009-08-23 10:35:12 -0400 (Sun, 23 Aug 2009) | 4 lines
  
  CXF-2402: revert changes to AbstractServiceConfiguration, remove
  exemption for basic type from DefaultServiceConfiguration instead. There's
  nothing wrong with minOccurs=1 on a string, so long as you have set nillable
  to false.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
    cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 27 16:46:52 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
 4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806980
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
 4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806981

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

Modified: cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java?rev=808509&r1=808508&r2=808509&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
Thu Aug 27 16:46:52 2009
@@ -189,34 +189,17 @@
         return null;
     }
     
-    /**
-     * If Aegis is at work, the XML can render a wrapper part non-nillable.
-     * @param mpi part
-     * @return nillability
-     */
     public Boolean isWrapperPartNillable(MessagePartInfo mpi) {
-        return (Boolean)mpi.getProperty("nillable");
+        return null;
     }
     
     public Boolean isWrapperPartQualified(MessagePartInfo mpi) {
         return null;
     }
     public Long getWrapperPartMaxOccurs(MessagePartInfo mpi) {
-        String miString = (String)mpi.getProperty("maxOccurs");
-        if (miString != null) {
-            if ("unbounded".equals(miString)) {
-                return Long.MAX_VALUE;
-            } else {
-                return Long.valueOf(miString, 10);
-            }
-        }
         return null;
     }
     public Long getWrapperPartMinOccurs(MessagePartInfo mpi) {
-        String miString = (String)mpi.getProperty("minOccurs");
-        if (miString != null) {
-            return Long.valueOf(miString, 10);
-        }
         return null;
     }
 }

Modified: cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java?rev=808509&r1=808508&r2=808509&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
Thu Aug 27 16:46:52 2009
@@ -288,33 +288,24 @@
     public Boolean isWrapperPartNillable(MessagePartInfo mpi) {
         return (Boolean)mpi.getProperty("nillable");
     }
+    
     public Long getWrapperPartMaxOccurs(MessagePartInfo mpi) {
-        String max = (String)mpi.getProperty("maxOccurs");
-        long maxi = 1;
-        if (max == null) {
-            if (mpi.getTypeClass() != null && mpi.getTypeClass().isArray()
-                && !Byte.TYPE.equals(mpi.getTypeClass().getComponentType())) {
-                maxi = Long.MAX_VALUE;
+        String miString = (String)mpi.getProperty("maxOccurs");
+        if (miString != null) {
+            if ("unbounded".equals(miString)) {
+                return Long.MAX_VALUE;
+            } else {
+                return Long.valueOf(miString, 10);
             }
-        } else {
-            maxi = "unbounded".equals(max) ? Long.MAX_VALUE : Long.parseLong(max);
         }
-        return maxi;
+        return null;
     }
+    
     public Long getWrapperPartMinOccurs(MessagePartInfo mpi) {
-        String min = (String)mpi.getProperty("minOccurs");
-        
-        long mini = 1;
-        
-        if (min != null) {
-            mini = Long.parseLong(min);
+        String miString = (String)mpi.getProperty("minOccurs");
+        if (miString != null) {
+            return Long.valueOf(miString, 10);
         }
-        
-        if (min == null && mpi.getTypeClass() != null && !mpi.getTypeClass().isPrimitive())
{
-            mini = 0;
-        }
-        return mini;
+        return null;
     }
-
-    
 }



Mime
View raw message