You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2009/07/26 11:40:52 UTC
svn commit: r797886 - in /cxf/branches/2.2.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...
Author: ningjiang
Date: Sun Jul 26 09:40:51 2009
New Revision: 797886
URL: http://svn.apache.org/viewvc?rev=797886&view=rev
Log:
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.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingConfiguration.java
- copied unchanged from r797883, cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingConfiguration.java
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/
- copied from r797883, cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/JBIBindingInfoConfigBeanDefinitionParser.java
- copied unchanged from r797883, cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/JBIBindingInfoConfigBeanDefinitionParser.java
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/NamespaceHandler.java
- copied unchanged from r797883, cxf/trunk/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/spring/NamespaceHandler.java
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/spring.handlers
- copied unchanged from r797883, cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/spring.handlers
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/spring.schemas
- copied unchanged from r797883, cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/spring.schemas
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/resources/schemas/configuration/
- copied from r797883, cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/configuration/
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/resources/schemas/configuration/jbi.xsd
- copied unchanged from r797883, cxf/trunk/rt/bindings/jbi/src/main/resources/schemas/configuration/jbi.xsd
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/
- copied from r797883, cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/JBIBindingConfigurationInfoTest.java
- copied unchanged from r797883, cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/JBIBindingConfigurationInfoTest.java
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/binding.xml
- copied unchanged from r797883, cxf/trunk/rt/bindings/jbi/src/test/java/org/apache/cxf/binding/jbi/spring/binding.xml
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 26 09:40:51 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java?rev=797886&r1=797885&r2=797886&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java (original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingFactory.java Sun Jul 26 09:40:51 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.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java?rev=797886&r1=797885&r2=797886&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java (original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/jbi/src/main/java/org/apache/cxf/binding/jbi/JBIBindingInfo.java Sun Jul 26 09:40:51 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;
+ }
}