diff --git a/derby/org.eclipse.gemini.dbaccess.derby/.project b/derby/org.eclipse.gemini.dbaccess.derby/.project
index 79b99dd..caeb204 100644
--- a/derby/org.eclipse.gemini.dbaccess.derby/.project
+++ b/derby/org.eclipse.gemini.dbaccess.derby/.project
@@ -29,7 +29,7 @@
<link>
<name>common</name>
<type>2</type>
- <location>C:/Documents and Settings/mkeith.ST-MDC/Desktop/Gemini/Source/DBAccess/trunk/common</location>
+ <locationURI>DBACCESS_COMMON</locationURI>
</link>
</linkedResources>
</projectDescription>
diff --git a/derby/org.eclipse.gemini.dbaccess.derby/META-INF/MANIFEST.MF b/derby/org.eclipse.gemini.dbaccess.derby/META-INF/MANIFEST.MF
index 403c54e..9f29f4e 100644
--- a/derby/org.eclipse.gemini.dbaccess.derby/META-INF/MANIFEST.MF
+++ b/derby/org.eclipse.gemini.dbaccess.derby/META-INF/MANIFEST.MF
@@ -13,5 +13,3 @@
org.osgi.service.jdbc;version="[1.0,2.0)"
Export-Package: org.eclipse.gemini.dbaccess.derby.service,
org.osgi.service.jdbc
-
-
diff --git a/derby/org.eclipse.gemini.dbaccess.derby/src/org/eclipse/gemini/dbaccess/derby/ClientDataSourceFactory.java b/derby/org.eclipse.gemini.dbaccess.derby/src/org/eclipse/gemini/dbaccess/derby/ClientDataSourceFactory.java
index 8806e4b..694156c 100644
--- a/derby/org.eclipse.gemini.dbaccess.derby/src/org/eclipse/gemini/dbaccess/derby/ClientDataSourceFactory.java
+++ b/derby/org.eclipse.gemini.dbaccess.derby/src/org/eclipse/gemini/dbaccess/derby/ClientDataSourceFactory.java
@@ -67,16 +67,19 @@
this.jdbc4 = jdbc4;
}
+ @Override
public Driver newJdbcDriver() throws SQLException {
return new ClientDriver();
}
+ @Override
public DataSource newDataSource() throws SQLException {
return jdbc4
? new ClientDataSource40()
: new ClientDataSource();
}
+ @Override
public ConnectionPoolDataSource newConnectionPoolDataSource()
throws SQLException {
return jdbc4
@@ -84,6 +87,7 @@
: new ClientConnectionPoolDataSource();
}
+ @Override
public XADataSource newXADataSource() throws SQLException {
return jdbc4
? new ClientXADataSource40()
diff --git a/derby/org.eclipse.gemini.dbaccess.derby/src/org/eclipse/gemini/dbaccess/derby/EmbeddedDataSourceFactory.java b/derby/org.eclipse.gemini.dbaccess.derby/src/org/eclipse/gemini/dbaccess/derby/EmbeddedDataSourceFactory.java
index 0b96294..da33298 100644
--- a/derby/org.eclipse.gemini.dbaccess.derby/src/org/eclipse/gemini/dbaccess/derby/EmbeddedDataSourceFactory.java
+++ b/derby/org.eclipse.gemini.dbaccess.derby/src/org/eclipse/gemini/dbaccess/derby/EmbeddedDataSourceFactory.java
@@ -16,8 +16,6 @@
package org.eclipse.gemini.dbaccess.derby;
-import java.util.Properties;
-
import java.sql.Driver;
import java.sql.SQLException;
@@ -33,8 +31,6 @@
import org.apache.derby.jdbc.EmbeddedXADataSource;
import org.apache.derby.jdbc.EmbeddedXADataSource40;
-import org.osgi.service.jdbc.DataSourceFactory;
-
import org.eclipse.gemini.dbaccess.AbstractDataSourceFactory;
/**
@@ -68,16 +64,19 @@
this.jdbc4 = jdbc4;
}
+ @Override
public Driver newJdbcDriver() throws SQLException {
return new EmbeddedDriver();
}
+ @Override
public DataSource newDataSource() throws SQLException {
return jdbc4
? new EmbeddedDataSource40()
: new EmbeddedDataSource();
}
+ @Override
public ConnectionPoolDataSource newConnectionPoolDataSource()
throws SQLException {
return jdbc4
@@ -85,6 +84,7 @@
: new EmbeddedConnectionPoolDataSource();
}
+ @Override
public XADataSource newXADataSource() throws SQLException {
return jdbc4
? new EmbeddedXADataSource40()
