cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1230219 - in /cxf/trunk: common/common/src/main/java/org/apache/cxf/common/classloader/ rt/core/src/main/java/org/apache/cxf/interceptor/ rt/core/src/main/java/org/apache/cxf/service/factory/ rt/databinding/aegis/src/main/java/org/apache/c...
Date Wed, 11 Jan 2012 20:07:57 GMT
Author: dkulp
Date: Wed Jan 11 20:07:56 2012
New Revision: 1230219

URL: http://svn.apache.org/viewvc?rev=1230219&view=rev
Log:
Move service/factory stuff all to rt/core to avoid another split
package.

Added:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
  (contents, props changed)
      - copied, changed from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
  (contents, props changed)
      - copied, changed from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/FaultInfoException.java
      - copied, changed from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
  (contents, props changed)
      - copied, changed from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
  (contents, props changed)
      - copied, changed from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
  (contents, props changed)
      - copied, changed from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java
  (contents, props changed)
      - copied, changed from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java
Removed:
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java
Modified:
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java?rev=1230219&r1=1230218&r2=1230219&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
(original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
Wed Jan 11 20:07:56 2012
@@ -244,7 +244,19 @@ public final class ClassLoaderUtils {
         }
         return loadClass2(className, callingClass);
     }
+    public static <T> Class<? extends T> loadClass(String className, Class<?>
callingClass, Class<T> type)
+        throws ClassNotFoundException {
+        try {
+            ClassLoader cl = Thread.currentThread().getContextClassLoader();
 
+            if (cl != null) {
+                return cl.loadClass(className).asSubclass(type);
+            }            
+        } catch (ClassNotFoundException e) {
+            //ignore
+        }
+        return loadClass2(className, callingClass).asSubclass(type);
+    }
     private static Class<?> loadClass2(String className, Class<?> callingClass)
         throws ClassNotFoundException {
         try {

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java?rev=1230219&r1=1230218&r2=1230219&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java Wed
Jan 11 20:07:56 2012
@@ -35,6 +35,7 @@ import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.service.Service;
+import org.apache.cxf.service.factory.FaultInfoException;
 import org.apache.cxf.service.model.BindingFaultInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.FaultInfo;
@@ -131,17 +132,8 @@ public class FaultOutInterceptor extends
         return supportsDOM;
     }
 
-    private boolean hasFaultInfo(Class<?> c) {
-        if ("org.apache.cxf.frontend.FaultInfoException".equals(c.getName())) {
-            return true;
-        } 
-        if (c == Throwable.class) {
-            return false;
-        }
-        return hasFaultInfo(c.getSuperclass());
-    }
     protected Object getFaultBean(Throwable cause, FaultInfo faultPart, Message message)
{
-        if (hasFaultInfo(cause.getClass())) {
+        if (cause instanceof FaultInfoException) {
             try {
                 Method method = cause.getClass().getMethod("getFaultInfo", new Class[0]);
                 return method.invoke(cause, new Object[0]);

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
(from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java&p1=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java&r1=1230218&r2=1230219&rev=1230219&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
(from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java&p1=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java&r1=1230218&r2=1230219&rev=1230219&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/FaultInfoException.java
(from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/FaultInfoException.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/FaultInfoException.java&p1=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java&r1=1230218&r2=1230219&rev=1230219&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/FaultInfoException.java
Wed Jan 11 20:07:56 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.frontend;
+package org.apache.cxf.service.factory;
 
 public class FaultInfoException extends Exception {
 

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties?rev=1230219&r1=1230218&r2=1230219&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties Wed
Jan 11 20:07:56 2012
@@ -20,4 +20,20 @@
 #
 NO_METHOD_FOR_OP=No method was found for the WSDL operation {0}.
 INVALID_SCHEMA_URL=Could not load schema {0}
-ERROR_READING_SCHEMA=There was an error reading the schema {0}.
\ No newline at end of file
+ERROR_READING_SCHEMA=There was an error reading the schema {0}.
+COULD_NOT_FIND_PORTTYPE = Could not find portType named {0}
+NO_METHOD_FOR_OP = Could not find a matching method for operation {0}. Operation will be
unavailable.
+COULD_NOT_SET_WRAPPER_STYLE = Service class: {0} contains overloaded operation can not use
wrapper style
+USING_PROXY_FOR_SERVICE = Service class: {0} is a java.lang.reflect.Proxy instance.  This
is known not to work well as \
+  annotations on the real instance are not available.  We suggest overriding the ServiceClass
via spring config or \
+  other configuration. (serviceClass/implementorClass attributes on the endpoint/server spring
config entry)
+REFERENCE_TO_UNDEFINED_TYPE = Schema element {0} references undefined type {1} for service
{2}.
+COULD_NOT_FIND_PART = Could not find a message part matching name {0}.  Possible values are
{1}.
+UNMAPPABLE_PORT_TYPE= Service class {0} method {1} part {2} cannot be mapped to schema. Check
for use of a JAX-WS-specific type \
+  without the JAX-WS service factory bean.
+INTRACTABLE_PART= Message part {0} of Message {1} cannot be processed. This can be caused
by the use of JAX-WS-specific types \
+ without the JAX-WS service factory bean.
+JAXWS_ANNOTATION_FOUND=A JAX-WS Annotation was found on {0} while using the Simple frontend.
 For better results, use the JAX-WS frontend.
+XSD_VALIDATION_ERROR= Error in W3C XML Schema associated with service: {0}
+COULD_NOT_UNWRAP=Could not unwrap Operation {0} to match method "{1}"
+NO_WSDL_PROVIDED=WSDL is required for services created from class {0}, but no WSDL location
specified. 

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
(from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java&p1=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java&r1=1230218&r2=1230219&rev=1230219&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java&p1=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java&r1=1230218&r2=1230219&rev=1230219&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Wed Jan 11 20:07:56 2012
@@ -61,8 +61,10 @@ import org.apache.cxf.binding.BindingFac
 import org.apache.cxf.catalog.CatalogXmlSchemaURIResolver;
 import org.apache.cxf.clustering.FailoverFeature;
 import org.apache.cxf.common.WSDLConstants;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.ReflectionInvokationHandler;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.SystemPropertyAction;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
@@ -76,13 +78,10 @@ import org.apache.cxf.endpoint.EndpointE
 import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.endpoint.ServiceContractResolverRegistry;
 import org.apache.cxf.feature.AbstractFeature;
-import org.apache.cxf.frontend.FaultInfoException;
-import org.apache.cxf.frontend.SimpleMethodDispatcher;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.MethodComparator;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.FaultOutInterceptor;
-import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.resource.ResourceManager;
 import org.apache.cxf.service.Service;
@@ -143,8 +142,7 @@ public class ReflectionServiceFactoryBea
     public static final String METHOD_PARAM_ANNOTATIONS = "method.parameters.annotations";
     public static final String METHOD_ANNOTATIONS = "method.return.annotations";
     public static final String PARAM_ANNOTATION = "parameter.annotations";
-    private static final Logger LOG = LogUtils.getL7dLogger(ReflectionServiceFactoryBean.class,
-                                                            "SimpleMessages");
+    private static final Logger LOG = LogUtils.getL7dLogger(ReflectionServiceFactoryBean.class);
 
     protected String wsdlURL;
 
@@ -192,7 +190,8 @@ public class ReflectionServiceFactoryBea
 
     protected DataBinding createDefaultDataBinding() {
 
-        DataBinding retVal = null;
+        Object obj = null;
+        Class<? extends DataBinding> cls = null;
 
         if (getServiceClass() != null) {
             org.apache.cxf.annotations.DataBinding db
@@ -203,27 +202,35 @@ public class ReflectionServiceFactoryBea
                         return getBus().getExtension(ResourceManager.class).resolveResource(db.ref(),
                                                                                         
   db.value());
                     }
-                    retVal = db.value().newInstance();
+                    cls = db.value();
                 } catch (Exception e) {
                     LOG.log(Level.WARNING, "Could not create databinding "
                             + db.value().getName(), e);
                 }
             }
         }
-        if (retVal == null) {
-            JAXBDataBinding db = new JAXBDataBinding(getQualifyWrapperSchema());
-            Map<String, Object> props = this.getProperties();
-            if (props != null && props.get("jaxb.additionalContextClasses") != null)
{
-                Object o = this.getProperties().get("jaxb.additionalContextClasses");
-                if (o instanceof Class) {
-                    o = new Class[] {(Class<?>)o};
-                }
-                Class<?>[] extraClass = (Class[])o;
-                db.setExtraClass(extraClass);
+        if (cls == null && getBus() != null) {
+            obj = getBus().getProperty(DataBinding.class.getName());
+        }
+        if (obj == null) {
+            obj = "org.apache.cxf.jaxb.JAXBDataBinding";
+        }
+        try {
+            if (obj instanceof String) {
+                cls = ClassLoaderUtils.loadClass(obj.toString(), getClass(), DataBinding.class);
+            } else if (obj instanceof Class) {
+                cls = ((Class<?>)obj).asSubclass(DataBinding.class);
             }
-            retVal = db;
+            try {
+                return cls.getConstructor(ReflectionServiceFactoryBean.class)
+                    .newInstance(this);
+            } catch (NoSuchMethodException nsme) {
+                //ignore, use the no-arg constructor
+            }
+            return cls.newInstance();
+        } catch (Exception e) {
+            throw new ServiceConstructionException(e);
         }
-        return retVal;
     }
     public void reset() {
         if (!dataBindingSet) {
@@ -232,7 +239,6 @@ public class ReflectionServiceFactoryBea
         setService(null);
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public synchronized Service create() {
         reset();
@@ -258,10 +264,6 @@ public class ReflectionServiceFactoryBea
 
         MethodDispatcher m = getMethodDispatcher();
         getService().put(MethodDispatcher.class.getName(), m);
-        if (m instanceof org.apache.cxf.frontend.MethodDispatcher) {
-            getService().put(org.apache.cxf.frontend.MethodDispatcher.class.getName(), m);
-        }
-
         createEndpoints();
 
         fillInSchemaCrossreferences();
@@ -357,11 +359,33 @@ public class ReflectionServiceFactoryBea
     }
 
     protected void setServiceProperties() {
-        getService().put(MethodDispatcher.class.getName(), getMethodDispatcher());
+        MethodDispatcher md = getMethodDispatcher();
+        getService().put(MethodDispatcher.class.getName(), md);
+        for (Class<?> c : md.getClass().getInterfaces()) {
+            getService().put(c.getName(), md);
+        }
         if (properties != null) {
             getService().putAll(properties);
         }
-
+        setOldMethodDispatcherProperty();
+    }
+    
+    @Deprecated
+    protected void setOldMethodDispatcherProperty() {
+        //Try adding the MethodDispatcher using the old interface
+        MethodDispatcher md = getMethodDispatcher();
+        if (getService().get("org.apache.cxf.frontend.MethodDispatcher") == null) {
+            try {
+                Class<?> cls = ClassLoaderUtils.loadClass("org.apache.cxf.frontend.MethodDispatcher",
+                                                          getClass());
+                Object o = Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
+                                                  new Class[] {cls},
+                                                  new ReflectionInvokationHandler(md));
+                getService().put("org.apache.cxf.frontend.MethodDispatcher", o);
+            } catch (Exception ex) {
+                //ignore
+            }
+        }
     }
 
     protected void buildServiceFromWSDL(String url) {

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
(from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java&p1=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java&r1=1230218&r2=1230219&rev=1230219&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
Wed Jan 11 20:07:56 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.frontend;
+package org.apache.cxf.service.factory;
 
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -27,9 +27,8 @@ import org.apache.cxf.service.model.Bind
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.OperationInfo;
 
-@SuppressWarnings("deprecation")
 public class SimpleMethodDispatcher 
-    implements  org.apache.cxf.service.invoker.MethodDispatcher, MethodDispatcher  {
+    implements  org.apache.cxf.service.invoker.MethodDispatcher  {
 
     private Map<Method, Map<BindingInfo, BindingOperationInfo>> infoMap = 
         new ConcurrentHashMap<Method, Map<BindingInfo, BindingOperationInfo>>();

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java
(from r1230218, cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java&p1=cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java&r1=1230218&r2=1230219&rev=1230219&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=1230219&r1=1230218&r2=1230219&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
Wed Jan 11 20:07:56 2012
@@ -53,8 +53,8 @@ import org.apache.cxf.common.xmlschema.X
 import org.apache.cxf.databinding.AbstractDataBinding;
 import org.apache.cxf.databinding.DataReader;
 import org.apache.cxf.databinding.DataWriter;
-import org.apache.cxf.frontend.SimpleMethodDispatcher;
 import org.apache.cxf.service.Service;
+import org.apache.cxf.service.factory.SimpleMethodDispatcher;
 import org.apache.cxf.service.invoker.MethodDispatcher;
 import org.apache.cxf.service.model.AbstractMessageContainer;
 import org.apache.cxf.service.model.FaultInfo;

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1230219&r1=1230218&r2=1230219&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Wed
Jan 11 20:07:56 2012
@@ -78,9 +78,11 @@ import org.apache.cxf.jaxb.io.DataWriter
 import org.apache.cxf.message.Message;
 import org.apache.cxf.resource.URIResolver;
 import org.apache.cxf.service.Service;
+import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.factory.ServiceConstructionException;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.ws.addressing.ObjectFactory;
+
 @NoJSR250Annotations
 public class JAXBDataBinding extends AbstractDataBinding
     implements WrapperCapableDatabinding, InterceptorProvider {
@@ -199,6 +201,18 @@ public class JAXBDataBinding extends Abs
         contextClasses.addAll(Arrays.asList(classes));
         setContext(createJAXBContext(contextClasses)); //NOPMD - specifically allow this
     }
+    public JAXBDataBinding(ReflectionServiceFactoryBean b) throws JAXBException {
+        this(b.isQualifyWrapperSchema());
+        Map<String, Object> props = b.getProperties();
+        if (props != null && props.get("jaxb.additionalContextClasses") != null)
{
+            Object o = b.getProperties().get("jaxb.additionalContextClasses");
+            if (o instanceof Class) {
+                o = new Class[] {(Class<?>)o};
+            }
+            extraClass = (Class[])o;
+        }
+
+    }
 
     public JAXBDataBinding(JAXBContext context) {
         this();

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java?rev=1230219&r1=1230218&r2=1230219&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodDispatcher.java
Wed Jan 11 20:07:56 2012
@@ -31,13 +31,15 @@ import javax.xml.ws.Response;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.frontend.SimpleMethodDispatcher;
 import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
 import org.apache.cxf.service.factory.ServiceConstructionException;
+import org.apache.cxf.service.factory.SimpleMethodDispatcher;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.OperationInfo;
 
-public class JAXWSMethodDispatcher extends SimpleMethodDispatcher {
+@SuppressWarnings("deprecation")
+public class JAXWSMethodDispatcher extends SimpleMethodDispatcher
+    implements org.apache.cxf.frontend.MethodDispatcher {
 
     private static final Logger LOG = LogUtils.getL7dLogger(JAXWSMethodDispatcher.class);
 

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java?rev=1230219&r1=1230218&r2=1230219&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/FaultInfoException.java
Wed Jan 11 20:07:56 2012
@@ -19,7 +19,7 @@
 
 package org.apache.cxf.frontend;
 
-public class FaultInfoException extends Exception {
+public class FaultInfoException extends org.apache.cxf.service.factory.FaultInfoException
{
 
     private static final long serialVersionUID = 1392427062502667841L;
 



Mime
View raw message