svn commit: r967250 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

[dkulp]

Author: dkulp
Date: Fri Jul 23 20:37:56 2010
New Revision: 967250

URL: http://svn.apache.org/viewvc?rev=967250&view=rev
Log:
Merged revisions 967247 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r967247 | dkulp | 2010-07-23 16:33:37 -0400 (Fri, 23 Jul 2010) | 2 lines
  
  [CXF-2907] Remove check for JAXB < 2.1 as we just assume 2.1 or newer
  Patch from Gary Gregory applied with thanks!
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=967250&r1=967249&r2=967250&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Fri Jul 23 20:37:56 2010
@@ -34,7 +34,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
@@ -422,7 +421,7 @@ public class DynamicClientFactory {
             num++;
         }
         
-        if (simpleBindingEnabled && isJaxb21(compiler)) {
+        if (simpleBindingEnabled) {
             String id = "/org/apache/cxf/endpoint/dynamic/simple-binding.xjb";
             LOG.info("Loading the JAXB 2.1 simple binding for client.");
             InputSource source = new 
InputSource(getClass().getResourceAsStream(id));
@@ -431,32 +430,6 @@ public class DynamicClientFactory {
         }
     }
     
-    private boolean isJaxb21(SchemaCompiler sc) {
-        String id = sc.getOptions().getBuildID();
-        StringTokenizer st = new StringTokenizer(id, ".");
-        String minor = null;
-        
-        // major version
-        if (st.hasMoreTokens()) {
-            st.nextToken();
-        }
-        
-        if (st.hasMoreTokens()) {
-            minor = st.nextToken();
-        }
-        
-        try {
-            int i = Integer.valueOf(minor);
-            if (i >= 1) {
-                return true;
-            }
-        } catch (NumberFormatException e) {
-            // do nothing;
-        }
-        
-        return false;
-    }
-
     public boolean isSimpleBindingEnabled() {
         return simpleBindingEnabled;
     }