User: tobyallsopp
Date: 01/04/18 23:58:08
Modified: src/main/org/jboss/jdbc JDBCDataSourceLoader.java
JDBCDataSourceLoaderMBean.java
Log:
Merged fix for JDBCDataSourceLoader.
Revision Changes Path
1.9 +18 -6 jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java
Index: JDBCDataSourceLoader.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JDBCDataSourceLoader.java 2001/01/31 21:48:29 1.8
+++ JDBCDataSourceLoader.java 2001/04/19 06:58:08 1.9
@@ -25,19 +25,30 @@
/**
* Service that loads a JDBC 1 connection pool. The constructors are called by
* the JMX engine based on your MLET tags.
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
* @author Aaron Mulder ([EMAIL PROTECTED])
*/
public class JDBCDataSourceLoader extends ServiceMBeanSupport implements
JDBCDataSourceLoaderMBean {
private JDBCPoolDataSource source;
public JDBCDataSourceLoader() {
+ source = new JDBCPoolDataSource();
}
public JDBCDataSourceLoader(String poolName) {
source = new JDBCPoolDataSource();
source.setPoolName(poolName);
}
+ public void setPoolName(String name)
+ {
+ source.setPoolName(name);
+ }
+
+ public String getPoolName()
+ {
+ return source.getPoolName();
+ }
+
public void setURL(String jdbcURL) {
source.setJDBCURL(jdbcURL);
}
@@ -52,7 +63,8 @@
}
public String getProperties() {
- return buildProperties(source.getJDBCProperties());
+ Properties props = source.getJDBCProperties();
+ return (props==null) ? null : buildProperties(props);
}
public void setJDBCUser(String userName) {
@@ -194,7 +206,7 @@
// Unbind from JNDI
try {
String name = source.getPoolName();
- new InitialContext().unbind(name);
+ new InitialContext().unbind("java:/"+name);
log.log("JDBC Connection pool "+name+" removed from JNDI");
source.close();
log.log("JDBC Connection pool "+name+" shut down");
@@ -209,9 +221,9 @@
source.initialize();
// Bind in JNDI
- bind(new InitialContext(), source.getPoolName(), source);
+ bind(new InitialContext(), "java:/" + source.getPoolName(), source);
- log.log("JDBC Connection pool "+source.getPoolName()+" bound to
"+source.getPoolName());
+ log.log("JDBC Connection pool "+source.getPoolName()+" bound to
java:/"+source.getPoolName());
// Test database
source.getConnection().close();
@@ -268,4 +280,4 @@
}
return buf.toString();
}
-}
\ No newline at end of file
+}
1.5 +2 -0 jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoaderMBean.java
Index: JDBCDataSourceLoaderMBean.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/jdbc/JDBCDataSourceLoaderMBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JDBCDataSourceLoaderMBean.java 2000/12/07 15:44:50 1.4
+++ JDBCDataSourceLoaderMBean.java 2001/04/19 06:58:08 1.5
@@ -13,6 +13,8 @@
public static final String OBJECT_NAME = ":service=JDBCDataSource";
// Public --------------------------------------------------------
+ public void setPoolName(String name);
+ public String getPoolName();
public void setURL(String url);
public String getURL();
public void setJDBCUser(String userName);
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
