You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by pr...@apache.org on 2002/11/30 21:28:32 UTC
cvs commit: jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database DatabaseMetaDataImpl.java DbMetaDataService.java PeriodicityDbMetaService.java
prickett 2002/11/30 12:28:32
Modified: periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database
DatabaseMetaDataImpl.java DbMetaDataService.java
PeriodicityDbMetaService.java
Log:
Overrode clone to be public in DatabaseMetaDataImpl
Changed getMetaData methods in DbMetaDataService to throw Exception
Implemented getMetaData methods in PeriodicityDbMetaService
Revision Changes Path
1.7 +9 -3 jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/DatabaseMetaDataImpl.java
Index: DatabaseMetaDataImpl.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/DatabaseMetaDataImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DatabaseMetaDataImpl.java 30 Nov 2002 18:57:02 -0000 1.6
+++ DatabaseMetaDataImpl.java 30 Nov 2002 20:28:31 -0000 1.7
@@ -136,6 +136,12 @@
}
}
+
+ public Object clone() throws CloneNotSupportedException
+ {
+ return super.clone();
+ }
+
/**
* The purpose of this method is to return the name of the database
* that is represented by this meta data object.
1.2 +7 -6 jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/DbMetaDataService.java
Index: DbMetaDataService.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/DbMetaDataService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DbMetaDataService.java 30 Nov 2002 18:57:02 -0000 1.1
+++ DbMetaDataService.java 30 Nov 2002 20:28:31 -0000 1.2
@@ -83,7 +83,7 @@
* @return The database meta data object that corresponds to the database
*/
public DatabaseMetaData getMetaData(String databaseType, String driverName,
- String protocolName);
+ String protocolName) throws Exception;
/**
* The purpose of this method is to return the database meta data
@@ -95,7 +95,7 @@
* @return The database meta data object that corresponds to the database
*/
public DatabaseMetaData getMetaData(String databaseType,
- String driverName);
+ String driverName) throws Exception;
/**
* The purpose of this method is to return the database meta data
@@ -105,7 +105,8 @@
* for.
* @return The database meta data object that corresponds to the database
*/
- public DatabaseMetaData getMetaData(String databaseType);
+ public DatabaseMetaData getMetaData(String databaseType)
+ throws Exception;
/**
* The purpose of this method is to return all the databases in an Iterator
1.2 +36 -6 jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/PeriodicityDbMetaService.java
Index: PeriodicityDbMetaService.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/PeriodicityDbMetaService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PeriodicityDbMetaService.java 30 Nov 2002 18:57:02 -0000 1.1
+++ PeriodicityDbMetaService.java 30 Nov 2002 20:28:31 -0000 1.2
@@ -80,7 +80,8 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.periodicity.util.JUnitUtils;
-public class PeriodicityDbMetaService extends BaseService
+public class PeriodicityDbMetaService extends BaseService
+ implements DbMetaDataService
{
public static final String SERVICE_NAME = "PeriodicityDriverService";
@@ -279,17 +280,46 @@
}
}
- public DatabaseMetaData getMetaData(String databaseName)
+ public DatabaseMetaData getMetaData(String databaseType)
+ throws Exception
{
if(databases != null)
{
- return (DatabaseMetaData) databases.get(databaseName);
+ DatabaseMetaDataImpl returnValue =
+ (DatabaseMetaDataImpl) databases.get(databaseType);
+ if(returnValue != null)
+ {
+ return (DatabaseMetaData) returnValue.clone();
+ }
+ else
+ {
+ return null;
+ }
}
else
{
return null;
}
}
+
+ public DatabaseMetaData getMetaData(String databaseType,
+ String driverName, String protocolName) throws Exception
+ {
+ DatabaseMetaDataImpl returnValue =
+ (DatabaseMetaDataImpl) getMetaData(databaseType);
+ if(returnValue != null)
+ {
+ returnValue.setDriver(driverName);
+ returnValue.setProtocol(protocolName);
+ }
+ return returnValue;
+ }
+
+ public DatabaseMetaData getMetaData(String databaseType, String driverName)
+ throws Exception
+ {
+ return getMetaData(databaseType, driverName, null);
+ }
public Iterator getDatabases()
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>