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 ve...@apache.org on 2009/07/04 23:55:12 UTC
svn commit: r791181 - in /webservices/axis2/trunk/java/modules/adb-codegen:
src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
sub-build.xml
Author: veithen
Date: Sat Jul 4 21:55:12 2009
New Revision: 791181
URL: http://svn.apache.org/viewvc?rev=791181&view=rev
Log:
* Fixed the generatePrefix method in ADB helper mode.
* Also moved the generatePrefix method in normal mode to a different place in the template (so that the two templates match).
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=791181&r1=791180&r2=791181&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl Sat Jul 4 21:55:12 2009
@@ -77,13 +77,6 @@
</xsl:otherwise>
</xsl:choose>
- private static java.lang.String generatePrefix(java.lang.String namespace) {
- if(namespace.equals("<xsl:value-of select="$nsuri"/>")){
- return "<xsl:value-of select="$nsprefix"/>";
- }
- return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
- }
-
<xsl:if test="$choice">
/** Whenever a new property is set ensure all others are unset
* There can be only one choice and the last one wins
@@ -1485,6 +1478,13 @@
}
+ private static java.lang.String generatePrefix(java.lang.String namespace) {
+ if(namespace.equals("<xsl:value-of select="$nsuri"/>")){
+ return "<xsl:value-of select="$nsprefix"/>";
+ }
+ return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ }
+
/**
* Utility method to write an element start tag.
*/
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl?rev=791181&r1=791180&r2=791181&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl Sat Jul 4 21:55:12 2009
@@ -76,13 +76,6 @@
</xsl:otherwise>
</xsl:choose>
- private static java.lang.String generatePrefix(java.lang.String namespace) {
- if(namespace.equals("<xsl:value-of select="$nsuri"/>")){
- return "<xsl:value-of select="$nsprefix"/>";
- }
- return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
- }
-
<xsl:if test="$choice">
/** Whenever a new property is set ensure all others are unset
* There can be only one choice and the last one wins
@@ -544,13 +537,6 @@
return <xsl:value-of select="$fullyQualifiedName"/>.class;
}
- private static java.lang.String generatePrefix(java.lang.String namespace) {
- if(namespace.equals(<xsl:value-of select="$fullyQualifiedName"/>.MY_QNAME.getNamespaceURI())){
- return <xsl:value-of select="$fullyQualifiedName"/>.MY_QNAME.getPrefix();
- }
- return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
- }
-
/**
* isReaderMTOMAware
* @return true if the reader supports MTOM
@@ -1090,6 +1076,13 @@
}
+ private static java.lang.String generatePrefix(java.lang.String namespace) {
+ if(namespace.equals("<xsl:value-of select="$nsuri"/>")){
+ return "<xsl:value-of select="$nsprefix"/>";
+ }
+ return org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
+ }
+
/**
* Utility method to write an element start tag.
*/
Modified: webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml?rev=791181&r1=791180&r2=791181&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml Sat Jul 4 21:55:12 2009
@@ -105,9 +105,16 @@
<arg value="-h"/>
<arg file="${testsuite.source.dir}/all.xsd"/>
<arg file="${testsuite.source.dir}/boolean.xsd"/>
+ <arg file="${testsuite.source.dir}/chameleon.xsd"/>
+ <arg file="${testsuite.source.dir}/choice.xsd"/>
+ <arg file="${testsuite.source.dir}/decimal.xsd"/>
<arg file="${testsuite.source.dir}/default_value.xsd"/>
<arg file="${testsuite.source.dir}/enumeration.xsd"/>
+ <arg file="${testsuite.source.dir}/groups.xsd"/>
+ <arg file="${testsuite.source.dir}/innerchoice.xsd"/>
+ <arg file="${testsuite.source.dir}/innerParticleExtension.xsd"/>
<arg file="${testsuite.source.dir}/unqualified.xsd"/>
+ <arg file="${testsuite.source.dir}/unqualified/companyservice.xsd"/>
<arg file="${schema.generated.src.dir}"/>
</java>
</target>