You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by sv...@apache.org on 2005/05/23 05:48:06 UTC
cvs commit: ws-juddi/src/java/org/apache/juddi/datastore/jdbc JDBCDataStore.java
sviens 2005/05/22 20:48:06
Modified: src/java/org/apache/juddi/datastore/jdbc JDBCDataStore.java
Log:
Removed use of non-J2EE JDBC Connection Pooling (eliminated dependency on Jakarta Commons DBCP).
Revision Changes Path
1.15 +22 -4 ws-juddi/src/java/org/apache/juddi/datastore/jdbc/JDBCDataStore.java
Index: JDBCDataStore.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/JDBCDataStore.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JDBCDataStore.java 23 May 2005 03:19:40 -0000 1.14
+++ JDBCDataStore.java 23 May 2005 03:48:06 -0000 1.15
@@ -19,6 +19,10 @@
import java.sql.SQLException;
import java.util.Vector;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.datastore.DataStore;
@@ -54,8 +58,8 @@
import org.apache.juddi.datatype.tmodel.TModel;
import org.apache.juddi.error.RegistryException;
import org.apache.juddi.error.UnknownUserException;
+import org.apache.juddi.registry.RegistryEngine;
import org.apache.juddi.util.Config;
-import org.apache.juddi.util.jdbc.ConnectionManager;
import org.apache.juddi.util.jdbc.Transaction;
import org.apache.juddi.uuidgen.UUIDGen;
import org.apache.juddi.uuidgen.UUIDGenFactory;
@@ -81,13 +85,26 @@
*/
public JDBCDataStore()
{
- try {
- this.connection = ConnectionManager.aquireConnection();
+ try
+ {
+ String dataSourceName =
+ Config.getStringProperty(RegistryEngine.PROPNAME_DATASOURCE_NAME,
+ RegistryEngine.DEFAULT_DATASOURCE_NAME);
+
+ InitialContext initCtx = new InitialContext();
+ DataSource dataSource = (DataSource)initCtx.lookup(dataSourceName);
+
+ if (dataSource != null)
+ this.connection = dataSource.getConnection();
}
catch(SQLException sqlex) {
log.error("Exception occured while attempting to " +
"aquire a JDBC connection: "+sqlex.getMessage());
}
+ catch (NamingException nex) {
+ log.error("Exception occurred while attempting to acquire " +
+ "a JDBC DataSource from JNDI: "+nex.getMessage());
+ }
}
/**
@@ -96,7 +113,8 @@
*/
public void release()
{
- try {
+ try
+ {
if (connection != null)
{
this.connection.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org