svn commit: r326096 - in /webservices/axis2/trunk/java/modules/codegen: src/org/apache/axis2/databinding/schema/ src/org/apache/axis2/databinding/schema/template/ test/org/apache/axis2/databinding/schema/

[aj...@apache.org]

Author: ajith
Date: Tue Oct 18 05:36:57 2005
New Revision: 326096

URL: http://svn.apache.org/viewcvs?rev=326096&view=rev
Log:
Updated the template. Seems there's a bit more work to be done with interfacing the ADBPullParser

Added:
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2Test.java
      - copied, changed from r326082, webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2.java
Removed:
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2.java
Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/BeanWriterMetaInfoHolder.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/template/BeanTemplate.xsl

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/BeanWriterMetaInfoHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/BeanWriterMetaInfoHolder.java?rev=326096&r1=326095&r2=326096&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/BeanWriterMetaInfoHolder.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/BeanWriterMetaInfoHolder.java Tue Oct 18 05:36:57 2005
@@ -31,7 +31,6 @@
 
     private boolean ordered = false;
     private boolean extension = false;
-//    private boolean hasAny = false;
     private String extensionClassName = "";
     private Map elementToSchemaQNameMap = new HashMap();
     private Map elementToJavaClassMap = new HashMap();

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/template/BeanTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/template/BeanTemplate.xsl?rev=326096&r1=326095&r2=326096&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/template/BeanTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/schema/template/BeanTemplate.xsl Tue Oct 18 05:36:57 2005
@@ -62,8 +62,8 @@
          */
         public javax.xml.stream.XMLStreamReader getPullParser(javax.xml.namespace.QName qName){
 
-          Object[] objectList = new Object[]{
-          <xsl:for-each select="property">
+          Object[] elementList = new Object[]{
+          <xsl:for-each select="property[not(@attribute)]">
            <xsl:variable name="propertyName"><xsl:value-of select="@name"/></xsl:variable>
            <xsl:if test="position()>1">,</xsl:if>
               <xsl:choose>
@@ -77,10 +77,16 @@
                        "<xsl:value-of select="$propertyName"/>",org.apache.axis2.databinding.schema.util.ConverterUtil.convertToString(local<xsl:value-of select="@javaname"/>)
                   </xsl:otherwise>
               </xsl:choose>
+          </xsl:for-each>};
 
+         Object[] attribList = new Object[]{
+        <xsl:for-each select="property[@attribute]">
+           <xsl:variable name="propertyName"><xsl:value-of select="@name"/></xsl:variable>
+           <xsl:if test="position()>1">,</xsl:if>
+           "<xsl:value-of select="$propertyName"/>",org.apache.axis2.databinding.schema.util.ConverterUtil.convertToString(local<xsl:value-of select="@javaname"/>)
           </xsl:for-each>};
 
-         return org.apache.axis2.databinding.utils.ADBPullParser.createPullParser(qName, objectList, null);
+         return org.apache.axis2.databinding.utils.ADBPullParser.createPullParser(qName, elementList, attribList);
 
         }
 

Copied: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2Test.java (from r326082, webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2Test.java?p2=webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2Test.java&p1=webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2.java&r1=326082&r2=326096&rev=326096&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/schema/XmlMaxOccurs2Test.java Tue Oct 18 05:36:57 2005
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-public class XmlMaxOccurs2 extends AbstractSchemaCompilerTester{
+public class XmlMaxOccurs2Test extends AbstractSchemaCompilerTester{
     protected void setUp() throws Exception {
         this.fileName = "test-resources/xsd/simple_maxOccurs2.xsd";
         super.setUp();