From 2b60ea3f10d0b652605f54816b4d2fef82a07544 Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Thu, 7 Feb 2013 15:15:54 -0300
Subject: [PATCH] Escolha entre conexão via JNDI ou configurada manualmente

---
 impl/extension/jdbc/pom.xml                                                                            |  5 ++++-
 impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JdbcConfig.java    | 21 +++++++++++++++++++++
 impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java | 23 +++++++++++++++++++----
 parent/bom/pom.xml                                                                                     |  8 +++++++-
 4 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/impl/extension/jdbc/pom.xml b/impl/extension/jdbc/pom.xml
index d55a675..448ad2d 100755
--- a/impl/extension/jdbc/pom.xml
+++ b/impl/extension/jdbc/pom.xml
@@ -36,7 +36,6 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>demoiselle-jdbc</artifactId>
@@ -68,6 +67,10 @@
 	</organization>
 
 	<dependencies>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+		</dependency>
 	</dependencies>
 
 	<repositories>
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
index 1f57575..8a6de3c 100644
--- 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
@@ -56,6 +56,15 @@ public class JdbcConfig implements Serializable {
 	@Name("driver.class")
 	private Map<String, String> driverClass;
 
+	@Name("url")
+	private Map<String, String> url;
+
+	@Name("username")
+	private Map<String, String> username;
+
+	@Name("password")
+	private Map<String, String> password;
+
 	public String getDefaultDataDourceName() {
 		return defaultDataDourceName;
 	}
@@ -67,4 +76,16 @@ public class JdbcConfig implements Serializable {
 	public Map<String, String> getDriverClass() {
 		return driverClass;
 	}
+
+	public Map<String, String> getUrl() {
+		return url;
+	}
+
+	public Map<String, String> getUsername() {
+		return username;
+	}
+
+	public Map<String, String> getPassword() {
+		return password;
+	}
 }
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 49be7b7..80705db 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
@@ -15,6 +15,7 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 
+import org.apache.commons.dbcp.BasicDataSource;
 import org.slf4j.Logger;
 
 import br.gov.frameworkdemoiselle.DemoiselleException;
@@ -109,12 +110,26 @@ public class DataSourceProducer implements Serializable {
 
 		try {
 			JdbcConfig config = Beans.getReference(JdbcConfig.class);
-			String jndi = config.getJndiName().get(dataSourceName);
+			Map<String, String> jndiMap = config.getJndiName();
 
-			// TODO Lançar exceção caso o JNDI esteja vazio ou nulo.
+			if (jndiMap != null) {
+				Context context = new InitialContext();
+				result = (DataSource) context.lookup(jndiMap.get(dataSourceName));
 
-			Context context = new InitialContext();
-			result = (DataSource) context.lookup(jndi);
+			} else {
+				String driver = config.getDriverClass().get(dataSourceName);
+				String url = config.getUrl().get(dataSourceName);
+				String username = config.getUsername().get(dataSourceName);
+				String password = config.getPassword().get(dataSourceName);
+
+				BasicDataSource dataSource = new BasicDataSource();
+				dataSource.setDriverClassName(driver);
+				dataSource.setUrl(url);
+				dataSource.setUsername(username);
+				dataSource.setPassword(password);
+
+				result = dataSource;
+			}
 
 		} catch (Exception cause) {
 			// TODO Colocar uma mensagem amigável
diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml
index c9a62a1..072a278 100755
--- a/parent/bom/pom.xml
+++ b/parent/bom/pom.xml
@@ -262,12 +262,17 @@
 				<version>${slf4j.version}</version>
 			</dependency>
 
-			<!-- configuration api+impl -->
+			<!-- apache commons -->
 			<dependency>
 				<groupId>commons-configuration</groupId>
 				<artifactId>commons-configuration</artifactId>
 				<version>${commons.configuration.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>commons-dbcp</groupId>
+				<artifactId>commons-dbcp</artifactId>
+				<version>${commons.dbcp.version}</version>
+			</dependency>
 
 			<!-- embedded database -->
 			<dependency>
@@ -353,6 +358,7 @@
 		<slf4j.version>1.6.1</slf4j.version>
 		<weld.version>1.1.8.Final</weld.version>
 		<commons.configuration.version>1.5</commons.configuration.version>
+		<commons.dbcp.version>1.4</commons.dbcp.version>
 		<hsqldb.version>1.8.0.10</hsqldb.version>
 		<jasperreports.version>4.0.1</jasperreports.version>
 		<mail.version>1.4.4</mail.version>
--
libgit2 0.21.2