cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r645491 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/ common/common/src/main/java/org/apache/cxf/common/util/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/
Date Mon, 07 Apr 2008 13:11:29 GMT
Author: dkulp
Date: Mon Apr  7 06:11:19 2008
New Revision: 645491

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

........
  r644856 | dkulp | 2008-04-04 15:47:31 -0400 (Fri, 04 Apr 2008) | 4 lines
  
  [CXF-1494] Add a utility method for getting Class objects from impls that will auto-detect
use of spring aop proxies.
  Flip jaxws/simple frontends to use is so "serviceClass" is no longer needed.
  Sergey is going ot look into using it for jaxrs
........

Added:
    incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java
      - copied, changed from r644856, incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java
    incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
      - copied unchanged from r644856, incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml?rev=645491&r1=645490&r2=645491&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/pom.xml Mon Apr  7 06:11:19 2008
@@ -118,6 +118,14 @@
             <version>1.2.14</version>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${spring.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>

Copied: incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java
(from r644856, incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java?p2=incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java&p1=incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java&r1=644856&r2=645491&rev=645491&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/ClassHelper.java
Mon Apr  7 06:11:19 2008
@@ -25,7 +25,13 @@
 public class ClassHelper {
     static final ClassHelper HELPER;
     static {
-        HELPER = new ClassHelper();
+        ClassHelper theHelper = null;
+        try {
+            theHelper = new SpringAopClassHelper();
+        } catch (Exception ex) {
+            theHelper = new ClassHelper();
+        }
+        HELPER = theHelper;
     }
     
     

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=645491&r1=645490&r2=645491&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Mon Apr  7 06:11:19 2008
@@ -34,6 +34,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingConfiguration;
+import org.apache.cxf.common.util.ClassHelper;
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
 import org.apache.cxf.configuration.Configurable;
 import org.apache.cxf.configuration.Configurer;
@@ -155,7 +156,7 @@
      * @return the class of the implementor object
      */
     public Class getImplementorClass() {
-        return implementorClass != null ? implementorClass : implementor.getClass();
+        return implementorClass != null ? implementorClass : ClassHelper.getRealClass(implementor);
     }
 
     public List<Source> getMetadata() {

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=645491&r1=645490&r2=645491&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
Mon Apr  7 06:11:19 2008
@@ -31,6 +31,7 @@
 import org.apache.cxf.BusException;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.ClassHelper;
 import org.apache.cxf.databinding.DataBinding;
 import org.apache.cxf.databinding.source.AbstractDataBinding;
 import org.apache.cxf.endpoint.Endpoint;
@@ -102,7 +103,7 @@
         try {
             applyExtraClass();
             if (serviceBean != null && getServiceClass() == null) {
-                setServiceClass(serviceBean.getClass());
+                setServiceClass(ClassHelper.getRealClass(serviceBean));
             }
             if (invoker != null) {
                 getServiceFactory().setInvoker(invoker);
@@ -136,7 +137,8 @@
         }
         
         if (serviceBean != null) {
-            initializeAnnotationInterceptors(server.getEndpoint(), this.getServiceBean().getClass());
+            initializeAnnotationInterceptors(server.getEndpoint(),
+                                             ClassHelper.getRealClass(getServiceBean()));
         }
         
         applyFeatures();
@@ -234,7 +236,7 @@
     
     public Class<?> getServiceBeanClass() {
         if (serviceBean != null) {
-            return serviceBean.getClass();
+            return ClassHelper.getRealClass(serviceBean);
         } else {
             return getServiceFactory().getServiceClass();
         }



Mime
View raw message