You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/06/19 14:57:52 UTC
svn commit: r1494599 - in /cxf/branches/2.7.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
Author: sergeyb
Date: Wed Jun 19 12:57:52 2013
New Revision: 1494599
URL: http://svn.apache.org/r1494599
Log:
Merged revisions 1479634 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1479634 | sergeyb | 2013-05-06 17:39:21 +0100 (Mon, 06 May 2013) | 1 line
[CXF-5000] Root-level NameBindings are missed if they are created from Application
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1479634
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?rev=1494599&r1=1494598&r2=1494599&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java Wed Jun 19 12:57:52 2013
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -95,8 +96,11 @@ public class JAXRSServerFactoryBean exte
*/
public void setApplication(Application app) {
appProvider = new ProviderInfo<Application>(app, getBus());
+ List<String> appNameBindings = AnnotationUtils.getNameBindings(app.getClass().getAnnotations());
for (ClassResourceInfo cri : getServiceFactory().getClassResourceInfo()) {
- cri.setNameBindings(AnnotationUtils.getNameBindings(app.getClass().getAnnotations()));
+ List<String> clsNameBindings = new LinkedList<String>(appNameBindings);
+ clsNameBindings.addAll(AnnotationUtils.getNameBindings(cri.getServiceClass().getAnnotations()));
+ cri.setNameBindings(clsNameBindings);
}
}