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 gd...@apache.org on 2007/07/19 00:05:58 UTC
svn commit: r557412 - in /webservices/axis/trunk/java: buildTest.xml
src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
Author: gdaniels
Date: Wed Jul 18 15:05:57 2007
New Revision: 557412
URL: http://svn.apache.org/viewvc?view=rev&rev=557412
Log:
Make sure arrays always have an itemQName, at least for now.
Also exclude failing test.
Modified:
webservices/axis/trunk/java/buildTest.xml
webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
Modified: webservices/axis/trunk/java/buildTest.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/java/buildTest.xml?view=diff&rev=557412&r1=557411&r2=557412
==============================================================================
--- webservices/axis/trunk/java/buildTest.xml (original)
+++ webservices/axis/trunk/java/buildTest.xml Wed Jul 18 15:05:57 2007
@@ -85,12 +85,13 @@
<param name="file">
<fileset dir="${axis.home}" >
<patternset>
- <include name="test/wsdl/**/build.xml" />
- <include name="test/rpc/**/build.xml" />
- <include name="test/functional/build.xml"/>
- <exclude name="test/wsdl/attachments/**/build.xml" unless="attachments.present"/>
- <exclude name="test/wsdl/interop3/**/build.xml" />
- <exclude name="test/wsdl/adaptive/**/build.xml" />
+ <include name="test/wsdl/**/build.xml" />
+ <include name="test/rpc/**/build.xml" />
+ <include name="test/functional/build.xml"/>
+ <exclude name="test/wsdl/attachments/**/build.xml" unless="attachments.present"/>
+ <exclude name="test/wsdl/interop3/**/build.xml" />
+ <exclude name="test/wsdl/adaptive/**/build.xml" />
+ <exclude name="test/wsdl/liberty/**/build.xml" />
</patternset>
</fileset>
</param>
Modified: webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java?view=diff&rev=557412&r1=557411&r2=557412
==============================================================================
--- webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java (original)
+++ webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SchemaUtils.java Wed Jul 18 15:05:57 2007
@@ -1356,8 +1356,10 @@
QName qName = getCollectionComponentQName(node, itemQName, forElement, symbolTable);
- if (qName == null)
+ if (qName == null) {
qName = getArrayComponentQName_JAXRPC(node, dims, underlTypeNillable, symbolTable);
+ if (qName != null && itemQName != null) itemQName.value = new QName("item");
+ }
return qName;
}
Modified: webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java?view=diff&rev=557412&r1=557411&r2=557412
==============================================================================
--- webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java (original)
+++ webservices/axis/trunk/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java Wed Jul 18 15:05:57 2007
@@ -1241,16 +1241,22 @@
new DefinedElement(qName, refType, node, dims);
// Save component type for ArraySerializer
defType.setComponentType(arrayEQName);
- if (itemQName != null)
+ if (itemQName != null) {
defType.setItemQName(itemQName.value);
+ } else {
+ defType.setItemQName(new QName("item"));
+ }
}
} else {
defType = new DefinedType(qName, refType, node, dims);
// Save component type for ArraySerializer
defType.setComponentType(arrayEQName);
defType.setUnderlTypeNillable(underlTypeNillable.value);
- if (itemQName != null)
+ if (itemQName != null) {
defType.setItemQName(itemQName.value);
+ } else {
+ defType.setItemQName(new QName("item"));
+ }
}
if (defType != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org