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-6671] Renaming the method accepting ApplicationInfo to prevent Spring from being confused
Date Thu, 12 Nov 2015 22:07:30 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 0548b05c6 -> 3f240045b


[CXF-6671] Renaming the method accepting ApplicationInfo to prevent Spring from being confused


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

Branch: refs/heads/3.0.x-fixes
Commit: 3f240045b1c158dcfdf2c85457e50d103e028445
Parents: 0548b05
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Nov 12 21:59:48 2015 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Nov 12 22:07:12 2015 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java   | 4 ++--
 .../org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/3f240045/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
index 1c35647..d4e53ac 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
@@ -97,10 +97,10 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
      * @param app
      */
     public void setApplication(Application app) {
-        setApplication(new ApplicationInfo(app, getBus()));
+        setApplicationInfo(new ApplicationInfo(app, getBus()));
     }
     
-    public void setApplication(ApplicationInfo provider) {
+    public void setApplicationInfo(ApplicationInfo provider) {
         appProvider = provider;
         Set<String> appNameBindings = AnnotationUtils.getNameBindings(provider.getProvider()
                                                                       .getClass().getAnnotations());

http://git-wip-us.apache.org/repos/asf/cxf/blob/3f240045/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index a7edf93..cecc493 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -507,7 +507,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
             setDocLocation(bean, servletConfig);
             setSchemasLocations(bean, servletConfig);
             bean.setBus(getBus());
-            bean.setApplication(providerApp);
+            bean.setApplicationInfo(providerApp);
             bean.create();
         }
     }


Mime
View raw message