From 6ec66c3e5ffcfc6088e76b943efabacb04641555 Mon Sep 17 00:00:00 2001
From: Felix Schumacher <felix.schumacher@internetallee.de>
Date: Tue, 24 Aug 2010 20:18:16 +0200
Subject: [PATCH] make usage of container managed DataSource

---
 WebContent/META-INF/context.xml             |  6 ++++++
 src/org/mcb/services/connectionmanager.java | 25 ++++++++-----------------
 2 files changed, 14 insertions(+), 17 deletions(-)
 create mode 100644 WebContent/META-INF/context.xml

diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
new file mode 100644
index 0000000..12fcb11
--- /dev/null
+++ b/WebContent/META-INF/context.xml
@@ -0,0 +1,6 @@
+<Context>
+	<Resource name="jdbc/scdb" auth="Container" type="javax.sql.DataSource"
+		driverClassName="oracle.jdbc.OracleDriver"
+		url="jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = 10.20.0.115)(PORT = 1521)))(CONNECT_DATA =(SERVICE_NAME = scdb)))"
+		username="scuser" password="scuser" maxActive="20" maxIdle="5" />
+</Context>
\ No newline at end of file
diff --git a/src/org/mcb/services/connectionmanager.java b/src/org/mcb/services/connectionmanager.java
index 6a67a6c..0d5c866 100644
--- a/src/org/mcb/services/connectionmanager.java
+++ b/src/org/mcb/services/connectionmanager.java
@@ -5,26 +5,17 @@ package org.mcb.services;
  * @author yawar.saeed
  */
 import java.sql.Connection;
-import java.sql.DriverManager;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
 
 public class connectionmanager {
 
 	public static Connection scgm_conn() throws Exception {
-		String host = "10.20.0.115";
-		String service = "scdb";
-		String usr = "scuser";
-		String pass = "scuser";
-		String driverName = "oracle.jdbc.driver.OracleDriver";
-		String connstr = "jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS_LIST = (ADDRESS = (PROTOCOL = TCP)(HOST = "
-				+ host
-				+ ")(PORT = 1521)))(CONNECT_DATA =(SERVICE_NAME = "
-				+ service + ")))";
-		try {
-			Class.forName(driverName).newInstance();
-			return DriverManager.getConnection(connstr, usr, pass);
-		} catch (Exception e) {
-			System.out.println(e);
-		}
-		return null;
+		Context initContext = new InitialContext();
+		Context envContext  = (Context)initContext.lookup("java:/comp/env");
+		DataSource ds = (DataSource)envContext.lookup("jdbc/scdb");
+		return ds.getConnection();
 	}
 }
-- 
2.11.0