svn commit: r707143 - in /cxf/branches/2.0.x-fixes/rt: databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

[dkulp]

Author: dkulp
Date: Wed Oct 22 10:31:47 2008
New Revision: 707143

URL: http://svn.apache.org/viewvc?rev=707143&view=rev
Log:
Start fixing compile errors from the merges 

Modified:
    
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
    
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

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=707143&r1=707142&r2=707143&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
 Wed Oct 22 10:31:47 2008
@@ -20,6 +20,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
@@ -29,6 +30,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
@@ -298,7 +300,7 @@
                     InputSource is = new InputSource(ins);
                     is.setSystemId(url.toString());
                     is.setPublicId(url.toString());
-                    compiler.getOptions().addBindFile(is);
+                    compiler.parseSchema(is);
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }

Modified: 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=707143&r1=707142&r2=707143&view=diff
==============================================================================
--- 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 Wed Oct 22 10:31:47 2008
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.service.factory;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;