cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1309747 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
Date Thu, 05 Apr 2012 10:57:32 GMT
Author: sergeyb
Date: Thu Apr  5 10:57:31 2012
New Revision: 1309747

URL: http://svn.apache.org/viewvc?rev=1309747&view=rev
Log:
Merged revisions 1309732,1309743 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

................
  r1309732 | sergeyb | 2012-04-05 12:59:04 +0300 (Thu, 05 Apr 2012) | 9 lines
  
  Merged revisions 1309357 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1309357 | sergeyb | 2012-04-04 15:23:00 +0300 (Wed, 04 Apr 2012) | 1 line
    
    [CXF-4225] Updating JAXBElementProvider to support Listener properties
  ........
................
  r1309743 | sergeyb | 2012-04-05 13:48:20 +0300 (Thu, 05 Apr 2012) | 1 line
  
  Adding SearchContext to the list of well-known contexts
................

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr  5 10:57:31 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.5.x-fixes:1309732,1309743
+/cxf/trunk:1309357

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

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=1309747&r1=1309746&r2=1309747&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
Thu Apr  5 10:57:31 2012
@@ -117,6 +117,8 @@ public abstract class AbstractJAXBProvid
     private boolean validateOutput;
     private boolean validateBeforeWrite;
     private ValidationEventHandler eventHandler;
+    private Unmarshaller.Listener unmarshallerListener;
+    private Marshaller.Listener marshallerListener;
     private DocumentDepthProperties depthProperties;
     
     public void setValidationHandler(ValidationEventHandler handler) {
@@ -457,6 +459,9 @@ public abstract class AbstractJAXBProvid
         if (eventHandler != null) {
             unmarshaller.setEventHandler(eventHandler);
         }
+        if (unmarshallerListener != null) {
+            unmarshaller.setListener(unmarshallerListener);
+        }
         if (uProperties != null) {
             for (Map.Entry<String, Object> entry : uProperties.entrySet()) {
                 unmarshaller.setProperty(entry.getKey(), entry.getValue());
@@ -476,6 +481,9 @@ public abstract class AbstractJAXBProvid
         if (enc != null) {
             marshaller.setProperty(Marshaller.JAXB_ENCODING, enc);
         }
+        if (marshallerListener != null) {
+            marshaller.setListener(marshallerListener);
+        }
         validateObjectIfNeeded(marshaller, obj);
         return marshaller;
     }
@@ -651,6 +659,14 @@ public abstract class AbstractJAXBProvid
         this.depthProperties = depthProperties;
     }
 
+    public void setUnmarshallerListener(Unmarshaller.Listener unmarshallerListener) {
+        this.unmarshallerListener = unmarshallerListener;
+    }
+
+    public void setMarshallerListener(Marshaller.Listener marshallerListener) {
+        this.marshallerListener = marshallerListener;
+    }
+
     @XmlRootElement
     protected static class CollectionWrapper {
         

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java?rev=1309747&r1=1309746&r2=1309747&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
Thu Apr  5 10:57:31 2012
@@ -53,6 +53,7 @@ import javax.ws.rs.ext.Providers;
 import org.apache.cxf.common.i18n.BundleUtils;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jaxrs.ext.MessageContext;
+import org.apache.cxf.jaxrs.ext.search.SearchContext;
 
 public final class AnnotationUtils {
     
@@ -82,6 +83,7 @@ public final class AnnotationUtils {
         classes.add(Providers.class);
         classes.add(Request.class);
         classes.add(Application.class);
+        classes.add(SearchContext.class);
         // Servlet API
         try {
             classes.add(HttpServletRequest.class);



Mime
View raw message