/*
 * JBoss, Home of Professional Open Source.
 * Copyright 2011, Red Hat, Inc., 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.as.connector.registry;

import java.sql.Driver;

import java.sql.DriverManager;
import java.sql.SQLException;
import org.jboss.logging.Logger;
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 static final Logger log = Logger.getLogger("org.jboss.as.connector.registry");

    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 {
        DriverRegistry registry = injectedDriverRegistry.getValue();
        boolean ok = false;
        registry.registerInstalledDriver(driverMetaData);
        try {
            DriverManager.registerDriver(driver);
            ok = true;
        } catch (SQLException e) {
            throw new StartException(e);
        } finally {
            if (! ok) try {
                registry.unregisterInstalledDriver(driverMetaData);
            } catch (Throwable t) {
                log.error("Failed to unregister JDBC driver from JCA registry after service failed", t);
            }
        }
    }

    @Override
    public void stop(StopContext context) {
        try {
            injectedDriverRegistry.getValue().unregisterInstalledDriver(driverMetaData);
        } catch (Throwable t) {
            log.error("Failed to unregister JDBC driver from JCA registry in service stop", t);
        }
        try {
            DriverManager.deregisterDriver(driver);
        } catch (SQLException e) {
            log.error("Failed to unregister JDBC driver from driver manager in service stop", e);
        }
    }

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

}

@@ -1,1199 +1,81 @@
 /*
-%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;
+*%0A *%0A */%0Apackage org.jboss.as.connector.registry;%0A%0Aimport java.sql.Driver;%0A
 %0Aimp
@@ -492,100 +492,8 @@
  %7B%0A%0A
-    private static final Logger log = Logger.getLogger(%22org.jboss.as.connector.registry%22);%0A%0A
     
@@ -1173,34 +1173,8 @@
     
- DriverRegistry registry =
  inj
@@ -1207,539 +1207,49 @@
 ue()
-;%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
+.registerInstalledDriver(driverMetaData);
 %0A   
@@ -1310,34 +1310,16 @@
 text) %7B%0A
-        try %7B%0A    
         
@@ -1399,355 +1399,8 @@
 a);%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
     

Revert "Make Drivers work from DriverManager, for those who want it"