svn commit: r604017 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/helpers/ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/

[dk...@apache.org]

Author: dkulp
Date: Thu Dec 13 12:26:32 2007
New Revision: 604017

URL: http://svn.apache.org/viewvc?rev=604017&view=rev
Log:
Fix compile failures with mis-merged stuff

Removed:
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/
Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java?rev=604017&r1=604016&r2=604017&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java Thu Dec 13 12:26:32 2007
@@ -19,10 +19,14 @@
 
 package org.apache.cxf.helpers;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;

Modified: incubator/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/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=604017&r1=604016&r2=604017&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Thu Dec 13 12:26:32 2007
@@ -34,18 +34,12 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-<<<<<<< .working
-=======
 import javax.wsdl.Operation;
-import javax.xml.bind.annotation.XmlAttachmentRef;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
->>>>>>> .merge-right.r603807
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.BusException;
@@ -111,6 +105,7 @@
 
     public static final String ENDPOINT_CLASS = "endpoint.class";
     public static final String GENERIC_TYPE = "generic.type";
+    public static final String EXTRA_CLASS = "extra.class";
     public static final String MODE_OUT = "messagepart.mode.out";
     public static final String MODE_INOUT = "messagepart.mode.inout";
     public static final String HOLDER = "messagepart.isholder";
@@ -354,11 +349,14 @@
         }
     }
 
+    protected boolean isFromWsdl() {
+        return !populateFromClass && getWsdlURL() != null;
+    }
 
     protected void initializeServiceModel() {
         String wsdlurl = getWsdlURL();
 
-        if (!populateFromClass && wsdlurl != null) {
+        if (isFromWsdl()) {
             buildServiceFromWSDL(wsdlurl);
         } else {
             buildServiceFromClass();
@@ -670,7 +668,7 @@
         QName intfName = getInterfaceName();
         InterfaceInfo intf = new InterfaceInfo(serviceInfo, intfName);
 
-        Method[] methods = serviceClass.getMethods();
+        Method[] methods = getServiceClass().getMethods();
 
         // The BP profile states we can't have operations of the same name
         // so we have to append numbers to the name. Different JVMs sort methods
@@ -1257,7 +1255,6 @@
         }
         if (part.getElementQName() == null) {
             part.setElementQName(inMsg.getName());
-//Benson            checkForElement(op.getInterface().getService(), part);
         } else if (!part.getElementQName().equals(op.getInput().getName())) {
             op.getInput().setName(part.getElementQName());
         }
@@ -1845,6 +1842,10 @@
 
     public void setIgnoredClasses(List<String> ignoredClasses) {
         this.ignoredClasses = ignoredClasses;
+    }
+
+    protected Set<Class<?>> getExtraClass() {
+        return null;
     }
 
     public boolean isWrapped() {