cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1149731 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
Date Fri, 22 Jul 2011 20:53:39 GMT
Author: sergeyb
Date: Fri Jul 22 20:53:38 2011
New Revision: 1149731

URL: http://svn.apache.org/viewvc?rev=1149731&view=rev
Log:
Merged revisions 1149657 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1149657 | sergeyb | 2011-07-22 18:15:33 +0100 (Fri, 22 Jul 2011) | 9 lines
  
  Merged revisions 1149655 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1149655 | sergeyb | 2011-07-22 18:12:28 +0100 (Fri, 22 Jul 2011) | 1 line
    
    [CXF-3679] Updating CXFNonSpringJaxrsServlet to be able to register custom interceptors
when Application is registered
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 22 20:53:38 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1144979,1147505,1148964,1149190,1149325
-/cxf/trunk:1144977,1147504,1148962,1149183
+/cxf/branches/2.4.x-fixes:1144979,1147505,1148964,1149190,1149325,1149657
+/cxf/trunk:1144977,1147504,1148962,1149183,1149655

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

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties?rev=1149731&r1=1149730&r2=1149731&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/Messages.properties
Fri Jul 22 20:53:38 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/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java?rev=1149731&r1=1149730&r2=1149731&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
Fri Jul 22 20:53:38 2011
@@ -85,8 +85,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 = 
@@ -102,6 +101,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) {
@@ -260,7 +264,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.create();
     }
     



Mime
View raw message