You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2008/11/20 05:50:24 UTC
svn commit: r719162 - in
/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema:
template/CADBBeanTemplateHeader.xsl template/CADBBeanTemplateSource.xsl
writer/CStructWriter.java
Author: dimuthu
Date: Wed Nov 19 20:50:24 2008
New Revision: 719162
URL: http://svn.apache.org/viewvc?rev=719162&view=rev
Log:
fixing failures of test cases - (compile errors)
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl?rev=719162&r1=719161&r2=719162&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateHeader.xsl Wed Nov 19 20:50:24 2008
@@ -878,7 +878,7 @@
*/
<xsl:value-of select="$propertyType"/> AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_free_popping_value(
- <xsl:value-of select="$axis2_name"/>_t*<xsl:text> </xsl:text><xsl:value-of select="$name"/>,
+ <xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
const axutil_env_t *env);
</xsl:when>
<xsl:otherwise>
@@ -893,7 +893,7 @@
*/
void* AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_free_popping_value(
- <xsl:value-of select="$axis2_name"/>_t*<xsl:text> </xsl:text><xsl:value-of select="$name"/>,
+ <xsl:value-of select="$axis2_name"/>_t*<xsl:text> _</xsl:text><xsl:value-of select="$name"/>,
const axutil_env_t *env);
</xsl:otherwise>
</xsl:choose>
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl?rev=719162&r1=719161&r2=719162&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/CADBBeanTemplateSource.xsl Wed Nov 19 20:50:24 2008
@@ -256,6 +256,7 @@
</xsl:for-each>
</xsl:variable>
+ <!-- the following two functions was added in support of the unwrapped mode -->
<xsl:value-of select="$axis2_name"/>_t* AXIS2_CALL
<xsl:value-of select="$axis2_name"/>_create_with_values(
const axutil_env_t *env<xsl:value-of select="$arg_list"/>)
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java?rev=719162&r1=719161&r2=719162&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/CStructWriter.java Wed Nov 19 20:50:24 2008
@@ -293,9 +293,8 @@
public String makeFullyQualifiedClassName(QName qName) {
String originalName = qName.getLocalPart();
- String modifiedName = ADB_CLASS_PREFIX + originalName + ADB_CLASS_POSTFIX;
- return makeUniqueCStructName(this.namesList, modifiedName);
+ return makeUniqueCStructName(this.namesList, originalName);
}
/**
@@ -510,7 +509,7 @@
XSLTUtils.addAttribute(model, "type", metainf.getItemTypeClassName(), itemType);
XSLTUtils.addAttribute(model, "nsuri", metainf.getItemTypeQName().getNamespaceURI(), itemType);
XSLTUtils.addAttribute(model, "originalName", metainf.getItemTypeQName().getLocalPart(), itemType);
- XSLTUtils.addAttribute(model, "cname", cName, itemType);
+ XSLTUtils.addAttribute(model, "cname", cName.substring(4, cName.length()-3), itemType);
if (typeMap.containsKey(metainf.getItemTypeQName()) ||
groupTypeMap.containsKey(metainf.getItemTypeClassName())) {
@@ -623,7 +622,7 @@
XSLTUtils.addAttribute(model, "nsuri", name.getNamespaceURI(), property);
XSLTUtils.addAttribute(model, "prefix", name.getPrefix(), property);
- XSLTUtils.addAttribute(model, "cname", xmlName, property);
+ XSLTUtils.addAttribute(model, "cname", xmlName.substring(4, xmlName.length() -3), property);
String CClassNameForElement = metainf.getClassNameForQName(name);
@@ -639,7 +638,7 @@
/**
* Caps for use in C macros
*/
- XSLTUtils.addAttribute(model, "caps-cname", xmlName.toUpperCase(), property);
+ XSLTUtils.addAttribute(model, "caps-cname", xmlName.substring(4, xmlName.length() -3 ).toUpperCase(), property);
XSLTUtils.addAttribute(model, "caps-type", CClassNameForElement.toUpperCase(), property);
if (PrimitiveTypeFinder.isPrimitive(CClassNameForElement)) {
@@ -1013,7 +1012,9 @@
}
listOfNames.add(cName.toLowerCase());
- return cName;
+
+ String modifiedCName = ADB_CLASS_PREFIX + cName + ADB_CLASS_POSTFIX;
+ return modifiedCName;
}