cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r639516 - in /incubator/cxf/trunk/rt/databinding/aegis/src: main/java/org/apache/cxf/aegis/ main/java/org/apache/cxf/aegis/type/ test/java/org/apache/cxf/aegis/type/java5/
Date Fri, 21 Mar 2008 02:08:51 GMT
Author: bimargulies
Date: Thu Mar 20 19:08:47 2008
New Revision: 639516

URL: http://svn.apache.org/viewvc?rev=639516&view=rev
Log:
Restore lost mapping of Double to xsd:double, CXF-1482.

Modified:
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
    incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest$CollectionService.aegis.xml
    incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java?rev=639516&r1=639515&r2=639516&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
Thu Mar 20 19:08:47 2008
@@ -105,7 +105,7 @@
 
         Java5TypeCreator j5Creator = new Java5TypeCreator();
         j5Creator.setNextCreator(createDefaultTypeCreator());
-        j5Creator.setConfiguration(getConfiguration());
+        j5Creator.setConfiguration(getTypeCreationOptions());
         xmlCreator.setNextCreator(j5Creator);
 
         return xmlCreator;
@@ -113,13 +113,13 @@
 
     protected AbstractTypeCreator createRootTypeCreator() {
         AbstractTypeCreator creator = new XMLTypeCreator();
-        creator.setConfiguration(getConfiguration());
+        creator.setConfiguration(getTypeCreationOptions());
         return creator;
     }
 
     protected AbstractTypeCreator createDefaultTypeCreator() {
         AbstractTypeCreator creator = new DefaultTypeCreator();
-        creator.setConfiguration(getConfiguration());
+        creator.setConfiguration(getTypeCreationOptions());
         return creator;
     }
 

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java?rev=639516&r1=639515&r2=639516&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
Thu Mar 20 19:08:47 2008
@@ -236,6 +236,7 @@
         defaultRegister(tm, defaultNillable, Element.class, XMLSchemaQNames.XSD_ANY,
                         new JDOMElementType());
         defaultRegister(tm, defaultNillable, Float.class, XMLSchemaQNames.XSD_FLOAT, new
FloatType());
+        defaultRegister(tm, defaultNillable, Double.class, XMLSchemaQNames.XSD_DOUBLE, new
DoubleType());
         defaultRegister(tm, defaultNillable, Integer.class, XMLSchemaQNames.XSD_INT, new
IntType());
         defaultRegister(tm, defaultNillable, Long.class, XMLSchemaQNames.XSD_LONG, new LongType());
         defaultRegister(tm, defaultNillable, Object.class, XMLSchemaQNames.XSD_ANY, new ObjectType());

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest$CollectionService.aegis.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest%24CollectionService.aegis.xml?rev=639516&r1=639515&r2=639516&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest$CollectionService.aegis.xml
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest$CollectionService.aegis.xml
Thu Mar 20 19:08:47 2008
@@ -3,5 +3,8 @@
 		<method name="getUnannotatedStrings">
 			<return-type name="UnannotatedStringCollection" componentType="java.lang.String"/>
 		</method>
+		<method name="takeDoubleList">
+            <parameter index="0" mappedName="doublesList" componentType="java.lang.Double"/>
+        </method> 
 	</mapping>
 </mappings>

Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java?rev=639516&r1=639515&r2=639516&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
(original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
Thu Mar 20 19:08:47 2008
@@ -22,6 +22,7 @@
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 
 import javax.xml.namespace.QName;
@@ -191,6 +192,17 @@
                     + "/xsd:sequence/xsd:element[@type='tns:ArrayOfString']",
                     doc);
     }
+    
+    @Test
+    public void testDoubleList() throws Exception {
+        createService(CollectionService.class, new CollectionService(), null);
+        Document doc = getWSDLDocument("CollectionService");
+        assertValid(
+                    "//xsd:complexType[@name='ArrayOfDouble']"
+                    + "/xsd:sequence/xsd:element[@type='xsd:double']",
+                    doc);
+        
+    }
 
     public class CollectionService {
         
@@ -207,6 +219,9 @@
 
         public Collection<Collection<String>> getStringCollections() {
             return null;
+        }
+        
+        public void takeDoubleList(List<Double> doublesList) {
         }
     }
 }



Mime
View raw message