cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6292] restoring the default init-prefix value
Date Tue, 18 Aug 2015 14:33:05 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes b4fcc78f8 -> 5b1d786f9


[CXF-6292] restoring the default init-prefix value


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5b1d786f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5b1d786f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5b1d786f

Branch: refs/heads/2.7.x-fixes
Commit: 5b1d786f9a2fe11c9ce38bb7f3bd24a532ba2398
Parents: b4fcc78
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Tue Aug 18 15:32:44 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Tue Aug 18 15:32:44 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/common/util/SpringAopClassHelper.java     | 3 ++-
 .../http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5b1d786f/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java b/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
index 5998008..6024ca6 100644
--- a/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
+++ b/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
@@ -23,6 +23,7 @@ import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.util.ClassUtils;
 
 /**
  * 
@@ -82,7 +83,7 @@ class SpringAopClassHelper extends ClassHelper {
                 // ignore
             }
             
-        } else if (AopUtils.isCglibProxyClass(o.getClass())) {
+        } else if (ClassUtils.isCglibProxyClass(o.getClass())) {
             return getRealClassFromClassInternal(AopUtils.getTargetClass(o));
         }
         return o.getClass();

http://git-wip-us.apache.org/repos/asf/cxf/blob/5b1d786f/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml b/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml
index 99481fc..fb582d8 100644
--- a/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml
+++ b/rt/transports/http/src/main/resources/OSGI-INF/blueprint/osgiservlet.xml
@@ -23,7 +23,7 @@ under the License.
   <cm:property-placeholder persistent-id="org.apache.cxf.osgi" id="cxfOsgiProperties"
update-strategy="reload">
 
     <cm:default-properties>
-      <cm:property name="org.apache.cxf.servlet.init-prefix" value="org.apache.cxf.servlet."/>
+      <cm:property name="org.apache.cxf.servlet.init-prefix" value=""/>
       <cm:property name="org.apache.cxf.servlet.context" value="/cxf"/>
       <cm:property name="org.apache.cxf.servlet.name" value="cxf-osgi-transport-servlet"/>
       <cm:property name="org.apache.cxf.servlet.hide-service-list-page" value="false"/>


Mime
View raw message