Author: dkulp Date: Fri Nov 14 13:10:10 2008 New Revision: 714143 URL: http://svn.apache.org/viewvc?rev=714143&view=rev Log: Merged revisions 712275 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r712275 | dkulp | 2008-11-07 16:29:32 -0500 (Fri, 07 Nov 2008) | 9 lines Merged revisions 712272 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r712272 | dkulp | 2008-11-07 16:27:54 -0500 (Fri, 07 Nov 2008) | 2 lines For spring applications and such, make sure the bus lifecycle listeners are called. ........ ................ Added: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java - copied unchanged from r712275, cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationListener.java cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java - copied unchanged from r712275, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/LifeCycleListenerTester.java - copied unchanged from r712275, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/LifeCycleListenerTester.java Removed: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/TestCrossSchemaImports.java Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java cxf/branches/2.0.x-fixes/systests/src/test/resources/crossSchemaBeans.xml Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 14 13:10:10 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712896 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712893 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712896 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712893 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java?rev=714143&r1=714142&r2=714143&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java (original) +++ cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/BusFactory.java Fri Nov 14 13:10:10 2008 @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.cxf.buslifecycle.BusLifeCycleManager; import org.apache.cxf.common.classloader.ClassLoaderUtils; import org.apache.cxf.common.logging.LogUtils; @@ -173,10 +172,6 @@ } protected void initializeBus(Bus bus) { - BusLifeCycleManager lifeCycleManager = bus.getExtension(BusLifeCycleManager.class); - if (null != lifeCycleManager) { - lifeCycleManager.initComplete(); - } } private static String getBusFactoryClass(ClassLoader classLoader) { Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java?rev=714143&r1=714142&r2=714143&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java Fri Nov 14 13:10:10 2008 @@ -25,6 +25,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.extension.ExtensionManagerBus; +import org.apache.cxf.buslifecycle.BusLifeCycleManager; public class CXFBusFactory extends BusFactory { @@ -43,4 +44,12 @@ return bus; } + + protected void initializeBus(Bus bus) { + super.initializeBus(bus); + BusLifeCycleManager lifeCycleManager = bus.getExtension(BusLifeCycleManager.class); + if (null != lifeCycleManager) { + lifeCycleManager.initComplete(); + } + } } Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java?rev=714143&r1=714142&r2=714143&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java Fri Nov 14 13:10:10 2008 @@ -25,7 +25,6 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.CXFBusImpl; import org.apache.cxf.buslifecycle.BusLifeCycleListener; import org.apache.cxf.buslifecycle.BusLifeCycleManager; import org.apache.cxf.common.logging.LogUtils; @@ -140,12 +139,6 @@ throw new RuntimeException(ex); } } - - @Override - protected void initializeBus(Bus bus) { - ((CXFBusImpl)bus).initialize(); - super.initializeBus(bus); - } void registerApplicationContextLifeCycleListener(Bus bus, BusApplicationContext bac) { BusLifeCycleManager lm = bus.getExtension(BusLifeCycleManager.class); Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java?rev=714143&r1=714142&r2=714143&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java Fri Nov 14 13:10:10 2008 @@ -31,6 +31,8 @@ private final List<BusLifeCycleListener> listeners; private Bus bus; + private boolean preShutdownCalled; + private boolean postShutdownCalled; public CXFBusLifeCycleManager() { listeners = new ArrayList<BusLifeCycleListener>(); @@ -66,6 +68,8 @@ } public void initComplete() { + preShutdownCalled = false; + postShutdownCalled = false; for (BusLifeCycleListener listener : listeners) { listener.initComplete(); } @@ -73,15 +77,22 @@ public void preShutdown() { // TODO inverse order of registration? + preShutdownCalled = true; for (BusLifeCycleListener listener : listeners) { listener.preShutdown(); } } public void postShutdown() { - // TODO inverse order of registration? - for (BusLifeCycleListener listener : listeners) { - listener.postShutdown(); + if (!preShutdownCalled) { + preShutdown(); + } + if (!postShutdownCalled) { + postShutdownCalled = true; + // TODO inverse order of registration? + for (BusLifeCycleListener listener : listeners) { + listener.postShutdown(); + } } } Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml?rev=714143&r1=714142&r2=714143&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/cxf.xml Fri Nov 14 13:10:10 2008 @@ -24,6 +24,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/> + <bean id="foo" class="org.apache.cxf.bus.spring.BusApplicationListener"/> <bean id="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor" class="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"/> <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/> <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/> Modified: cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?rev=714143&r1=714142&r2=714143&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java (original) +++ cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java Fri Nov 14 13:10:10 2008 @@ -230,6 +230,9 @@ static class TestFeature extends AbstractFeature { boolean initialised; + public TestFeature() { + //nothing + } @Override public void initialize(Bus bus) { Modified: cxf/branches/2.0.x-fixes/systests/src/test/resources/crossSchemaBeans.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/resources/crossSchemaBeans.xml?rev=714143&r1=714142&r2=714143&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/systests/src/test/resources/crossSchemaBeans.xml (original) +++ cxf/branches/2.0.x-fixes/systests/src/test/resources/crossSchemaBeans.xml Fri Nov 14 13:10:10 2008 @@ -34,6 +34,8 @@ <import resource="classpath:META-INF/cxf/cxf-extension-local.xml" /> <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> + <bean class="org.apache.cxf.systest.wsdl.LifeCycleListenerTester" id="listenerTest"/> + <!-- Services --> <jaxws:server id="JaxbTestServer" serviceClass="org.apache.type_test.doc.TypeTestPortType"
