diff --git a/BusinessProject/.DS_Store b/BusinessProject/.DS_Store index 206cf68..7cd705a 100644 Binary files a/BusinessProject/.DS_Store and b/BusinessProject/.DS_Store differ diff --git a/BusinessProject/src/Transaction/ContextManager.java b/BusinessProject/src/Transaction/ContextManager.java index 74f32b0..f9a9620 100644 --- a/BusinessProject/src/Transaction/ContextManager.java +++ b/BusinessProject/src/Transaction/ContextManager.java @@ -9,9 +9,8 @@ import javax.naming.NamingException; public class ContextManager { final static private String url = "t3://localhost:7001"; - final static private String user = "xmoe"; - final static private String password = "cbiloli7"; - + final static private String user = null; + final static private String password = null; static private Context ctx = null; diff --git a/BusinessProject/src/Transaction/DataBaseManager.java b/BusinessProject/src/Transaction/DataBaseManager.java index 098aace..3c1e1eb 100644 --- a/BusinessProject/src/Transaction/DataBaseManager.java +++ b/BusinessProject/src/Transaction/DataBaseManager.java @@ -13,9 +13,10 @@ import javax.sql.DataSource; public class DataBaseManager { - private static DataBaseManager instance; - private DataSource dataSource1; - private DataSource dataSource2; + private static DataBaseManager instance = null; + private DataSource dataSource1 = null; + private DataSource dataSource2 = null; + private DataSource dataSource3 = null; // private DataSource dataSource; @@ -33,6 +34,7 @@ public class DataBaseManager { dataSource1 = (DataSource) ctx.lookup("mysql1"); dataSource2 = (DataSource) ctx.lookup("mysql2"); + dataSource3 = (DataSource) ctx.lookup("mysql3"); } catch (NamingException e) @@ -72,6 +74,17 @@ public class DataBaseManager } } + public final Connection getConnection3() + { + try + { + return dataSource3.getConnection(); + } + catch (SQLException e) + { + throw new RuntimeException("无法从数据源获取连接 database3", e); + } + } public void TestConn1() throws SQLException { diff --git a/BusinessProject/src/Transaction/JTATransaction.java b/BusinessProject/src/Transaction/JTATransaction.java index 22e5f56..040ee9f 100644 --- a/BusinessProject/src/Transaction/JTATransaction.java +++ b/BusinessProject/src/Transaction/JTATransaction.java @@ -25,6 +25,7 @@ public class JTATransaction catch (NamingException e) { // TODO Auto-generated catch block + System.err.println("Cannot find UserTransaction in JNDI"); e.printStackTrace(); } return utx; diff --git a/BusinessProject/src/WebMain.java b/BusinessProject/src/WebMain.java index fcba587..5f66a41 100644 --- a/BusinessProject/src/WebMain.java +++ b/BusinessProject/src/WebMain.java @@ -39,37 +39,6 @@ public class WebMain extends HttpServlet out.close(); - /* - Context ctx = null; - - try - { - ctx = new InitialContext(); - } - catch (NamingException e) - { - // TODO Auto-generated catch block - System.err.println("Failed to create context!"); - e.printStackTrace(); - } - - try - { - dataSource1 = (DataSource) ctx.lookup("java:comp/env/jndi/mysql1"); - dataSource2 = (DataSource) ctx.lookup("java:comp/env/jndi/mysql2"); - - } - catch (NamingException e) - { - // TODO Auto-generated catch block - System.err.println("Failed to find context"); - e.printStackTrace(); - return; - } - - System.out.print("Ok, Context and jndi found!"); - */ - try { JTAConnManager.getInstance().TestConn1(); } catch (SQLException e) { @@ -77,7 +46,6 @@ public class WebMain extends HttpServlet System.err.println("%%% Error Get Datebase Connection! %%%"); e.printStackTrace(); } - } protected void doPost(HttpServletRequest req, HttpServletResponse res)