cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
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 GMT
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 @@
         <profile>
             <id>spring2.5</id>
             <properties>
-               <spring.version>2.5</spring.version>
-               <spring.mock>spring-test</spring.mock> 
+                <spring.version>2.5.3</spring.version>
+                <spring.mock>spring-test</spring.mock>
             </properties>
         </profile>
     </profiles>

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<JPackage> 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);
         



Mime
View raw message