svn commit: r811181 - in /cxf/trunk/rt/databinding/aegis/src: main/java/org/apache/cxf/aegis/type/java5/ test/java/org/apache/cxf/aegis/inheritance/ws1/ test/java/org/apache/cxf/aegis/inheritance/ws1/impl/

[bimargulies]

Author: bimargulies
Date: Fri Sep  4 00:03:27 2009
New Revision: 811181

URL: http://svn.apache.org/viewvc?rev=811181&view=rev
Log:
Fix up test failures.

Added:
    
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.aegis.xml
      - copied, changed from r811180, 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java
Modified:
    
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
    
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java
    
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java

Modified: 
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java?rev=811181&r1=811180&r2=811181&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
 Fri Sep  4 00:03:27 2009
@@ -193,7 +193,7 @@
                 return paramType; // take our chances.
             }
         } else {
-            throw new DatabindingException("Type " + genericType + " is not a 
generic.");
+            return null;
         }
     }
 

Copied: 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.aegis.xml
 (from r811180, 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java)
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.aegis.xml?p2=cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.aegis.xml&p1=cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java&r1=811180&r2=811181&rev=811181&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.aegis.xml
 Fri Sep  4 00:03:27 2009
@@ -1,4 +1,4 @@
-/**
+<!-- 
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
@@ -15,32 +15,12 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
- */
-package org.apache.cxf.aegis.inheritance.ws1;
-
-import java.util.Map;
-
-/**
- * <br/>
- * 
- * @author xfournet
- */
-public interface WS1 {
-    BeanA getBeanA();
-
-    BeanB getBeanB();
-
-    BeanA getBean(String id);
-
-    BeanA[] listBeans();
-
-    RootBean getRootBean(String id);
-
-    RootBean[] listRootBeans();
-
-    ResultBean getResultBean();
-
-    Map echoMap(Map beans);
-
-    void throwException(boolean extendedOne) throws WS1Exception;
-}
+ * -->
+<mappings xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+       <mapping>
+       <method name="echoMap">
+      <return-type keyType="java.lang.String" valueType="java.lang.String" />
+      <parameter index="0" keyType="java.lang.String" 
valueType="java.lang.String" />
+    </method>
+       </mapping>
+</mappings> 
\ No newline at end of file

Modified: 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java?rev=811181&r1=811180&r2=811181&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1.java
 Fri Sep  4 00:03:27 2009
@@ -20,11 +20,6 @@
 
 import java.util.Map;
 
-/**
- * <br/>
- * 
- * @author xfournet
- */
 public interface WS1 {
     BeanA getBeanA();
 
@@ -41,6 +36,7 @@
     ResultBean getResultBean();
 
     Map echoMap(Map beans);
+    Map echoRawMap(Map rawMap);
 
     void throwException(boolean extendedOne) throws WS1Exception;
 }

Modified: 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java?rev=811181&r1=811180&r2=811181&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java
 Fri Sep  4 00:03:27 2009
@@ -121,4 +121,8 @@
             throw new WS1Exception("WS1 base exception", 10);
         }
     }
+
+    public Map echoRawMap(Map rawMap) {
+        return rawMap;
+    }
 }