You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by em...@apache.org on 2007/03/05 08:26:44 UTC
svn commit: r514585 - in
/incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl:
generator/TypesGenerator.java processor/internal/ClassProcessor.java
Author: ema
Date: Sun Mar 4 23:26:43 2007
New Revision: 514585
URL: http://svn.apache.org/viewvc?view=rev&rev=514585
Log:
Fixed issue CXF-358
Modified:
incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/generator/TypesGenerator.java
incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ClassProcessor.java
Modified: incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/generator/TypesGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/generator/TypesGenerator.java?view=diff&rev=514585&r1=514584&r2=514585
==============================================================================
--- incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/generator/TypesGenerator.java (original)
+++ incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/generator/TypesGenerator.java Sun Mar 4 23:26:43 2007
@@ -115,7 +115,9 @@
definition.addNamespace(WSDLConstants.TNS_PREFIX, wmodel.getTargetNameSpace());
int i = 0;
for (String s : wmodel.getJaxbContext().getKnownNamespaceURIs()) {
- definition.addNamespace("ns" + (++i), s);
+ if (!"".equals(s)) {
+ definition.addNamespace("ns" + (++i), s);
+ }
}
}
Modified: incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ClassProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ClassProcessor.java?view=diff&rev=514585&r1=514584&r2=514585
==============================================================================
--- incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ClassProcessor.java (original)
+++ incubator/cxf/trunk/tools/java2wsdl/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ClassProcessor.java Sun Mar 4 23:26:43 2007
@@ -252,10 +252,7 @@
}
model.setServiceName(serviceName);
- /*String packageName = "";
- if (clazz.getPackage() != null) {
- packageName = clazz.getPackage().getName();
- }*/
+
String packageName = PackageUtils.getPackageName(clazz);
model.setPackageName(packageName);