You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/05/20 23:17:15 UTC
svn commit: r658440 - in /cxf/branches/2.0.x-fixes: ./
rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Author: dkulp
Date: Tue May 20 14:17:15 2008
New Revision: 658440
URL: http://svn.apache.org/viewvc?rev=658440&view=rev
Log:
Merged revisions 658397 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r658397 | dkulp | 2008-05-20 15:03:32 -0400 (Tue, 20 May 2008) | 3 lines
[CXF-1204] Patch from Benjamin Coiffe applied. Thanks!
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=658440&r1=658439&r2=658440&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Tue May 20 14:17:15 2008
@@ -176,9 +176,7 @@
for (Iterator<JPackage> packages = codeModel.packages(); packages.hasNext();) {
JPackage jpackage = packages.next();
- String name = jpackage.name();
- if ("org.w3._2001.xmlschema".equals(name)
- || !jpackage.classes().hasNext()) {
+ if (!isValidPackage(jpackage)) {
continue;
}
if (firstnt) {
@@ -264,6 +262,27 @@
return client;
}
+ private boolean isValidPackage(JPackage jpackage) {
+ if (jpackage == null) {
+ return false;
+ }
+ String name = jpackage.name();
+ if ("org.w3._2001.xmlschema".equals(name)
+ || "java.lang".equals(name)
+ || "java.io".equals(name)
+ || "generated".equals(name)) {
+ return false;
+ }
+ Iterator<JDefinedClass> i = jpackage.classes();
+ while (i.hasNext()) {
+ JDefinedClass current = i.next();
+ if ("ObjectFactory".equals(current.name())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private void outputDebug(JCodeModel codeModel) {
if (!LOG.isLoggable(Level.INFO)) {
return;