svn commit: r834959 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java

[dkulp]

Author: dkulp
Date: Wed Nov 11 16:44:57 2009
New Revision: 834959

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

........
  r834762 | dkulp | 2009-11-10 23:34:21 -0500 (Tue, 10 Nov 2009) | 1 line
  
  Remove some dead code
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java

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

Modified: 
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=834959&r1=834958&r2=834959&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
 Wed Nov 11 16:44:57 2009
@@ -20,18 +20,15 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 
 import org.apache.cxf.BusException;
 import org.apache.cxf.common.util.ClassHelper;
-import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.endpoint.ServerImpl;
 import org.apache.cxf.feature.AbstractFeature;
-import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.factory.ServiceConstructionException;
 import org.apache.cxf.service.invoker.BeanInvoker;
@@ -157,18 +154,6 @@
         }
     }
 
-    protected void applyExtraClass() {
-        Map props = this.getProperties();
-        if (props != null && props.get("jaxb.additionalContextClasses") != 
null) {
-            Class[] extraClass = 
(Class[])this.getProperties().get("jaxb.additionalContextClasses");
-            DataBinding dataBinding = getServiceFactory().getDataBinding();
-            if (dataBinding instanceof JAXBDataBinding) {
-                ((JAXBDataBinding)dataBinding).setExtraClass(extraClass);
-            }
-        }
-    }
-
-
     protected Invoker createInvoker() {
         if (getServiceBean() == null) {
             return new FactoryInvoker(new SingletonFactory(getServiceClass()));