You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2011/07/10 21:41:24 UTC
svn commit: r1144945 [2/2] - in /axis/axis2/java/core/branches/1_6: ./
modules/adb-codegen/src/org/apache/axis2/schema/template/
modules/adb/src/org/apache/axis2/databinding/types/soapencoding/
modules/adb/src/org/apache/axis2/databinding/types/xsd/ mo...
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_long.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_long.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_long.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_long.java Sun Jul 10 19:41:21 2011
@@ -320,11 +320,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_short.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_short.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_short.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_short.java Sun Jul 10 19:41:21 2011
@@ -320,11 +320,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/AnyURI.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/AnyURI.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/AnyURI.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/AnyURI.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64.java Sun Jul 10 19:41:21 2011
@@ -319,11 +319,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64Binary.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64Binary.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64Binary.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64Binary.java Sun Jul 10 19:41:21 2011
@@ -327,11 +327,14 @@ import org.apache.axiom.util.stax.XMLStr
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Date.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Date.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Date.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Date.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/DateTime.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/DateTime.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/DateTime.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/DateTime.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Decimal.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Decimal.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Decimal.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Decimal.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Duration.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Duration.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Duration.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Duration.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITIES.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITIES.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITIES.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITIES.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITY.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITY.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITY.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITY.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GDay.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GDay.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GDay.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GDay.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonth.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonth.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonth.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonth.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonthDay.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonthDay.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonthDay.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonthDay.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYear.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYear.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYear.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYear.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYearMonth.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYearMonth.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYearMonth.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYearMonth.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/HexBinary.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/HexBinary.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/HexBinary.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/HexBinary.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ID.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ID.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ID.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/ID.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREF.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREF.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREF.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREF.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREFS.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREFS.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREFS.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREFS.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Integer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Integer.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Integer.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Integer.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Language.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Language.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Language.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Language.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NCName.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NCName.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NCName.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NCName.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKEN.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKEN.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKEN.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKEN.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKENS.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKENS.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKENS.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKENS.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NOTATION.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NOTATION.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NOTATION.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NOTATION.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Name.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Name.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Name.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Name.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NegativeInteger.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NegativeInteger.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NegativeInteger.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NegativeInteger.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonNegativeInteger.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonNegativeInteger.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonNegativeInteger.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonNegativeInteger.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonPositiveInteger.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonPositiveInteger.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonPositiveInteger.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonPositiveInteger.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NormalizedString.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NormalizedString.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NormalizedString.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/NormalizedString.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/PositiveInteger.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/PositiveInteger.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/PositiveInteger.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/PositiveInteger.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/QName.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/QName.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/QName.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/QName.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/String.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/String.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/String.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/String.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Time.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Time.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Time.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Time.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Token.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Token.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Token.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/Token.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedByte.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedByte.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedByte.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedByte.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedInt.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedInt.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedInt.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedInt.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedLong.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedLong.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedLong.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedLong.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedShort.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedShort.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedShort.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedShort.java Sun Jul 10 19:41:21 2011
@@ -325,11 +325,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_boolean.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_boolean.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_boolean.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_boolean.java Sun Jul 10 19:41:21 2011
@@ -314,11 +314,14 @@ public class _boolean
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_byte.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_byte.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_byte.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_byte.java Sun Jul 10 19:41:21 2011
@@ -320,11 +320,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_double.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_double.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_double.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_double.java Sun Jul 10 19:41:21 2011
@@ -320,11 +320,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_float.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_float.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_float.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_float.java Sun Jul 10 19:41:21 2011
@@ -320,11 +320,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_int.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_int.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_int.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_int.java Sun Jul 10 19:41:21 2011
@@ -320,11 +320,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_long.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_long.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_long.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_long.java Sun Jul 10 19:41:21 2011
@@ -320,11 +320,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_short.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_short.java?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_short.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/types/xsd/_short.java Sun Jul 10 19:41:21 2011
@@ -320,11 +320,14 @@ import javax.xml.stream.XMLStreamWriter;
if (prefix == null) {
prefix = generatePrefix(namespace);
-
- while (xmlWriter.getNamespaceContext().getNamespaceURI(prefix) != null) {
+ javax.xml.namespace.NamespaceContext nsContext = xmlWriter.getNamespaceContext();
+ while (true) {
+ java.lang.String uri = nsContext.getNamespaceURI(prefix);
+ if (uri == null || uri.length() == 0) {
+ break;
+ }
prefix = org.apache.axis2.databinding.utils.BeanUtil.getUniquePrefix();
}
-
xmlWriter.writeNamespace(prefix, namespace);
xmlWriter.setPrefix(prefix, namespace);
}
Modified: axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml Sun Jul 10 19:41:21 2011
@@ -179,6 +179,31 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-wsdl2code-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>wsdl2code</goal>
+ </goals>
+ <configuration>
+ <packageName>server</packageName>
+ <wsdlFile>test-resources/wsdl/echo.wsdl</wsdlFile>
+ <databindingName>adb</databindingName>
+ <generateServerSide>true</generateServerSide>
+ <namespaceURIs>
+ <namespaceURI>
+ <uri>http://test</uri>
+ <packageName>server</packageName>
+ </namespaceURI>
+ </namespaceURIs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -1229,7 +1254,8 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/target/schema/src</source>
+ <source>${project.build.directory}/schema/src</source>
+ <source>${project.build.directory}/generated-sources/axis2/wsdl2code/src</source>
</sources>
</configuration>
</execution>
Modified: axis/axis2/java/core/branches/1_6/modules/jaxws-integration/test/server/META-INF/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws-integration/test/server/META-INF/services.xml?rev=1144945&r1=1144944&r2=1144945&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws-integration/test/server/META-INF/services.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws-integration/test/server/META-INF/services.xml Sun Jul 10 19:41:21 2011
@@ -22,7 +22,7 @@
<messageReceivers>
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" class="server.EchoServiceMessageReceiverInOut"/>
</messageReceivers>
- <parameter name="ServiceClass">server.EchoServiceSkeleton</parameter>
+ <parameter name="ServiceClass">server.EchoServiceImpl</parameter>
<operation name="echoString" mep="http://www.w3.org/2004/08/wsdl/in-out">
<actionMapping/>
</operation>