cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r797893 - in /cxf/branches/2.1.x-fixes: ./ rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/ rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/ rt/bindings/jbi/src/main/resources/META-INF/ rt/bindings/jbi/src/main/reso...
Date Sun, 26 Jul 2009 10:01:30 GMT
Author: ningjiang
Date: Sun Jul 26 10:01:30 2009
New Revision: 797893

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

................
  r797886 | ningjiang | 2009-07-26 17:40:51 +0800 (Sun, 26 Jul 2009) | 9 lines
  
  Merged revisions 797883 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r797883 | ningjiang | 2009-07-26 17:30:41 +0800 (Sun, 26 Jul 2009) | 1 line
    
    CXF-2361 Adding JBIBindingConfiguration
  ........
................

Added:
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingConfiguration.java
      - copied unchanged from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingConfiguration.java
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/
      - copied from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/JBIBindingInfoConfigBeanDefinitionParser.java
      - copied unchanged from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/JBIBindingInfoConfigBeanDefinitionParser.java
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/NamespaceHandler.java
      - copied unchanged from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/NamespaceHandler.java
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/spring.handlers
      - copied unchanged from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/spring.handlers
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/spring.schemas
      - copied unchanged from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/spring.schemas
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/resources/schemas/configuration/
      - copied from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/resources/schemas/configuration/
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/resources/schemas/configuration/jbi.xsd
      - copied unchanged from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/resources/schemas/configuration/jbi.xsd
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/
      - copied from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/JBIBindingConfigurationInfoTest.java
      - copied unchanged from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/JBIBindingConfigurationInfoTest.java
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/binding.xml
      - copied unchanged from r797886, cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/binding.xml
Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
    cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 26 10:01:30 2009
@@ -1,2 +1,2 @@
-/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884
-/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882
+/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873
 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886
+/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883

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

Modified: cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java?rev=797893&r1=797892&r2=797893&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
Sun Jul 26 10:01:30 2009
@@ -27,6 +27,8 @@
 import org.apache.cxf.binding.jbi.interceptor.JBIOperationInInterceptor;
 import org.apache.cxf.binding.jbi.interceptor.JBIWrapperInInterceptor;
 import org.apache.cxf.binding.jbi.interceptor.JBIWrapperOutInterceptor;
+import org.apache.cxf.interceptor.AttachmentInInterceptor;
+import org.apache.cxf.interceptor.AttachmentOutInterceptor;
 import org.apache.cxf.interceptor.StaxInInterceptor;
 import org.apache.cxf.interceptor.StaxOutInterceptor;
 import org.apache.cxf.service.model.BindingInfo;
@@ -37,7 +39,9 @@
 public class JBIBindingFactory extends AbstractBindingFactory {
 
     public Binding createBinding(BindingInfo binding) {
-        JBIBinding jb = new JBIBinding((JBIBindingInfo) binding);
+        JBIBindingInfo bindingInfo = (JBIBindingInfo) binding;
+        JBIBinding jb = new JBIBinding(bindingInfo);
+        
         jb.getInInterceptors().add(new StaxInInterceptor());
         jb.getInInterceptors().add(new JBIOperationInInterceptor());
         jb.getInInterceptors().add(new JBIWrapperInInterceptor());
@@ -47,11 +51,23 @@
         jb.getOutFaultInterceptors().add(new JBIFaultOutInterceptor());
         
         jb.getInFaultInterceptors().add(new JBIFaultInInterceptor());
+        
+        if (bindingInfo.getJBIBindingConfiguration().isMtomEnabled()) {
+            jb.getInInterceptors().add(new AttachmentInInterceptor());
+            jb.getOutInterceptors().add(new AttachmentOutInterceptor());
+        }
         return jb;
     }
 
     public BindingInfo createBindingInfo(ServiceInfo service, String namespace, Object config)
{
-        JBIBindingInfo info = new JBIBindingInfo(service, JBIConstants.NS_JBI_BINDING); 
      
+        JBIBindingConfiguration configuration;
+        if (config instanceof JBIBindingConfiguration) {
+            configuration = (JBIBindingConfiguration) config;
+        } else {
+            configuration = new JBIBindingConfiguration();
+        }
+        JBIBindingInfo info = new JBIBindingInfo(service, JBIConstants.NS_JBI_BINDING);
+        info.setJBIBindingConfiguration(configuration);
         info.setName(new QName(service.getName().getNamespaceURI(), 
                                service.getName().getLocalPart() + "JBIBinding"));
 

Modified: cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java?rev=797893&r1=797892&r2=797893&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java
Sun Jul 26 10:01:30 2009
@@ -22,9 +22,21 @@
 import org.apache.cxf.service.model.ServiceInfo;
 
 public class JBIBindingInfo extends BindingInfo {
-
+    private JBIBindingConfiguration configuration;
+    
     public JBIBindingInfo(ServiceInfo service, String bindingId) {
         super(service, bindingId);
     }
+    
+    public void setJBIBindingConfiguration(JBIBindingConfiguration conf) {
+        configuration = conf;
+    }
+    
+    public JBIBindingConfiguration getJBIBindingConfiguration() {
+        if (configuration == null) {
+            configuration = new JBIBindingConfiguration();
+        }
+        return configuration;
+    }
 
 }



Mime
View raw message