You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2007/10/04 15:00:25 UTC
svn commit: r581884 - in /incubator/cxf/trunk/rt/frontend/jaxws: pom.xml
src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
Author: ningjiang
Date: Thu Oct 4 06:00:23 2007
New Revision: 581884
URL: http://svn.apache.org/viewvc?rev=581884&view=rev
Log:
CXF-1074 remove the dependency of spring AOP jar from the JaxWsServerFactoryBean
Modified:
incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
Modified: incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=581884&r1=581883&r2=581884&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Thu Oct 4 06:00:23 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/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java?rev=581884&r1=581883&r2=581884&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java Thu Oct 4 06:00:23 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);
+ }
}
}
}