[jbossws-commits] JBossWS SVN: r15479 - in stack/cxf/trunk: modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/parser and 1 other directory.
Author: ropalka
Date: 2012-01-04 10:24:33 -0500 (Wed, 04 Jan 2012)
New Revision: 15479
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/parser/JaxwsEndpointDefinitionParser.java
stack/cxf/trunk/pom.xml
Log:
[JBWS-3410] upgrade to Apache CXF 2.4.5
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/parser/JaxwsEndpointDefinitionParser.java
===================================================================
---
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/parser/JaxwsEndpointDefinitionParser.java 2012-01-04
13:35:31 UTC (rev 15478)
+++
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/spring/parser/JaxwsEndpointDefinitionParser.java 2012-01-04
15:24:33 UTC (rev 15479)
@@ -50,6 +50,8 @@
public static class JBossWSSpringEndpointImpl extends EndpointImpl implements
ApplicationContextAware
{
+ boolean checkBlockConstruct;
+
public JBossWSSpringEndpointImpl(Object implementor)
{
super((Bus)null, implementor);
@@ -60,8 +62,15 @@
super(bus, implementor);
}
+ public void setCheckBlockConstruct(Boolean b) {
+ checkBlockConstruct = b;
+ }
+
public void setApplicationContext(ApplicationContext ctx) throws BeansException
{
+ if (checkBlockConstruct) {
+ setBlocking(ctx, this);
+ }
if (getBus() == null)
{
Bus bus = BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx);
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-01-04 13:35:31 UTC (rev 15478)
+++ stack/cxf/trunk/pom.xml 2012-01-04 15:24:33 UTC (rev 15479)
@@ -72,7 +72,7 @@
<jboss702.version>7.0.2.Final</jboss702.version>
<jboss710.version>7.1.0.Final-SNAPSHOT</jboss710.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.4.4</cxf.version>
+ <cxf.version>2.4.5</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>