/**
 *
 */
package org.jboss.as.connector.registry;

import java.sql.Driver;

import org.jboss.msc.inject.Injector;
import org.jboss.msc.service.Service;
import org.jboss.msc.service.StartContext;
import org.jboss.msc.service.StartException;
import org.jboss.msc.service.StopContext;
import org.jboss.msc.value.InjectedValue;

/**
 * Service wrapper for a {@link java.sql.Driver}.
 *
 * @author Brian Stansberry (c) 2011 Red Hat Inc.
 */
public class DriverService implements Service<Driver> {

    private InjectedValue<DriverRegistry> injectedDriverRegistry = new InjectedValue<DriverRegistry>();

    private final InstalledDriver driverMetaData;
    private final Driver driver;

    public DriverService(InstalledDriver driverMetaData, Driver driver) {
        assert driverMetaData != null : "driverMetaData is null";
        assert driver != null : "driver is null";
        this.driverMetaData = driverMetaData;
        this.driver = driver;
    }

    @Override
    public Driver getValue() throws IllegalStateException, IllegalArgumentException {
        return driver;
    }

    @Override
    public void start(StartContext context) throws StartException {
        injectedDriverRegistry.getValue().registerInstalledDriver(driverMetaData);
    }

    @Override
    public void stop(StopContext context) {
        injectedDriverRegistry.getValue().unregisterInstalledDriver(driverMetaData);
    }

    public Injector<DriverRegistry> getDriverRegistryServiceInjector() {
        return injectedDriverRegistry;
    }

}

@@ -1,81 +1,1199 @@
 /*
-*%0A *%0A */%0Apackage org.jboss.as.connector.registry;%0A%0Aimport java.sql.Driver;%0A
+%0A * JBoss, Home of Professional Open Source.%0A * Copyright 2011, Red Hat, Inc., and individual contributors%0A * as indicated by the @author tags. See the copyright.txt file in the%0A * distribution for a full listing of individual contributors.%0A *%0A * This is free software; you can redistribute it and/or modify it%0A * under the terms of the GNU Lesser General Public License as%0A * published by the Free Software Foundation; either version 2.1 of%0A * the License, or (at your option) any later version.%0A *%0A * This software is distributed in the hope that it will be useful,%0A * but WITHOUT ANY WARRANTY; without even the implied warranty of%0A * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU%0A * Lesser General Public License for more details.%0A *%0A * You should have received a copy of the GNU Lesser General Public%0A * License along with this software; if not, write to the Free%0A * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA%0A * 02110-1301 USA, or see the FSF site: http://www.fsf.org.%0A */%0A%0A/**%0A *%0A */%0Apackage org.jboss.as.connector.registry;%0A%0Aimport java.sql.Driver;%0A%0Aimport java.sql.DriverManager;%0Aimport java.sql.SQLException;%0Aimport org.jboss.logging.Logger;
 %0Aimp
@@ -1606,16 +1606,108 @@
 ver%3E %7B%0A%0A
+    private static final Logger log = Logger.getLogger(%22org.jboss.as.connector.registry%22);%0A%0A
     priv
@@ -2371,32 +2371,58 @@
 eption %7B%0A       
+ DriverRegistry registry =
  injectedDriverR
@@ -2443,49 +2443,539 @@
 ue()
-.registerInstalledDriver(driverMetaData);
+;%0A        boolean ok = false;%0A        registry.registerInstalledDriver(driverMetaData);%0A        try %7B%0A            DriverManager.registerDriver(driver);%0A            ok = true;%0A        %7D catch (SQLException e) %7B%0A            throw new StartException(e);%0A        %7D finally %7B%0A            if (! ok) try %7B%0A                registry.unregisterInstalledDriver(driverMetaData);%0A            %7D catch (Throwable t) %7B%0A                log.error(%22Failed to unregister JDBC driver from JCA registry after service failed%22, t);%0A            %7D%0A        %7D
 %0A   
@@ -3032,24 +3032,42 @@
  context) %7B%0A
+        try %7B%0A    
         inje
@@ -3135,24 +3135,371 @@
 rMetaData);%0A
+        %7D catch (Throwable t) %7B%0A            log.error(%22Failed to unregister JDBC driver from JCA registry in service stop%22, t);%0A        %7D%0A        try %7B%0A            DriverManager.deregisterDriver(driver);%0A        %7D catch (SQLException e) %7B%0A            log.error(%22Failed to unregister JDBC driver from driver manager in service stop%22, e);%0A        %7D%0A
     %7D%0A%0A    p

Make Drivers work from DriverManager, for those who want it