Author: alessio.soldano(a)jboss.com Date: 2012-03-14 09:53:43 -0400 (Wed, 14 Mar 2012) New Revision: 15938 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java Log: [JBPAPP-8346] CXF module does not find optional Spring dependencies Merged revisions 15889 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15889 | alessio.soldano(a)jboss.com | 2012-03-06 16:49:28 +0100 (Tue, 06 Mar 2012) | 2 lines [JBWS-3453] Extend Spring availability check to JBossWSBusFactory defining classloader ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15888,15896 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-03-14 13:49:28 UTC (rev 15937) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-03-14 13:53:43 UTC (rev 15938) @@ -49,7 +49,7 @@ @Override public Bus createBus() { - if (SpringUtils.isSpringAvailable()) + if (isSpringAvailable()) { return getSpringBusFactory().createBus(); } @@ -59,6 +59,13 @@ } } + private boolean isSpringAvailable() { + // Spring is available iff: + // 1) TCCL has Spring classes + // 2) the SpringBusFactory has already been loaded or the defining classloader can load that + return (SpringUtils.isSpringAvailable() && (springBusFactory != null || SpringUtils.isSpringAvailable(this.getClass().getClassLoader()))); + } + /** JBossWSSpringBusFactory methods **/ public Bus createBus(String cfgFile) {