[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/jndi JndiConnection.java,1.3,1.4 JdbcJndiDriver.java,1.2,1.3

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/jndi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12162/src/net/sourceforge/idrs/jndi

Modified Files:
	JndiConnection.java JdbcJndiDriver.java 
Log Message:
Added log4j support.  cleaned up the logs

Index: JndiConnection.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/jndi/JndiConnection.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JndiConnection.java	29 Aug 2004 05:01:41 -0000	1.3
--- JndiConnection.java	30 Aug 2004 00:56:08 -0000	1.4
***************
*** 25,28 ****
--- 25,30 ----
  import javax.servlet.http.*;
  
+ import org.apache.log4j.Logger;
+ 
  /**
   * Wraps a Jndi Connection to an EJB server
***************
*** 34,37 ****
--- 36,40 ----
  	
  
+ 	static Logger logger = Logger.getLogger(JndiConnection.class.getName());
  	
  	HashMap homes;
***************
*** 78,83 ****
          }
          catch (NamingException e) {
!         	e.printStackTrace();
!         	e.printStackTrace(System.out);
           throw new SQLNamingException(e);
          }
--- 81,85 ----
          }
          catch (NamingException e) {
! 	        	logger.error("Error creating context",e);
           throw new SQLNamingException(e);
          }

Index: JdbcJndiDriver.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/jndi/JdbcJndiDriver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JdbcJndiDriver.java	29 Aug 2004 05:01:41 -0000	1.2
--- JdbcJndiDriver.java	30 Aug 2004 00:56:09 -0000	1.3
***************
*** 18,21 ****
--- 18,23 ----
  import javax.naming.*;
  
+ import org.apache.log4j.Logger;
+ 
  /**
   * Establishes a JNDI connection to an EJB Server.  URLs are in the form :<br>
***************
*** 24,27 ****
--- 26,30 ----
   */
  public class JdbcJndiDriver implements java.sql.Driver {
+ 	static Logger logger = Logger.getLogger(JdbcJndiDriver.class.getName());
  	/** Identifies the URL prefix */
  	public static final String URL_ID = "jdbc:ejb:";
***************
*** 40,49 ****
  		try {
  
! 			System.out.println("in static");
  			DriverManager.registerDriver(
  				new net.sourceforge.idrs.jndi.JdbcJndiDriver());
  		} catch (SQLException e) {
  
! 			e.printStackTrace(System.out);
  		}
  
--- 43,52 ----
  		try {
  
! 			
  			DriverManager.registerDriver(
  				new net.sourceforge.idrs.jndi.JdbcJndiDriver());
  		} catch (SQLException e) {
  
! 			logger.error("Could not register driver",e);
  		}
  
***************
*** 68,72 ****
  		java.util.Properties properties)
  		throws java.sql.SQLException {
! 		System.out.println("in connection");
  		String props;
  		StringTokenizer toker;
--- 71,75 ----
  		java.util.Properties properties)
  		throws java.sql.SQLException {
! 
  		String props;
  		StringTokenizer toker;
***************
*** 110,114 ****
  		}
  
! 		System.out.println("loading props");
  		String user = properties.getProperty("user");
  		if (user != null) {
--- 113,117 ----
  		}
  
! 		if (logger.isDebugEnabled()) logger.debug("loading props");
  		String user = properties.getProperty("user");
  		if (user != null) {
***************
*** 124,128 ****
  
  
! 		System.out.println("loaded props");
  		Connection con = new JndiConnection(str.substring(beginUrl + 1), properties);
  
--- 127,131 ----
  
  
! 		if (logger.isDebugEnabled()) logger.debug("loaded props");
  		Connection con = new JndiConnection(str.substring(beginUrl + 1), properties);