svn commit: r681502 - in /tuscany/java/sca: itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/ modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/

[rfeng]

Author: rfeng
Date: Thu Jul 31 14:20:58 2008
New Revision: 681502

URL: http://svn.apache.org/viewvc?rev=681502&view=rev
Log:
Fix for TUSCANY-2389

Modified:
    
tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
    
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java

Modified: 
tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java?rev=681502&r1=681501&r2=681502&view=diff
==============================================================================
--- 
tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
 (original)
+++ 
tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
 Thu Jul 31 14:20:58 2008
@@ -567,7 +567,7 @@
      * Service method invoked is getNewObjectArray.
      */
     @Test
-    @Ignore("TUSCANY-2389")
+    // @Ignore("TUSCANY-2389")
     public void testWSNewObjectArray() throws Exception {
         StandardTypesServiceClient serviceClient =
             domain.getService(StandardTypesServiceClient.class, 
"StandardTypesServiceClientWSComponent");

Modified: 
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java?rev=681502&r1=681501&r2=681502&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
 (original)
+++ 
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
 Thu Jul 31 14:20:58 2008
@@ -20,7 +20,6 @@
 package org.apache.tuscany.sca.interfacedef.java.jaxws;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -230,6 +229,8 @@
             if (isNillable) {
                 av0.visit("nillable", Boolean.TRUE);
             }
+            // FIXME:
+            // av0.visit("required", Boolean.FALSE);
             av0.visitEnd();
         }
 
@@ -457,7 +458,10 @@
             this.type = javaClass;
             this.genericSignature = 
CodeGenerationHelper.getJAXWSSignature(type);
             this.element = isElement; 
-            this.nillable = (type instanceof GenericArrayType);
+            // FIXME: How to test nillable?
+            // this.nillable = (type instanceof GenericArrayType) || 
Collection.class.isAssignableFrom(javaClass) || javaClass.isArray();
+            // TUSCANY-2389: Set the nillable consistent with what wsgen 
produces
+            this.nillable = javaClass.isArray();
         }
 
         public String getName() {