svn commit: r1149655 - in /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs: client/Messages.properties servlet/CXFNonSpringJaxrsServlet.java

[sergeyb]

Author: sergeyb
Date: Fri Jul 22 17:12:28 2011
New Revision: 1149655

URL: http://svn.apache.org/viewvc?rev=1149655&view=rev
Log:
[CXF-3679] Updating CXFNonSpringJaxrsServlet to be able to register custom 
interceptors when Application is registered

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties?rev=1149655&r1=1149654&r2=1149655&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties
 Fri Jul 22 17:12:28 2011
@@ -24,8 +24,8 @@ SINGLE_BODY_ONLY=Resource method {0}.{1}
 ONLY_FORM_ALLOWED=Resource method {0}.{1} mixes JAXRS FormParam parameters 
with other types of parameters
 NO_BODY_IN_SUBRESOURCE=SubResource method {0}.{1} expects request body, only 
URI-bound parameters are supported
 NO_CONTEXT_PARAMETERS=Resource method {0}.{1} expects JAXRS Context parameter 
which is not supported on the client side
-NO_MSG_READER =.No message body reader found for class : {0}, ContentType : 
{1}.
+NO_MSG_READER =.No message body reader has been found for class : {0}, 
ContentType : {1}.
 MSG_READER_PROBLEM =.Problem with reading the response message, class : {0}, 
ContentType : {1}.
-NO_MSG_WRITER =.No message body writer found for class : {0}.
-MSG_WRITER_PROBLEM =.Problem with writing the request message, class : {0}.
+NO_MSG_WRITER =.No message body writer has been found for class : {0}, 
ContentType : {1}.
+MSG_WRITER_PROBLEM =.Problem with writing the request message, class : {0}, 
ContentType : {1}.
 REMOTE_CONNECTION_PROBLEM=Problem with creating a remote connection
\ No newline at end of file

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java?rev=1149655&r1=1149654&r2=1149655&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
 Fri Jul 22 17:12:28 2011
@@ -86,8 +86,7 @@ public class CXFNonSpringJaxrsServlet ex
         }
         
         setSchemasLocations(bean, servletConfig);
-        setInterceptors(bean, servletConfig, OUT_INTERCEPTORS_PARAM);
-        setInterceptors(bean, servletConfig, IN_INTERCEPTORS_PARAM);
+        setAllInterceptors(bean, servletConfig);
         
         List<Class> resourceClasses = getServiceClasses(servletConfig, 
modelRef != null);
         Map<Class, ResourceProvider> resourceProviders = 
@@ -103,6 +102,11 @@ public class CXFNonSpringJaxrsServlet ex
         bean.create();
     }
 
+    protected void setAllInterceptors(JAXRSServerFactoryBean bean, 
ServletConfig servletConfig) {
+        setInterceptors(bean, servletConfig, OUT_INTERCEPTORS_PARAM);
+        setInterceptors(bean, servletConfig, IN_INTERCEPTORS_PARAM);
+    }
+    
     protected void setSchemasLocations(JAXRSServerFactoryBean bean, 
ServletConfig servletConfig) {
         String schemas = servletConfig.getInitParameter(SCHEMAS_PARAM);
         if (schemas == null) {
@@ -261,6 +265,7 @@ public class CXFNonSpringJaxrsServlet ex
         
         String ignoreParam = 
servletConfig.getInitParameter(IGNORE_APP_PATH_PARAM);
         JAXRSServerFactoryBean bean = ResourceUtils.createApplication(app, 
MessageUtils.isTrue(ignoreParam));
+        setAllInterceptors(bean, servletConfig);
         bean.setBus(getBus());
         bean.create();
     }