Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 19529 invoked from network); 15 Apr 2008 17:10:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Apr 2008 17:10:49 -0000 Received: (qmail 87359 invoked by uid 500); 15 Apr 2008 17:10:49 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 87308 invoked by uid 500); 15 Apr 2008 17:10:49 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 87298 invoked by uid 99); 15 Apr 2008 17:10:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Apr 2008 10:10:49 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Apr 2008 17:10:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 586981A9832; Tue, 15 Apr 2008 10:10:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r648336 - in /incubator/cxf/branches/2.0.x-fixes: ./ parent/pom.xml rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Date: Tue, 15 Apr 2008 17:10:19 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080415171025.586981A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Apr 15 10:10:08 2008 New Revision: 648336 URL: http://svn.apache.org/viewvc?rev=648336&view=rev Log: Merged revisions 648323 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r648323 | dkulp | 2008-04-15 12:43:35 -0400 (Tue, 15 Apr 2008) | 3 lines [CXF-1528] Fix problems if there is a schema element that has no types defined in it directly. It just imports and enother schema. JAXB creates a JPackage for it, but doesn't generate anything in it. Update the spring2.5 profile to 2.5.3 ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/parent/pom.xml incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=648336&r1=648335&r2=648336&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Tue Apr 15 10:10:08 2008 @@ -1010,8 +1010,8 @@ spring2.5 - 2.5 - spring-test + 2.5.3 + spring-test Modified: incubator/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/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=648336&r1=648335&r2=648336&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Tue Apr 15 10:10:08 2008 @@ -175,9 +175,10 @@ boolean firstnt = false; for (Iterator packages = codeModel.packages(); packages.hasNext();) { - JPackage packadge = packages.next(); - String name = packadge.name(); - if ("org.w3._2001.xmlschema".equals(name)) { + JPackage jpackage = packages.next(); + String name = jpackage.name(); + if ("org.w3._2001.xmlschema".equals(name) + || !jpackage.classes().hasNext()) { continue; } if (firstnt) { @@ -185,7 +186,7 @@ } else { firstnt = true; } - sb.append(packadge.name()); + sb.append(jpackage.name()); } outputDebug(codeModel);