axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r533057 - in /webservices/axis2/branches/java/1_2/modules: adb/src/org/apache/axis2/databinding/utils/BeanUtil.java java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
Date Fri, 27 Apr 2007 10:42:09 GMT
Author: deepal
Date: Fri Apr 27 03:42:08 2007
New Revision: 533057

URL: http://svn.apache.org/viewvc?view=rev&rev=533057
Log:
reverting POJO inheritance support patch 

Modified:
    webservices/axis2/branches/java/1_2/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
    webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java

Modified: webservices/axis2/branches/java/1_2/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?view=diff&rev=533057&r1=533056&r2=533057
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Fri Apr 27 03:42:08 2007
@@ -278,10 +278,10 @@
             // support polymorphism in POJO approach.
             // For some reason, using QName(Constants.XSI_NAMESPACE, "type", "xsi") does
not generate
             // an xsi:type attribtue properly for inner objects. So just using a simple QName("type").
-            ArrayList objectAttributes = new ArrayList();
-            objectAttributes.add(new QName(Constants.XSI_NAMESPACE, "type", "xsi"));
-            objectAttributes.add(beanObject.getClass().getName());
-            return new ADBXMLStreamReaderImpl(beanName, object.toArray(), objectAttributes.toArray(),
+//            ArrayList objectAttributes = new ArrayList();
+//            objectAttributes.add(new QName(Constants.XSI_NAMESPACE, "type", "xsi"));
+//            objectAttributes.add(beanObject.getClass().getName());
+            return new ADBXMLStreamReaderImpl(beanName, object.toArray(), null,
                                               typeTable, qualified);
 
         } catch (java.io.IOException e) {
@@ -321,18 +321,18 @@
             // to support polymorphism in POJO approach.
             // Retrieve the type name of the instance from the 'type' attribute
             // and retrieve the class.
-            String instanceTypeName = beanElement.getAttributeValue(
-                    new QName(Constants.XSI_NAMESPACE,"type","xsi"));
-            if ((instanceTypeName != null) && (! beanClass.isArray())) {
-                try {
-                    beanClass = Class.forName(instanceTypeName);
-                } catch (ClassNotFoundException ce) {
-                    log.warn(ce);
+//            String instanceTypeName = beanElement.getAttributeValue(
+//                    new QName(Constants.XSI_NAMESPACE,"type","xsi"));
+//            if ((instanceTypeName != null) && (! beanClass.isArray())) {
+//                try {
+//                    beanClass = Class.forName(instanceTypeName);
+//                } catch (ClassNotFoundException ce) {
+//                    log.warn(ce);
                     // This breaks samples , and Need to improve a bit to fully 
                     // support this so , Exception just ignore here, we can fix
                     // that later
-                }
-            }
+//                }
+//            }
    
             if (beanClass.isArray()) {
                 ArrayList valueList = new ArrayList();
@@ -367,16 +367,16 @@
                     PropertyDescriptor proprty = propDescs[i];
                     properties.put(proprty.getName(), proprty);
                 }
-
+                 beanObj = objectSupplier.getObject(beanClass);
                 boolean tuched = false;
                 Iterator elements = beanElement.getChildren();
                 while (elements.hasNext()) {
                     // the beanClass could be an abstract one.
                     // so create an instance only if there are elements, in
                     // which case a concrete subclass is available to instantiate.
-                    if (beanObj == null) {
-                        beanObj = objectSupplier.getObject(beanClass);
-                    }
+//                    if (beanObj == null) {
+//                        beanObj = objectSupplier.getObject(beanClass);
+//                    }
                     OMElement parts;
                     Object objValue = elements.next();
                     if (objValue instanceof OMElement) {

Modified: webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?view=diff&rev=533057&r1=533056&r2=533057
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
(original)
+++ webservices/axis2/branches/java/1_2/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
Fri Apr 27 03:42:08 2007
@@ -405,8 +405,8 @@
             // adding this type to the table
             typeTable.addComplexSchema(name, eltOuter.getQName());
              // adding this type's package to the table, to support inheritance.
-            typeTable.addComplexSchema(javaType.getContainingPackage().getQualifiedName(),
-                    eltOuter.getQName());
+//            typeTable.addComplexSchema(javaType.getContainingPackage().getQualifiedName(),
+//                    eltOuter.getQName());
 
 
         JClass tempClass = javaType;



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message