[jbossws-commits] JBossWS SVN: r15372 - in stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf: deployment/aspect and 1 other directory.

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 10:20:43 -0500 (Wed, 14 Dec 2011) New Revision: 15372 Removed: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java Log: Removing CXFInitializer, which is not needed on AS7 series Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java 2011-12-14 15:19:55 UTC (rev 15371) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java 2011-12-14 15:20:43 UTC (rev 15372) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.config; - -import java.util.ResourceBundle; -import java.util.concurrent.CountDownLatch; - -import org.apache.cxf.BusFactory; -import org.jboss.logging.Logger; -import org.jboss.ws.api.util.BundleUtils; - - -/** - * A bean installed during boot for initializing CXF - * - * @author alessio.soldano(a)jboss.com - * @since 06-Opt-2010 - * - */ -public class CXFInitializer -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(CXFInitializer.class); - private static Logger logger = Logger.getLogger(CXFInitializer.class); - private static CountDownLatch defaultBusCDL = new CountDownLatch(1); - - public void create() throws Exception - { - Thread defaultBusInitThread = new Thread(new DefautBusInitializer(defaultBusCDL), "JBossWS-CXF-DefaultBus-Init"); - defaultBusInitThread.setDaemon(true); - defaultBusInitThread.start(); - } - - public void destroy() throws Exception - { - //NOOP - } - - public static void waitForDefaultBusAvailability() - { - boolean trace = logger.isTraceEnabled(); - if (trace) - logger.trace(Thread.currentThread() + " will wait for default bus availability..."); - try - { - defaultBusCDL.await(); - if (trace) - logger.trace("Default bus now available: " + BusFactory.getDefaultBus(false)); - } - catch (InterruptedException e) - { - logger.error(BundleUtils.getMessage(bundle, "INTERRUPTED")); - throw new RuntimeException(e); - } - } - - private class DefautBusInitializer implements Runnable - { - private CountDownLatch cdl; - - public DefautBusInitializer(CountDownLatch cdl) - { - this.cdl = cdl; - } - - @Override - public void run() - { - long start = System.currentTimeMillis(); - try - { - BusFactory.getDefaultBus(); - if (logger.isTraceEnabled()) - { - logger.info("Default bus started in " + (System.currentTimeMillis() - start) + " ms by " - + Thread.currentThread()); - } - } - finally - { - cdl.countDown(); - } - } - } - -} Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java 2011-12-14 15:19:55 UTC (rev 15371) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java 2011-12-14 15:20:43 UTC (rev 15372) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.deployment.aspect; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.cxf.config.CXFInitializer; - -/** - * A synchronized version of the bus deployment aspect that waits for the CXFInitializer - * and does single-thread deployment processing - * - * @author alessio.soldano(a)jboss.com - * @since 25-Mar-2010 - */ -public class SynchronizedBusDeploymentAspect extends BusDeploymentAspect -{ - @Override - protected void startDeploymentBus(Deployment dep) - { - //ensure the default bus has been set on the server, then proceed - CXFInitializer.waitForDefaultBusAvailability(); - //synchronize as this assumes nothing deals with the BusFactory threadlocals associated with the system daemon - //thread doing the deployments, iow multiple concurrent deployment are not supported in this deployment aspect - synchronized (this) - { - super.startDeploymentBus(dep); - } - } - - @Override - public void start(Deployment dep) - { - this.startDeploymentBus(dep); - } -} \ No newline at end of file