Author: dkulp Date: Sat Oct 3 02:03:12 2009 New Revision: 821219 URL: http://svn.apache.org/viewvc?rev=821219&view=rev Log: Merged revisions 821217 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r821217 | dkulp | 2009-10-02 21:56:32 -0400 (Fri, 02 Oct 2009) | 10 lines Merged revisions 821216 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r821216 | dkulp | 2009-10-02 21:55:04 -0400 (Fri, 02 Oct 2009) | 2 lines [CXF-2431] If the wsdl doesn't have a targetnamespace defined, at least try to do something and not NPE ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapper.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java?rev=821219&r1=821218&r2=821219&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java (original) +++ cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java Sat Oct 3 02:03:12 2009 @@ -198,6 +198,9 @@ } public String mapPackageName(String ns) { + if (ns == null) { + ns = ""; + } if (hasNamespace(ns)) { return mapNamespaceToPackageName(ns); } else { Modified: cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java?rev=821219&r1=821218&r2=821219&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java (original) +++ cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/URIParserUtil.java Sat Oct 3 02:03:12 2009 @@ -90,7 +90,7 @@ List<String> tokens = tokenize(nameSpaceURI, "/: "); if (tokens.size() == 0) { - return null; + return "cxf"; } if (tokens.size() > 1) { Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=821219&r1=821218&r2=821219&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original) +++ cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Sat Oct 3 02:03:12 2009 @@ -291,7 +291,7 @@ Collection<String> files = classCollector.getGeneratedFileInfo(); for (String file : files) { int dotIndex = file.lastIndexOf("."); - String sub = dotIndex == -1 ? "" : file.substring(0, dotIndex - 1); + String sub = dotIndex <= 0 ? "" : file.substring(0, dotIndex - 1); if (sub.equals(packageName)) { return true; } Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapper.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapper.java?rev=821219&r1=821218&r2=821219&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapper.java (original) +++ cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapper.java Sat Oct 3 02:03:12 2009 @@ -36,6 +36,7 @@ public JavaInterface map(InterfaceInfo interfaceInfo) { JavaInterface intf = new JavaInterface(); String namespace = interfaceInfo.getName().getNamespaceURI(); + String packageName = ProcessorUtil.parsePackageName(namespace, context.mapPackageName(namespace)); String loc = (String)context.get(ToolConstants.CFG_WSDLLOCATION);
