You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by am...@apache.org on 2007/02/17 10:15:51 UTC
svn commit: r508743 - in /webservices/axis2/trunk/java/modules:
adb-codegen/src/org/apache/axis2/schema/template/
adb-codegen/src/org/apache/axis2/schema/writer/
adb-codegen/test-resources/testsuite/
adb/src/org/apache/axis2/databinding/utils/ kernel/s...
Author: amilas
Date: Sat Feb 17 01:15:50 2007
New Revision: 508743
URL: http://svn.apache.org/viewvc?view=rev&rev=508743
Log:
fixed some issues with adb codegen
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/list.xsd
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/restrictions.xsd
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?view=diff&rev=508743&r1=508742&r2=508743
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl Sat Feb 17 01:15:50 2007
@@ -438,22 +438,22 @@
// setting primitive attribute tracker to true
<xsl:choose>
<xsl:when test="$propertyType='int'">
- if (param==Integer.MIN_VALUE) {
+ if (param==java.lang.Integer.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='long'">
- if (param==Long.MIN_VALUE) {
+ if (param==java.lang.Long.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='byte'">
- if (param==Byte.MIN_VALUE) {
+ if (param==java.lang.Byte.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='double'">
- if (param==Double.NaN) {
+ if (param==java.lang.Double.NaN) {
</xsl:when>
<xsl:when test="$propertyType='float'">
- if (param==Float.NaN) {
+ if (param==java.lang.Float.NaN) {
</xsl:when>
<xsl:when test="$propertyType='short'">
- if (param==Short.MIN_VALUE) {
+ if (param==java.lang.Short.MIN_VALUE) {
</xsl:when>
<xsl:otherwise>
if (false) {
@@ -517,14 +517,40 @@
throw new java.lang.RuntimeException();
}
</xsl:when>
- <xsl:when test="(@maxExFacet) or (@minExFacet) or (@maxInFacet) or (@minInFacet)">
- if ( <xsl:if test="(@minExFacet)"> <xsl:value-of select="$minExFacet"/> < </xsl:if> <xsl:if test="(@minInFacet)"> <xsl:value-of select="$minInFacet"/> <= </xsl:if> param <xsl:if test="(@maxExFacet)"> > <xsl:value-of select="$maxExFacet"/> </xsl:if> <xsl:if test="(@maxInFacet)"> >= <xsl:value-of select="$maxInFacet"/> </xsl:if> ) {
+ <xsl:when test="@maxExFacet or @minExFacet or @maxInFacet or @minInFacet">
+ <xsl:if test="@maxExFacet">
+ if (org.apache.axis2.databinding.utils.ConverterUtil.compare(param, "<xsl:value-of select="$maxExFacet"/>") < 0){
+ this.<xsl:value-of select="$varName"/>=param;
+ }
+ else {
+ throw new java.lang.RuntimeException();
+ }
+ </xsl:if>
+ <xsl:if test="@minExFacet">
+ if (org.apache.axis2.databinding.utils.ConverterUtil.compare(param, "<xsl:value-of select="$maxExFacet"/>") > 0){
+ this.<xsl:value-of select="$varName"/>=param;
+ }
+ else {
+ throw new java.lang.RuntimeException();
+ }
+ </xsl:if>
+ <xsl:if test="@maxInFacet">
+ if (org.apache.axis2.databinding.utils.ConverterUtil.compare(param, "<xsl:value-of select="$maxExFacet"/>") <= 0){
+ this.<xsl:value-of select="$varName"/>=param;
+ }
+ else {
+ throw new java.lang.RuntimeException();
+ }
+ </xsl:if>
+ <xsl:if test="@minInFacet">
+ if (org.apache.axis2.databinding.utils.ConverterUtil.compare(param, "<xsl:value-of select="$maxExFacet"/>") >= 0){
+ this.<xsl:value-of select="$varName"/>=param;
+ }
+ else {
+ throw new java.lang.RuntimeException();
+ }
+ </xsl:if>
- this.<xsl:value-of select="$varName"/>=param;
- }
- else {
- throw new java.lang.RuntimeException();
- }
</xsl:when>
<xsl:otherwise>
this.<xsl:value-of select="$varName"/>=param;
@@ -1156,22 +1182,22 @@
<xsl:if test="@primitive">
<xsl:choose>
<xsl:when test="$propertyBaseType='int'">
- if (<xsl:value-of select="$varName"/>[i]!=Integer.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>[i]!=java.lang.Integer.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyBaseType='long'">
- if (<xsl:value-of select="$varName"/>[i]!=Long.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>[i]!=java.lang.Long.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyBaseType='byte'">
- if (<xsl:value-of select="$varName"/>[i]!=Byte.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>[i]!=java.lang.Byte.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyBaseType='double'">
- if (<xsl:value-of select="$varName"/>[i]!=Double.NaN) {
+ if (<xsl:value-of select="$varName"/>[i]!=java.lang.Double.NaN) {
</xsl:when>
<xsl:when test="$propertyBaseType='float'">
- if (<xsl:value-of select="$varName"/>[i]!=Float.NaN) {
+ if (<xsl:value-of select="$varName"/>[i]!=java.lang.Float.NaN) {
</xsl:when>
<xsl:when test="$propertyBaseType='short'">
- if (<xsl:value-of select="$varName"/>[i]!=Short.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>[i]!=java.lang.Short.MIN_VALUE) {
</xsl:when>
<xsl:otherwise>
if (true) {
@@ -1386,22 +1412,22 @@
<!-- we have to check for nillability with min value -->
<xsl:choose>
<xsl:when test="$propertyType='int'">
- if (<xsl:value-of select="$varName"/>==Integer.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Integer.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='long'">
- if (<xsl:value-of select="$varName"/>==Long.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Long.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='byte'">
- if (<xsl:value-of select="$varName"/>==Byte.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Byte.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='double'">
- if (<xsl:value-of select="$varName"/>==Double.NaN) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Double.NaN) {
</xsl:when>
<xsl:when test="$propertyType='float'">
- if (<xsl:value-of select="$varName"/>==Float.NaN) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Float.NaN) {
</xsl:when>
<xsl:when test="$propertyType='short'">
- if (<xsl:value-of select="$varName"/>==Short.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Short.MIN_VALUE) {
</xsl:when>
<xsl:otherwise>
if (false) {
@@ -1548,22 +1574,22 @@
<!-- we have to check for nillability with min value -->
<xsl:choose>
<xsl:when test="$propertyType='int'">
- if (<xsl:value-of select="$varName"/>==Integer.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Integer.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='long'">
- if (<xsl:value-of select="$varName"/>==Long.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Long.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='byte'">
- if (<xsl:value-of select="$varName"/>==Byte.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Byte.MIN_VALUE) {
</xsl:when>
<xsl:when test="$propertyType='double'">
- if (<xsl:value-of select="$varName"/>==Double.NaN) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Double.NaN) {
</xsl:when>
<xsl:when test="$propertyType='float'">
- if (<xsl:value-of select="$varName"/>==Float.NaN) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Float.NaN) {
</xsl:when>
<xsl:when test="$propertyType='short'">
- if (<xsl:value-of select="$varName"/>==Short.MIN_VALUE) {
+ if (<xsl:value-of select="$varName"/>==java.lang.Short.MIN_VALUE) {
</xsl:when>
<xsl:otherwise>
if (false) {
@@ -2043,6 +2069,10 @@
<xsl:variable name="javaName"><xsl:value-of select="itemtype/@javaname"/></xsl:variable>
<xsl:variable name="varType"><xsl:value-of select="itemtype/@type"/></xsl:variable>
<xsl:variable name="ours"><xsl:value-of select="itemtype/@ours"/></xsl:variable>
+ <xsl:variable name="shortTypeNameUncapped" select="itemtype/@shorttypename"/>
+ <xsl:variable name="shortTypeName"
+ select="concat(translate( substring($shortTypeNameUncapped, 1, 1 ),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' ), substring($shortTypeNameUncapped, 2, string-length($shortTypeNameUncapped)))" />
+
public static <xsl:value-of select="$name"/> fromString(javax.xml.stream.XMLStreamReader xmlStreamReader, java.lang.String content) {
@@ -2082,7 +2112,7 @@
</xsl:when>
<xsl:otherwise>
objectValues[i] =
- org.apache.axis2.databinding.utils.ConverterUtil.convertTo<xsl:value-of select="$javaName"/>(values[i]);
+ org.apache.axis2.databinding.utils.ConverterUtil.convertTo<xsl:value-of select="$shortTypeName"/>(values[i]);
</xsl:otherwise>
</xsl:choose>
@@ -2207,22 +2237,22 @@
<xsl:variable name="javaName"><xsl:value-of select="property/@javaname"/></xsl:variable>
<xsl:choose>
<xsl:when test="$propertyType='int'">
- object.set<xsl:value-of select="$javaName"/>(Integer.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Integer.MIN_VALUE);
</xsl:when>
<xsl:when test="$propertyType='long'">
- object.set<xsl:value-of select="$javaName"/>(Long.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Long.MIN_VALUE);
</xsl:when>
<xsl:when test="$propertyType='byte'">
- object.set<xsl:value-of select="$javaName"/>(Byte.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Byte.MIN_VALUE);
</xsl:when>
<xsl:when test="$propertyType='double'">
- object.set<xsl:value-of select="$javaName"/>(Double.NaN);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Double.NaN);
</xsl:when>
<xsl:when test="$propertyType='float'">
- object.set<xsl:value-of select="$javaName"/>(Float.NaN);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Float.NaN);
</xsl:when>
<xsl:when test="$propertyType='short'">
- object.set<xsl:value-of select="$javaName"/>(Short.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Short.MIN_VALUE);
</xsl:when>
</xsl:choose>
return object;
@@ -2768,22 +2798,22 @@
if ("true".equals(nillableValue) || "1".equals(nillableValue)){
<xsl:choose>
<xsl:when test="$basePropertyType='int'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Integer.MIN_VALUE));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Integer.MIN_VALUE));
</xsl:when>
<xsl:when test="$basePropertyType='long'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Long.MIN_VALUE));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Long.MIN_VALUE));
</xsl:when>
<xsl:when test="$basePropertyType='byte'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Byte.MIN_VALUE));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Byte.MIN_VALUE));
</xsl:when>
<xsl:when test="$basePropertyType='double'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Double.NaN));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Double.NaN));
</xsl:when>
<xsl:when test="$basePropertyType='float'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Float.NaN));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Float.NaN));
</xsl:when>
<xsl:when test="$basePropertyType='short'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Short.MIN_VALUE));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Short.MIN_VALUE));
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$listName"/>.add(null);
@@ -2816,22 +2846,22 @@
if ("true".equals(nillableValue) || "1".equals(nillableValue)){
<xsl:choose>
<xsl:when test="$basePropertyType='int'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Integer.MIN_VALUE));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Integer.MIN_VALUE));
</xsl:when>
<xsl:when test="$basePropertyType='long'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Long.MIN_VALUE));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Long.MIN_VALUE));
</xsl:when>
<xsl:when test="$basePropertyType='byte'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Byte.MIN_VALUE));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Byte.MIN_VALUE));
</xsl:when>
<xsl:when test="$basePropertyType='double'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Double.NaN));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Double.NaN));
</xsl:when>
<xsl:when test="$basePropertyType='float'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Float.NaN));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Float.NaN));
</xsl:when>
<xsl:when test="$basePropertyType='short'">
- <xsl:value-of select="$listName"/>.add(String.valueOf(Short.MIN_VALUE));
+ <xsl:value-of select="$listName"/>.add(String.valueOf(java.lang.Short.MIN_VALUE));
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$listName"/>.add(null);
@@ -3044,22 +3074,22 @@
<!-- set the variable value according to the variable type -->
<xsl:choose>
<xsl:when test="$propertyType='int'">
- object.set<xsl:value-of select="$javaName"/>(Integer.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Integer.MIN_VALUE);
</xsl:when>
<xsl:when test="$propertyType='long'">
- object.set<xsl:value-of select="$javaName"/>(Long.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Long.MIN_VALUE);
</xsl:when>
<xsl:when test="$propertyType='byte'">
- object.set<xsl:value-of select="$javaName"/>(Byte.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Byte.MIN_VALUE);
</xsl:when>
<xsl:when test="$propertyType='double'">
- object.set<xsl:value-of select="$javaName"/>(Double.NaN);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Double.NaN);
</xsl:when>
<xsl:when test="$propertyType='float'">
- object.set<xsl:value-of select="$javaName"/>(Float.NaN);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Float.NaN);
</xsl:when>
<xsl:when test="$propertyType='short'">
- object.set<xsl:value-of select="$javaName"/>(Short.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Short.MIN_VALUE);
</xsl:when>
</xsl:choose>
reader.getElementText(); // throw away text nodes if any.
@@ -3076,22 +3106,22 @@
else {
<xsl:choose>
<xsl:when test="$propertyType='int'">
- object.set<xsl:value-of select="$javaName"/>(Integer.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Integer.MIN_VALUE);
</xsl:when>
<xsl:when test="$propertyType='long'">
- object.set<xsl:value-of select="$javaName"/>(Long.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Long.MIN_VALUE);
</xsl:when>
<xsl:when test="$propertyType='byte'">
- object.set<xsl:value-of select="$javaName"/>(Byte.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Byte.MIN_VALUE);
</xsl:when>
<xsl:when test="$propertyType='double'">
- object.set<xsl:value-of select="$javaName"/>(Double.NaN);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Double.NaN);
</xsl:when>
<xsl:when test="$propertyType='float'">
- object.set<xsl:value-of select="$javaName"/>(Float.NaN);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Float.NaN);
</xsl:when>
<xsl:when test="$propertyType='short'">
- object.set<xsl:value-of select="$javaName"/>(Short.MIN_VALUE);
+ object.set<xsl:value-of select="$javaName"/>(java.lang.Short.MIN_VALUE);
</xsl:when>
</xsl:choose>
}
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java?view=diff&rev=508743&r1=508742&r2=508743
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java Sat Feb 17 01:15:50 2007
@@ -562,6 +562,7 @@
XSLTUtils.addAttribute(model, "originalName", metainf.getItemTypeQName().getLocalPart(), itemType);
XSLTUtils.addAttribute(model, "javaname", javaName, itemType);
+
if (typeMap.containsKey(metainf.getItemTypeQName())) {
XSLTUtils.addAttribute(model, "ours", "true", itemType);
}
@@ -569,6 +570,9 @@
XSLTUtils.addAttribute(model, "primitive", "yes", itemType);
}
+ String shortTypeName = getShortTypeName(metainf.getItemTypeClassName());
+ XSLTUtils.addAttribute(model, "shorttypename", shortTypeName, itemType);
+
}
protected void populateMemberInfo(BeanWriterMetaInfoHolder metainf,
@@ -592,6 +596,8 @@
if (typeMap.containsKey(memberQName)) {
XSLTUtils.addAttribute(model, "ours", "true", memberType);
}
+ String shortTypeName = getShortTypeName(memberClass);
+ XSLTUtils.addAttribute(model, "shorttypename", shortTypeName, memberType);
}
}
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/list.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/list.xsd?view=diff&rev=508743&r1=508742&r2=508743
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/list.xsd (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/list.xsd Sat Feb 17 01:15:50 2007
@@ -32,6 +32,10 @@
<xs:restriction base="tns:TestListString"/>
</xs:simpleType>
+ <xs:simpleType name="TestListInt">
+ <xs:list itemType="xs:int"></xs:list>
+ </xs:simpleType>
+
<xs:element name="SuperTestListStringElement" type="tns:SuperTestListString"/>
</schema>
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/restrictions.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/restrictions.xsd?view=diff&rev=508743&r1=508742&r2=508743
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/restrictions.xsd (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/restrictions.xsd Sat Feb 17 01:15:50 2007
@@ -1,5 +1,6 @@
<xsd:schema elementFormDefault="qualified"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tns="http://tempuri.org/"
xmlns:ns1="http://google.com"
targetNamespace="http://tempuri.org/">
@@ -78,5 +79,27 @@
<xsd:pattern value="\d{4}((-\d{2}){0,1}-\d{2}){0,1}"></xsd:pattern>
</xsd:restriction>
</xsd:simpleType>
+
+ <xs:simpleType name="RFCProbabilityCodeType1">
+ <xs:restriction base="xs:double">
+ <xs:maxInclusive value="1.5"/>
+ <xs:minInclusive value="0.1"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="RFCProbabilityCodeType2">
+ <xs:restriction base="xs:long">
+ <xs:maxExclusive value="5"/>
+ <xs:minExclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="RFCProbabilityCodeType3">
+ <xs:restriction base="xs:integer">
+ <xs:maxExclusive value="5"/>
+ <xs:minExclusive value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+
</xsd:schema>
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?view=diff&rev=508743&r1=508742&r2=508743
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Sat Feb 17 01:15:50 2007
@@ -241,6 +241,10 @@
return Integer.parseInt(s);
}
+ public static BigDecimal convertToBigDecimal(String s){
+ return new BigDecimal(s);
+ }
+
public static double convertToDouble(String s) {
if (POSITIVE_INFINITY.equals(s)) {
return Double.POSITIVE_INFINITY;
@@ -765,7 +769,81 @@
}
/**
- * Converts the given datahandler to a string
+ * @param intValue
+ * @param value
+ * @return 0 if equal , + value if greater than , - value if less than
+ */
+ public static int compare(int intValue, String value) {
+ return intValue - Integer.parseInt(value);
+ }
+
+ /**
+ * @param doubleValue
+ * @param value
+ * @return 0 if equal , + value if greater than , - value if less than
+ */
+ public static double compare(double doubleValue, String value) {
+ return doubleValue - Double.parseDouble(value);
+ }
+
+
+ /**
+ * @param floatValue
+ * @param value
+ * @return 0 if equal , + value if greater than , - value if less than
+ */
+ public static float compare(float floatValue, String value) {
+ return floatValue - Float.parseFloat(value);
+ }
+
+ /**
+ * @param longValue
+ * @param value
+ * @return 0 if equal , + value if greater than , - value if less than
+ */
+ public static long compare(long longValue, String value) {
+ return longValue - Long.parseLong(value);
+ }
+
+ /**
+ * @param shortValue
+ * @param value
+ * @return 0 if equal , + value if greater than , - value if less than
+ */
+ public static int compare(short shortValue, String value) {
+ return shortValue - Short.parseShort(value);
+ }
+
+ /**
+ * @param byteVlaue
+ * @param value
+ * @return 0 if equal , + value if greater than , - value if less than
+ */
+ public static int compare(byte byteVlaue, String value) {
+ return byteVlaue - Byte.parseByte(value);
+ }
+
+
+ /**
+ * @param binBigInteger
+ * @param value
+ * @return 0 if equal , + value if greater than , - value if less than
+ */
+ public static int compare(BigInteger binBigInteger, String value) {
+ return binBigInteger.intValue() - Integer.parseInt(value);
+ }
+
+ /**
+ * @param binBigDecimal
+ * @param value
+ * @return 0 if equal , + value if greater than , - value if less than
+ */
+ public static double compare(BigDecimal binBigDecimal, String value) {
+ return binBigDecimal.doubleValue() - Double.parseDouble(value);
+ }
+
+ /**
+ * Converts the given .datahandler to a string
*
* @return string
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?view=diff&rev=508743&r1=508742&r2=508743
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Sat Feb 17 01:15:50 2007
@@ -616,7 +616,7 @@
}
} else {
- throw new AxisFault("Service " + serviceName + " was not found in the WSDL");
+ throw new AxisFault("No service was not found in the WSDL");
}
}
return service;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org