[jboss-cvs] JBossAS SVN: r101263 - in projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as: server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-02-22 15:29:41 -0500 (Mon, 22 Feb 2010)
New Revision: 101263

Removed:
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/lifecycle/VfsInitializingLifecycleEventHandler.java
Modified:
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java
Log:
[JBBOOT-129] Remove VfsInitializingLifecycleEventHandler

Deleted: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/lifecycle/VfsInitializingLifecycleEventHandler.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/lifecycle/VfsInitializingLifecycleEventHandler.java	2010-02-22 20:21:31 UTC (rev 101262)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/lifecycle/VfsInitializingLifecycleEventHandler.java	2010-02-22 20:29:41 UTC (rev 101263)
@@ -1,107 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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.bootstrap.impl.as.lifecycle;
-
-import java.net.URL;
-
-import org.jboss.bootstrap.api.lifecycle.LifecycleEventException;
-import org.jboss.bootstrap.api.lifecycle.LifecycleEventHandler;
-import org.jboss.bootstrap.api.lifecycle.LifecycleState;
-import org.jboss.logging.Logger;
-import org.jboss.net.protocol.URLStreamHandlerFactory;
-import org.jboss.virtual.VFS;
-
-/**
- * VfsInitializingLifecycleEventHandler
- * 
- * Initializes VFS via an explicit call to {@link VFS#init()}
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- * @deprecated JBBOOT-67 -This is in place only until we've got a mechanism to initialize
- * VFS explictly via a configurable deployable bootstrap XML, not this built-in hack
- * (which supports the legacy behaviour).
- */
- at Deprecated
-//TODO Remove JBBOOT-67, JBBOOT-68
-public class VfsInitializingLifecycleEventHandler implements LifecycleEventHandler
-{
-
-   //-------------------------------------------------------------------------------------||
-   // Class Members ----------------------------------------------------------------------||
-   //-------------------------------------------------------------------------------------||
-
-   /**
-    * Logger
-    */
-   private static final Logger log = Logger.getLogger(VfsInitializingLifecycleEventHandler.class);
-
-   //-------------------------------------------------------------------------------------||
-   // Instance Members -------------------------------------------------------------------||
-   //-------------------------------------------------------------------------------------||
-
-   /**
-    * Flag to indicate whether this has yet been run
-    */
-   private boolean beenRun;
-
-   //-------------------------------------------------------------------------------------||
-   // Required Implementations -----------------------------------------------------------||
-   //-------------------------------------------------------------------------------------||
-
-   /* (non-Javadoc)
-    * @see org.jboss.bootstrap.spi.lifecycle.LifecycleEventHandler#handleEvent(org.jboss.bootstrap.spi.lifecycle.LifecycleState)
-    */
-   public synchronized void handleEvent(final LifecycleState state) throws LifecycleEventException
-   {
-      // Only run this instance once
-      if (!beenRun)
-      {
-         // Log
-         log.debug("Initializing the virtual filesystem...");
-
-         // Init the virtual filesystem
-         VFS.init();
-
-         // This bit was copied from the legacy AbstractServerImpl
-         try
-         {
-            // Install a URLStreamHandlerFactory that uses the TCL
-            URL.setURLStreamHandlerFactory(new URLStreamHandlerFactory());
-
-            // Preload JBoss URL handlers
-            URLStreamHandlerFactory.preload();
-         }
-         catch (final Error e)
-         {
-            // very naughty but we HAVE to do this or
-            // we'll fail if we ever try to do this again
-            log.warn("Caught Throwable Error, this probably means "
-                  + "we've already set the URLStreamHAndlerFactory before", e);
-         }
-
-         // Mark
-         beenRun = true;
-      }
-   }
-}
\ No newline at end of file

Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java	2010-02-22 20:21:31 UTC (rev 101262)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/server/AbstractJBossASServerBase.java	2010-02-22 20:29:41 UTC (rev 101263)
@@ -44,7 +44,6 @@
 import org.jboss.bootstrap.impl.as.config.JBossASConfigurationInitializerImpl;
 import org.jboss.bootstrap.impl.as.lifecycle.KernelStartEventLifecycleEventHandler;
 import org.jboss.bootstrap.impl.as.lifecycle.KernelStopEventLifecycleEventHandler;
-import org.jboss.bootstrap.impl.as.lifecycle.VfsInitializingLifecycleEventHandler;
 import org.jboss.bootstrap.impl.as.xml.BootstrapParser;
 import org.jboss.bootstrap.impl.base.config.InvalidBootstrapURLException;
 import org.jboss.bootstrap.impl.mc.server.AbstractMCServerBase;
@@ -287,13 +286,6 @@
       // Set up the bootstrap descriptors
       this.setupBootstrapDescriptorsFromBootstrapUrl();
 
-      // JBBOOT-68
-      //TODO Remove once VFS is init'd from something else
-      // Register an event handler to init VFS alongside server start
-      @SuppressWarnings("deprecation")
-      final LifecycleEventHandler initVfsHandler = new VfsInitializingLifecycleEventHandler();
-      this.registerEventHandler(initVfsHandler, LifecycleState.INITIALIZED);
-
       // Create and Register handlers
       final LifecycleEventHandler startHandler = new KernelStartEventLifecycleEventHandler(this);
       final LifecycleEventHandler stopHandler = new KernelStopEventLifecycleEventHandler(this);