User: d_jencks
Date: 01/08/16 22:37:35
Modified: src/main/org/jboss/pool/connector/jdbc
XAManagedConnectionFactory.java
Log:
preliminary fix of logging: more logging cleanup soon
Revision Changes Path
1.3 +23 -22
jbosspool/src/main/org/jboss/pool/connector/jdbc/XAManagedConnectionFactory.java
Index: XAManagedConnectionFactory.java
===================================================================
RCS file:
/cvsroot/jboss/jbosspool/src/main/org/jboss/pool/connector/jdbc/XAManagedConnectionFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XAManagedConnectionFactory.java 2001/08/16 03:05:45 1.2
+++ XAManagedConnectionFactory.java 2001/08/17 05:37:35 1.3
@@ -20,6 +20,8 @@
import javax.sql.XADataSource;
import java.sql.Connection; //for transaction isolation constants
+import org.jboss.logging.log4j.JBossCategory;
+
/**
* ManagedConnectionFactory implementation for XADataSource connections. You
* give it an XADataSource, user, and password and it generated connections.
@@ -44,10 +46,15 @@
* </pre>
*
* @author Aaron Mulder <[EMAIL PROTECTED]>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class XAManagedConnectionFactory implements ManagedConnectionFactory {
- private transient PrintWriter logger;
+
+ private JBossCategory log =
(JBossCategory)JBossCategory.getInstance(XAManagedConnectionFactory.class);
+
+
+
+ //private transient PrintWriter logger; fuggeddaboudit
private transient XADataSource xads;
private String username;
private String password;
@@ -61,11 +68,12 @@
}
public Object createConnectionFactory(ConnectionManager mgr) throws
javax.resource.ResourceException {
DataSource ds = new JDBCDataSource(mgr, this);
- if(logger != null) {
+ //ds.setCategory(log);
+ /*if(logger != null) {
try {
ds.setLogWriter(logger);
} catch(SQLException e) {}
- }
+ }*/
return ds;
}
public Object createConnectionFactory() throws javax.resource.ResourceException
{
@@ -98,7 +106,8 @@
try {
XAConnection con = getXADS().getXAConnection(user, pw);
ManagedConnection mc = new XAManagedConnection(xads, con, user,
transactionIsolation);
- mc.setLogWriter(logger);
+ //mc.setCategory();???
+ //mc.setLogWriter(logger);
return mc;
} catch(SQLException e) {
throw new ResourceException("Unable to create DB XAConnection: "+e);
@@ -145,10 +154,10 @@
}
public void setLogWriter(PrintWriter writer) throws
javax.resource.ResourceException {
- logger = writer;
+ //logger = writer;
}
public PrintWriter getLogWriter() throws javax.resource.ResourceException {
- return logger;
+ return null;//logger;
}
private XADataSource getXADS() {
@@ -156,10 +165,10 @@
return xads;
if(xaDataSourceClass != null) {
try {
- logger.println("xaDatasourceClass: " + xaDataSourceClass);
+ log.trace("XADatasourceClass: " + xaDataSourceClass);
Class cls = Class.forName(xaDataSourceClass);
xads = (XADataSource)cls.newInstance();
- logger.println("got ds instance");
+ log.trace("got DataSource instance");
Properties props = parseProperties();
Iterator it = props.keySet().iterator();
@@ -172,18 +181,13 @@
new Class[]{String.class});
meth.invoke(xads, new Object[]{value});
} catch(Exception e) {
- if(logger != null) {
- logger.println("Unable to set XADataSource property
"+name+"="+value+":");
- }
+ log.warn("Unable to set XADataSource property
"+name+"="+value+":");
}
}
return xads;
} catch(Exception e) {
xads = null;
- if(logger != null) {
- logger.println("Unable to create and initialize XADataSource:");
- e.printStackTrace(logger);
- }
+ log.warn("Unable to create and initialize XADataSource:", e);
}
} else if(xaDataSourceName != null) {
try {
@@ -192,10 +196,7 @@
return xads;
} catch(Exception e) {
xads = null;
- if(logger != null) {
- logger.println("Unable to reach XADataSource in JNDI:");
- e.printStackTrace(logger);
- }
+ log.warn("Unable to reach XADataSource in JNDI:", e);
}
}
return null;
@@ -215,7 +216,7 @@
public String getXADataSourceJNDIName() {return xaDataSourceName;}
public void setTransactionIsolation(String transactionIsolation) {
- System.out.println("TransactionIsolation set:" + transactionIsolation);
+ log.trace("TransactionIsolation set:" + transactionIsolation);
if (transactionIsolation.equals("TRANSACTION_NONE"))
{
this.transactionIsolation = Connection.TRANSACTION_NONE;
@@ -267,7 +268,7 @@
private Properties parseProperties() {
Properties props = new Properties();
- logger.println("parsing props: " + xaDataSourceProperties);
+ log.trace("parsing props: " + xaDataSourceProperties);
StringTokenizer tokens = new StringTokenizer(xaDataSourceProperties, ";=");
while (tokens.hasMoreTokens()) {
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
