svn commit: r582940 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/frontend/jaxws/pom.xml rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java

[dkulp]

Author: dkulp
Date: Mon Oct  8 12:02:41 2007
New Revision: 582940

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

........
  r581884 | ningjiang | 2007-10-04 09:00:23 -0400 (Thu, 04 Oct 2007) | 1 line
  
  CXF-1074 remove the dependency of spring AOP jar from the 
JaxWsServerFactoryBean
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml
    
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml?rev=582940&r1=582939&r2=582940&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/pom.xml Mon Oct  8 
12:02:41 2007
@@ -104,12 +104,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
-        </dependency>    
+        </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java?rev=582940&r1=582939&r2=582940&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
 Mon Oct  8 12:02:41 2007
@@ -20,6 +20,7 @@
 
 
 
+import java.lang.reflect.Proxy;
 import java.util.List;
 
 import javax.xml.ws.WebServiceException;
@@ -45,8 +46,6 @@
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.service.model.BindingInfo;
 
-import org.springframework.aop.support.AopUtils;
-
 /**
  * Bean to help easily create Server endpoints for JAX-WS. Example:
  * <pre>
@@ -198,7 +197,11 @@
             resourceManager = new DefaultResourceManager(resolvers); 
             resourceManager.addResourceResolver(new 
WebServiceContextResourceResolver());
             ResourceInjector injector = new ResourceInjector(resourceManager);
-            injector.inject(instance, AopUtils.getTargetClass(instance));
+            if (Proxy.isProxyClass(instance.getClass()) && getServiceClass() 
!= null) {
+                injector.inject(instance, getServiceClass());
+            } else {
+                injector.inject(instance);
+            }
         }
     }  
 }