[jbossws-commits] JBossWS SVN: r5928 - in stack/native/trunk/src/main/java/org/jboss/ws/tools: wsdl and 1 other directory.
Author: mageshbk(a)jboss.com
Date: 2008-03-12 03:43:46 -0400 (Wed, 12 Mar 2008)
New Revision: 5928
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
Log:
[JBWS-2018] Fixed array types package lookup
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
---
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2008-03-12
07:11:50 UTC (rev 5927)
+++
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2008-03-12
07:43:46 UTC (rev 5928)
@@ -567,7 +567,7 @@
if (xmlType != null)
{
name = xmlType.getLocalPart();
- namespace = xmlType.getNamespaceURI();
+ namespace = getNamespace(componentType, xmlType.getNamespaceURI());
//xmlType.getNamespaceURI();
}
else
{
@@ -706,6 +706,11 @@
if (javaType.isPrimitive())
return Constants.NS_JBOSSWS_URI + "/primitives";
+ while (javaType.isArray())
+ {
+ javaType = javaType.getComponentType();
+ }
+
Package javaPackage = javaType.getPackage();
if (javaPackage == null)
{
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2008-03-12
07:11:50 UTC (rev 5927)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2008-03-12
07:43:46 UTC (rev 5928)
@@ -547,6 +547,10 @@
protected String getNamespace(Class type, String defaultNS)
{
+ while (type.isArray())
+ {
+ type = type.getComponentType();
+ }
Package pkg = type.getPackage();
String pkgName = null;
if (pkg != null)