diff --git a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JDBCConfig.java b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JDBCConfig.java new file mode 100644 index 0000000..f09f0e1 --- /dev/null +++ b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JDBCConfig.java @@ -0,0 +1,91 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.internal.configuration; + +import java.io.Serializable; +import java.util.Map; + +import br.gov.frameworkdemoiselle.annotation.Name; +import br.gov.frameworkdemoiselle.configuration.Configuration; + +@Configuration(prefix = "frameworkdemoiselle.persistence.") +public class JDBCConfig implements Serializable { + + private static final long serialVersionUID = 1L; + + @Name("default.datasource.name") + private String defaultDataDourceName; + + @Name("jndi.name") + private Map jndiName; + + @Name("driver.class") + private Map driverClass; + + @Name("url") + private Map url; + + @Name("username") + private Map username; + + @Name("password") + private Map password; + + public String getDefaultDataDourceName() { + return defaultDataDourceName; + } + + public Map getJndiName() { + return jndiName; + } + + public Map getDriverClass() { + return driverClass; + } + + public Map getUrl() { + return url; + } + + public Map getUsername() { + return username; + } + + public Map getPassword() { + return password; + } +} diff --git a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JdbcConfig.java b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JdbcConfig.java deleted file mode 100644 index 8a6de3c..0000000 --- a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JdbcConfig.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package br.gov.frameworkdemoiselle.internal.configuration; - -import java.io.Serializable; -import java.util.Map; - -import br.gov.frameworkdemoiselle.annotation.Name; -import br.gov.frameworkdemoiselle.configuration.Configuration; - -@Configuration(prefix = "frameworkdemoiselle.persistence.") -public class JdbcConfig implements Serializable { - - private static final long serialVersionUID = 1L; - - @Name("default.datasource.name") - private String defaultDataDourceName; - - @Name("jndi.name") - private Map jndiName; - - @Name("driver.class") - private Map driverClass; - - @Name("url") - private Map url; - - @Name("username") - private Map username; - - @Name("password") - private Map password; - - public String getDefaultDataDourceName() { - return defaultDataDourceName; - } - - public Map getJndiName() { - return jndiName; - } - - public Map getDriverClass() { - return driverClass; - } - - public Map getUrl() { - return url; - } - - public Map getUsername() { - return username; - } - - public Map getPassword() { - return password; - } -} diff --git a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ConnectionProducer.java b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ConnectionProducer.java index d15fb07..3315266 100644 --- a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ConnectionProducer.java +++ b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ConnectionProducer.java @@ -19,7 +19,7 @@ import org.slf4j.Logger; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.annotation.Name; -import br.gov.frameworkdemoiselle.internal.configuration.JdbcConfig; +import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig; import br.gov.frameworkdemoiselle.internal.proxy.ConnectionProxy; import br.gov.frameworkdemoiselle.util.ResourceBundle; @@ -49,7 +49,7 @@ public class ConnectionProducer implements Serializable { @Default @Produces - public Connection create(InjectionPoint ip, JdbcConfig config) { + public Connection create(InjectionPoint ip, JDBCConfig config) { String name = getName(ip, config); return new ConnectionProxy(name); } @@ -63,6 +63,7 @@ public class ConnectionProducer implements Serializable { } else { try { result = producer.create(name).getConnection(); + result.setAutoCommit(false); cache.put(name, result); this.logger.info(bundle.getString("connection-was-created", name)); @@ -77,7 +78,7 @@ public class ConnectionProducer implements Serializable { return result; } - private String getName(InjectionPoint ip, JdbcConfig config) { + private String getName(InjectionPoint ip, JDBCConfig config) { String result; if (ip != null && ip.getAnnotated() != null && ip.getAnnotated().isAnnotationPresent(Name.class)) { @@ -96,7 +97,7 @@ public class ConnectionProducer implements Serializable { return result; } - private String getNameFromProperties(JdbcConfig config) { + private String getNameFromProperties(JDBCConfig config) { String result = config.getDefaultDataDourceName(); if (result != null) { diff --git a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java index 80705db..1fc1df0 100644 --- a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java +++ b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java @@ -20,7 +20,7 @@ import org.slf4j.Logger; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.annotation.Name; -import br.gov.frameworkdemoiselle.internal.configuration.JdbcConfig; +import br.gov.frameworkdemoiselle.internal.configuration.JDBCConfig; import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.ResourceBundle; @@ -58,7 +58,7 @@ public class DataSourceProducer implements Serializable { private Set getDataSourceNames(ClassLoader classLoader) { Set result = new HashSet(); - JdbcConfig config = Beans.getReference(JdbcConfig.class); + JDBCConfig config = Beans.getReference(JDBCConfig.class); if (config.getJndiName() != null) { result.addAll(config.getJndiName().keySet()); @@ -109,7 +109,7 @@ public class DataSourceProducer implements Serializable { DataSource result; try { - JdbcConfig config = Beans.getReference(JdbcConfig.class); + JDBCConfig config = Beans.getReference(JDBCConfig.class); Map jndiMap = config.getJndiName(); if (jndiMap != null) { -- libgit2 0.21.2