Menu
▾
▴
[Neuclear-develop] neuclear-commons/src/java/org/neuclear/commons/sql DefaultConnectionSource.java,1.3,1.4 SQLTools.java,1.3,1.4 XAConnectionSource.java,1.1,1.2
|
From: <pe...@us...> - 2003-12-03 23:22:09
|
Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv23691/src/java/org/neuclear/commons/sql
Modified Files:
DefaultConnectionSource.java SQLTools.java
XAConnectionSource.java
Log Message:
Got rid of ofbiz support. Way over the top for our use.
Index: DefaultConnectionSource.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql/DefaultConnectionSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultConnectionSource.java 1 Dec 2003 15:44:53 -0000 1.3
--- DefaultConnectionSource.java 3 Dec 2003 23:22:06 -0000 1.4
***************
*** 4,17 ****
import javax.naming.NamingException;
import java.sql.Connection;
import java.sql.SQLException;
- import java.sql.DriverManager;
- import java.io.IOException;
- import java.util.Map;
- import java.util.HashMap;
import java.util.Properties;
/**
- *
* User: pelleb
* Date: Aug 6, 2003
--- 4,13 ----
import javax.naming.NamingException;
+ import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
/**
* User: pelleb
* Date: Aug 6, 2003
***************
*** 20,25 ****
public final class DefaultConnectionSource implements ConnectionSource {
public DefaultConnectionSource() throws SQLException, NeuClearException, IOException, NamingException {
! final Properties props=SQLTools.loadProperties();
cs = new XAConnectionSource(
props.getProperty("jdbc.class"),
props.getProperty("jdbc.url"),
--- 16,22 ----
public final class DefaultConnectionSource implements ConnectionSource {
public DefaultConnectionSource() throws SQLException, NeuClearException, IOException, NamingException {
! final Properties props = SQLTools.loadProperties();
cs = new XAConnectionSource(
+ props.getProperty("jndi.name"),
props.getProperty("jdbc.class"),
props.getProperty("jdbc.url"),
Index: SQLTools.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql/SQLTools.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SQLTools.java 1 Dec 2003 15:44:54 -0000 1.3
--- SQLTools.java 3 Dec 2003 23:22:06 -0000 1.4
***************
*** 1,25 ****
package org.neuclear.commons.sql;
- import org.neuclear.commons.NeuClearException;
- import org.objectweb.jotm.Jotm;
import org.objectweb.carol.util.configuration.CarolConfiguration;
import org.objectweb.carol.util.configuration.RMIConfigurationException;
- import javax.transaction.UserTransaction;
- import javax.transaction.TransactionManager;
- import javax.transaction.SystemException;
- import javax.naming.InitialContext;
import javax.naming.Context;
import javax.naming.NamingException;
! import java.sql.SQLException;
import java.sql.DriverManager;
import java.sql.Timestamp;
import java.util.Properties;
- import java.util.Date;
- import java.io.FileInputStream;
- import java.io.File;
- import java.io.IOException;
- import java.io.InputStream;
- import java.net.URL;
/**
--- 1,21 ----
package org.neuclear.commons.sql;
import org.objectweb.carol.util.configuration.CarolConfiguration;
import org.objectweb.carol.util.configuration.RMIConfigurationException;
+ import org.objectweb.jotm.Jotm;
import javax.naming.Context;
+ import javax.naming.InitialContext;
import javax.naming.NamingException;
! import javax.transaction.SystemException;
! import javax.transaction.TransactionManager;
! import javax.transaction.UserTransaction;
! import java.io.File;
! import java.io.FileInputStream;
! import java.io.IOException;
import java.sql.DriverManager;
+ import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.Properties;
/**
***************
*** 31,39 ****
*/
public final class SQLTools {
! private static final String PROPS_FILE = "neuclear-ledger.properties";
public final static java.sql.Connection getConnection() throws SQLException, IOException {
! final Properties props=loadProperties();
! try {
Class.forName(props.getProperty("jdbc.class")).newInstance();
} catch (InstantiationException e) {
--- 27,35 ----
*/
public final class SQLTools {
! private static final String PROPS_FILE = "neuclear-sql.properties";
public final static java.sql.Connection getConnection() throws SQLException, IOException {
! final Properties props = loadProperties();
! try {
Class.forName(props.getProperty("jdbc.class")).newInstance();
} catch (InstantiationException e) {
***************
*** 54,62 ****
static Properties loadProperties() throws IOException {
! final Properties props=new Properties();
! final File propsFile= new File(
! System.getProperty("user.home")+
! System.getProperty("file.separator")+
! PROPS_FILE) ;
if (!propsFile.exists()) {
System.out.println("getting props from system classpath");
--- 50,58 ----
static Properties loadProperties() throws IOException {
! final Properties props = new Properties();
! final File propsFile = new File(
! System.getProperty("user.home") +
! System.getProperty("file.separator") +
! PROPS_FILE);
if (!propsFile.exists()) {
System.out.println("getting props from system classpath");
***************
*** 70,82 ****
public final static Timestamp toTimestamp(final java.util.Date date) {
! if (date==null)
return null;
return new Timestamp(date.getTime());
}
! public final static UserTransaction getUserTransaction() throws NamingException,SystemException {
! Context ctx = new InitialContext();
UserTransaction ut = null;
try {
! ut = (UserTransaction)ctx.lookup(USERXACT);
} catch (NamingException e) {
getTransactionManager().getTransaction();
--- 66,79 ----
public final static Timestamp toTimestamp(final java.util.Date date) {
! if (date == null)
return null;
return new Timestamp(date.getTime());
}
!
! public final static UserTransaction getUserTransaction() throws NamingException, SystemException {
! Context ctx = new InitialContext();
UserTransaction ut = null;
try {
! ut = (UserTransaction) ctx.lookup(USERXACT);
} catch (NamingException e) {
getTransactionManager().getTransaction();
***************
*** 89,105 ****
public final static synchronized TransactionManager getTransactionManager() throws NamingException {
! if (jotm==null){
Context ctx = new InitialContext();
! jotm=new Jotm(true,false);
! ctx.rebind(USERXACT,jotm.getUserTransaction());
}
return jotm.getTransactionManager();
}
! final static void loadDefaultContext(){
! try{
! System.setProperty("java.naming.factory.initial","org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory");
! Context ctx=new InitialContext();
! } catch (Exception ex){
try {
--- 86,104 ----
public final static synchronized TransactionManager getTransactionManager() throws NamingException {
! if (jotm == null) {
Context ctx = new InitialContext();
! jotm = new Jotm(true, false);
! ctx.rebind(USERXACT, jotm.getUserTransaction());
}
return jotm.getTransactionManager();
}
!
! public final static Context loadDefaultContext() {
! try {
! System.setProperty("java.naming.factory.initial", "org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory");
! Context ctx = new InitialContext();
! return ctx;
! } catch (Exception ex) {
try {
***************
*** 109,116 ****
throw new RuntimeException(e);
} catch (NamingException e) {
! throw new RuntimeException(e) ;
}
}
}
--- 108,116 ----
throw new RuntimeException(e);
} catch (NamingException e) {
! throw new RuntimeException(e);
}
}
+ return null;
}
Index: XAConnectionSource.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql/XAConnectionSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XAConnectionSource.java 1 Dec 2003 15:44:54 -0000 1.1
--- XAConnectionSource.java 3 Dec 2003 23:22:06 -0000 1.2
***************
*** 4,19 ****
import org.neuclear.commons.NeuClearException;
! import javax.sql.XADataSource;
! import javax.sql.XAConnection;
import javax.naming.NamingException;
import java.sql.Connection;
import java.sql.SQLException;
- import java.sql.DriverManager;
- import java.io.IOException;
- import java.util.Map;
- import java.util.HashMap;
/**
- *
* User: pelleb
* Date: Aug 6, 2003
--- 4,15 ----
import org.neuclear.commons.NeuClearException;
! import javax.naming.Context;
import javax.naming.NamingException;
+ import javax.sql.XADataSource;
+ import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
/**
* User: pelleb
* Date: Aug 6, 2003
***************
*** 21,41 ****
*/
public final class XAConnectionSource implements ConnectionSource {
! public XAConnectionSource(final String driver, final String url, final String user, final String password) throws SQLException, NeuClearException, NamingException{
! SQLTools.loadDefaultContext();
try {
! Class.forName(driver).newInstance();
! } catch (InstantiationException e) {
! e.printStackTrace(); //To change body of catch statement use Options | File Templates.
! } catch (IllegalAccessException e) {
! e.printStackTrace(); //To change body of catch statement use Options | File Templates.
! } catch (ClassNotFoundException e) {
! e.printStackTrace(); //To change body of catch statement use Options | File Templates.
! }
! this.user=user;
! this.password=password;
xads = new StandardXADataSource();
((StandardXADataSource) xads).setDriverName(driver);
((StandardXADataSource) xads).setUrl(url);
((StandardXADataSource) xads).setTransactionManager(SQLTools.getTransactionManager());
}
--- 17,41 ----
*/
public final class XAConnectionSource implements ConnectionSource {
! public XAConnectionSource(final String name, final String driver, final String url, final String user, final String password) throws SQLException, NeuClearException, NamingException {
! Context ctx = SQLTools.loadDefaultContext();
! SQLTools.getTransactionManager();
try {
! Class.forName(driver).newInstance();
! } catch (InstantiationException e) {
! e.printStackTrace(); //To change body of catch statement use Options | File Templates.
! } catch (IllegalAccessException e) {
! e.printStackTrace(); //To change body of catch statement use Options | File Templates.
! } catch (ClassNotFoundException e) {
! e.printStackTrace(); //To change body of catch statement use Options | File Templates.
! }
xads = new StandardXADataSource();
((StandardXADataSource) xads).setDriverName(driver);
((StandardXADataSource) xads).setUrl(url);
((StandardXADataSource) xads).setTransactionManager(SQLTools.getTransactionManager());
+ ((StandardXADataSource) xads).setUser(user);
+ ((StandardXADataSource) xads).setPassword(password);
+
+
+ ctx.bind(name, xads);
}
***************
*** 43,51 ****
public Connection getConnection() throws SQLException, IOException {
! return xads.getXAConnection(user,password).getConnection();
}
- private final String user;
- private final String password;
private final XADataSource xads;
// private XAConnection xaConnection;
--- 43,49 ----
public Connection getConnection() throws SQLException, IOException {
! return xads.getXAConnection().getConnection();
}
private final XADataSource xads;
// private XAConnection xaConnection;
|
