Author: sagara
Date: Thu Jul 12 08:25:23 2012
New Revision: 1360577
URL: http://svn.apache.org/viewvc?rev=1360577&view=rev
Log:
Merged r1360573 to 1.6 branch.
Added:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/xsd/fixed_value.xsd
- copied unchanged from r1360573,
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/xsd/fixed_value.xsd
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/fix/
- copied from r1360573,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/fix/
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/fix/FixedValueTest.java
- copied unchanged from r1360573,
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/fix/FixedValueTest.java
Modified:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
axis/axis2/java/core/branches/1_6/modules/adb-codegen/sub-build.xml
Modified:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java?rev=1360577&r1=1360576&r2=1360577&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java
Thu Jul 12 08:25:23 2012
@@ -80,6 +80,7 @@ public class BeanWriterMetaInfoHolder {
protected String itemTypeClassName;
protected boolean isUnion;
protected boolean isList;
+ protected boolean fixed = false;
protected boolean isParticleClass;
// keep whether this class has a partical class type variable
@@ -941,6 +942,14 @@ public class BeanWriterMetaInfoHolder {
public QName getRestrictionBaseType() {
return restrictionBaseType;
+ }
+
+ public boolean isFixed() {
+ return fixed;
+ }
+
+ public void setFixed(boolean fixed) {
+ this.fixed = fixed;
}
@Override
@@ -966,7 +975,7 @@ public class BeanWriterMetaInfoHolder {
+ restrictionBaseType + ", restrictionClassName=" +
restrictionClassName
+ ", simple=" + simple + ", specialTypeFlagMap=" +
specialTypeFlagMap
+ ", totalDigitsFacet=" + totalDigitsFacet + ",
xmlNameJavaNameMap="
- + xmlNameJavaNameMap + "]";
+ + xmlNameJavaNameMap + ", xmlNameJavaNameMap=" + fixed + "]";
}
}
Modified:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1360577&r1=1360576&r2=1360577&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Thu Jul 12 08:25:23 2012
@@ -547,6 +547,12 @@ public class SchemaCompiler {
metainf.registerDefaultValue(xsElt.getQName(),xsElt.getDefaultValue());
}
+ // register the fixed value if present
+ if (xsElt.getFixedValue() != null){
+
metainf.registerDefaultValue(xsElt.getQName(),xsElt.getFixedValue());
+ metainf.setFixed(true);
+ }
+
if (isBinary(xsElt)) {
metainf.addtStatus(xsElt.getQName(),
SchemaConstants.BINARY_TYPE);
@@ -1815,6 +1821,10 @@ public class SchemaCompiler {
// set the default value
if (att.getDefaultValue() != null){
metainf.registerDefaultValue(att.getQName(),att.getDefaultValue());
+ }
+ if(att.getFixedValue() != null){
+ metainf.registerDefaultValue(att.getQName(),
att.getFixedValue());
+ metainf.setFixed(true);
}
// after
} else {
@@ -2222,7 +2232,11 @@ public class SchemaCompiler {
if (elt.getDefaultValue() != null){
metainfHolder.registerDefaultValue(referencedQName,elt.getDefaultValue());
}
-
+ // register the default value as well
+ if (elt.getFixedValue() != null){
+
metainfHolder.registerDefaultValue(referencedQName,elt.getFixedValue());
+ metainfHolder.setFixed(true);
+ }
}
}
Modified:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1360577&r1=1360576&r2=1360577&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
(original)
+++
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Thu Jul 12 08:25:23 2012
@@ -115,6 +115,7 @@
<xsl:variable name="maxInFacet"><xsl:value-of
select="@maxInFacet"/></xsl:variable>
<xsl:variable name="minInFacet"><xsl:value-of
select="@minInFacet"/></xsl:variable>
<xsl:variable name="patternFacet"><xsl:value-of
select="@patternFacet"/></xsl:variable>
+ <xsl:variable name="fixed" select="@fixed"/>
<xsl:variable name="shortTypeNameUncapped"
select="@shorttypename"/>
<xsl:variable name="shortTypeName"
select="concat(translate( substring($shortTypeNameUncapped, 1,
1 ),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' ),
substring($shortTypeNameUncapped, 2, string-length($shortTypeNameUncapped)))" />
@@ -526,7 +527,9 @@
</xsl:when>
<xsl:otherwise>
+ <xsl:if test="not($fixed)">
this.<xsl:value-of
select="$varName"/>=param;
+ </xsl:if>
</xsl:otherwise>
</xsl:choose>
Modified:
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java?rev=1360577&r1=1360576&r2=1360577&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
Thu Jul 12 08:25:23 2012
@@ -872,6 +872,10 @@ public class JavaBeanWriter implements B
if (metainf.getInnerChoiceStatusForQName(name)){
XSLTUtils.addAttribute(model, "innerchoice", "yes", property);
}
+
+ if (metainf.isFixed()){
+ XSLTUtils.addAttribute(model, "fixed", "yes", property);
+ }
Modified: axis/axis2/java/core/branches/1_6/modules/adb-codegen/sub-build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/sub-build.xml?rev=1360577&r1=1360576&r2=1360577&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb-codegen/sub-build.xml
(original)
+++ axis/axis2/java/core/branches/1_6/modules/adb-codegen/sub-build.xml Thu Jul
12 08:25:23 2012
@@ -85,6 +85,7 @@
<arg
file="${testsuite.source.dir}/unqualified/companyservice.xsd"/>
<arg file="${testsuite.source.dir}/names.xsd"/> <!--
compile only; no tests -->
<arg file="${testsuite.source.dir}/std-schemas.xsd"/>
<!-- compile only; no tests -->
+ <arg file="${schema.source.dir}/fixed_value.xsd"/>
<arg file="${schema.generated.src.dir}"/>
</java>
<java classname="org.apache.axis2.schema.XSD2Java" fork="true"
failonerror="true">
