You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/06/16 20:17:29 UTC
svn commit: r1493563 - in
/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util:
AdapterMapping.java DbAdapterInfo.java
Author: aadamchik
Date: Sun Jun 16 18:17:29 2013
New Revision: 1493563
URL: http://svn.apache.org/r1493563
Log:
CAY-1836 Firebird Adapter
modeler integration
Modified:
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/AdapterMapping.java
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/AdapterMapping.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/AdapterMapping.java?rev=1493563&r1=1493562&r2=1493563&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/AdapterMapping.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/AdapterMapping.java Sun Jun 16 18:17:29 2013
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.cayenne.dba.db2.DB2Adapter;
import org.apache.cayenne.dba.derby.DerbyAdapter;
+import org.apache.cayenne.dba.firebird.FirebirdAdapter;
import org.apache.cayenne.dba.frontbase.FrontBaseAdapter;
import org.apache.cayenne.dba.h2.H2Adapter;
import org.apache.cayenne.dba.hsqldb.HSQLDBAdapter;
@@ -37,7 +38,8 @@ import org.apache.cayenne.dba.sqlserver.
import org.apache.cayenne.dba.sybase.SybaseAdapter;
/**
- * Contains mappings for guessing defaults for various adapter and JDBC settings.
+ * Contains mappings for guessing defaults for various adapter and JDBC
+ * settings.
*
*/
public class AdapterMapping {
@@ -60,130 +62,67 @@ public class AdapterMapping {
// TODO: make configuration external...
// drivers
- jdbcDriverToAdapterMap.put("oracle.jdbc.driver.OracleDriver", OracleAdapter.class
- .getName());
- jdbcDriverToAdapterMap.put("com.sybase.jdbc2.jdbc.SybDriver", SybaseAdapter.class
- .getName());
+ jdbcDriverToAdapterMap.put("oracle.jdbc.driver.OracleDriver", OracleAdapter.class.getName());
+ jdbcDriverToAdapterMap.put("com.sybase.jdbc2.jdbc.SybDriver", SybaseAdapter.class.getName());
jdbcDriverToAdapterMap.put("com.mysql.jdbc.Driver", MySQLAdapter.class.getName());
- jdbcDriverToAdapterMap.put("com.ibm.db2.jcc.DB2Driver", DB2Adapter.class
- .getName());
- jdbcDriverToAdapterMap
- .put("org.hsqldb.jdbcDriver", HSQLDBAdapter.class.getName());
+ jdbcDriverToAdapterMap.put("com.ibm.db2.jcc.DB2Driver", DB2Adapter.class.getName());
+ jdbcDriverToAdapterMap.put("org.hsqldb.jdbcDriver", HSQLDBAdapter.class.getName());
jdbcDriverToAdapterMap.put("org.h2.Driver", H2Adapter.class.getName());
- jdbcDriverToAdapterMap.put("org.postgresql.Driver", PostgresAdapter.class
- .getName());
- jdbcDriverToAdapterMap.put("com.openbase.jdbc.ObDriver", OpenBaseAdapter.class
- .getName());
- jdbcDriverToAdapterMap.put(
- "com.microsoft.sqlserver.jdbc.SQLServerDriver",
- SQLServerAdapter.class.getName());
- jdbcDriverToAdapterMap.put(
- "org.apache.derby.jdbc.EmbeddedDriver",
- DerbyAdapter.class.getName());
- jdbcDriverToAdapterMap.put("jdbc.FrontBase.FBJDriver", FrontBaseAdapter.class
- .getName());
- jdbcDriverToAdapterMap.put("com.ingres.jdbc.IngresDriver", IngresAdapter.class
- .getName());
+ jdbcDriverToAdapterMap.put("org.postgresql.Driver", PostgresAdapter.class.getName());
+ jdbcDriverToAdapterMap.put("com.openbase.jdbc.ObDriver", OpenBaseAdapter.class.getName());
+ jdbcDriverToAdapterMap.put("com.microsoft.sqlserver.jdbc.SQLServerDriver", SQLServerAdapter.class.getName());
+ jdbcDriverToAdapterMap.put("org.apache.derby.jdbc.EmbeddedDriver", DerbyAdapter.class.getName());
+ jdbcDriverToAdapterMap.put("jdbc.FrontBase.FBJDriver", FrontBaseAdapter.class.getName());
+ jdbcDriverToAdapterMap.put("com.ingres.jdbc.IngresDriver", IngresAdapter.class.getName());
jdbcDriverToAdapterMap.put("org.sqlite.JDBC", SQLiteAdapter.class.getName());
+ jdbcDriverToAdapterMap.put("org.firebirdsql.jdbc.FBDriver", FirebirdAdapter.class.getName());
// urls
- adapterToJDBCURLMap.put(
- OracleAdapter.class.getName(),
- "jdbc:oracle:thin:@//localhost:1521/database");
- adapterToJDBCURLMap.put(
- SybaseAdapter.class.getName(),
- "jdbc:sybase:Tds:localhost:port/database");
- adapterToJDBCURLMap.put(
- MySQLAdapter.class.getName(),
- "jdbc:mysql://localhost/database");
- adapterToJDBCURLMap.put(
- DB2Adapter.class.getName(),
- "jdbc:db2://localhost:port/database");
- adapterToJDBCURLMap.put(
- HSQLDBAdapter.class.getName(),
- "jdbc:hsqldb:hsql://localhost/database");
- adapterToJDBCURLMap.put(
- H2Adapter.class.getName(),
- "jdbc:h2:mem:database;MVCC=TRUE");
- adapterToJDBCURLMap.put(
- PostgresAdapter.class.getName(),
- "jdbc:postgresql://localhost:5432/database");
- adapterToJDBCURLMap.put(
- OpenBaseAdapter.class.getName(),
- "jdbc:openbase://localhost/database");
- adapterToJDBCURLMap
- .put(
- SQLServerAdapter.class.getName(),
- "jdbc:sqlserver://localhost:1433;databaseName=database;SelectMethod=cursor");
+ adapterToJDBCURLMap.put(OracleAdapter.class.getName(), "jdbc:oracle:thin:@//localhost:1521/database");
+ adapterToJDBCURLMap.put(SybaseAdapter.class.getName(), "jdbc:sybase:Tds:localhost:port/database");
+ adapterToJDBCURLMap.put(MySQLAdapter.class.getName(), "jdbc:mysql://localhost/database");
+ adapterToJDBCURLMap.put(DB2Adapter.class.getName(), "jdbc:db2://localhost:port/database");
+ adapterToJDBCURLMap.put(HSQLDBAdapter.class.getName(), "jdbc:hsqldb:hsql://localhost/database");
+ adapterToJDBCURLMap.put(H2Adapter.class.getName(), "jdbc:h2:mem:database;MVCC=TRUE");
+ adapterToJDBCURLMap.put(PostgresAdapter.class.getName(), "jdbc:postgresql://localhost:5432/database");
+ adapterToJDBCURLMap.put(OpenBaseAdapter.class.getName(), "jdbc:openbase://localhost/database");
+ adapterToJDBCURLMap.put(SQLServerAdapter.class.getName(),
+ "jdbc:sqlserver://localhost:1433;databaseName=database;SelectMethod=cursor");
adapterToJDBCURLMap.put(SQLiteAdapter.class.getName(), "jdbc:sqlite:testdb");
+ adapterToJDBCURLMap.put(FirebirdAdapter.class.getName(), "jdbc:firebirdsql:localhost/3050:database.fdb");
- // TODO: embedded Derby Mode... change to client-server once we figure it out
- adapterToJDBCURLMap.put(
- DerbyAdapter.class.getName(),
- "jdbc:derby:testdb;create=true");
-
- adapterToJDBCURLMap.put(
- FrontBaseAdapter.class.getName(),
- "jdbc:FrontBase://localhost/database");
- adapterToJDBCURLMap.put(
- IngresAdapter.class.getName(),
- "jdbc:ingres://127.0.0.1:II7/database");
+ // TODO: embedded Derby Mode... change to client-server once we figure
+ // it out
+ adapterToJDBCURLMap.put(DerbyAdapter.class.getName(), "jdbc:derby:testdb;create=true");
+
+ adapterToJDBCURLMap.put(FrontBaseAdapter.class.getName(), "jdbc:FrontBase://localhost/database");
+ adapterToJDBCURLMap.put(IngresAdapter.class.getName(), "jdbc:ingres://127.0.0.1:II7/database");
// adapters
- adapterToJDBCDriverMap.put(
- OracleAdapter.class.getName(),
- "oracle.jdbc.driver.OracleDriver");
- adapterToJDBCDriverMap.put(
- SybaseAdapter.class.getName(),
- "com.sybase.jdbc2.jdbc.SybDriver");
+ adapterToJDBCDriverMap.put(OracleAdapter.class.getName(), "oracle.jdbc.driver.OracleDriver");
+ adapterToJDBCDriverMap.put(SybaseAdapter.class.getName(), "com.sybase.jdbc2.jdbc.SybDriver");
adapterToJDBCDriverMap.put(MySQLAdapter.class.getName(), "com.mysql.jdbc.Driver");
- adapterToJDBCDriverMap.put(
- DB2Adapter.class.getName(),
- "com.ibm.db2.jcc.DB2Driver");
- adapterToJDBCDriverMap
- .put(HSQLDBAdapter.class.getName(), "org.hsqldb.jdbcDriver");
+ adapterToJDBCDriverMap.put(DB2Adapter.class.getName(), "com.ibm.db2.jcc.DB2Driver");
+ adapterToJDBCDriverMap.put(HSQLDBAdapter.class.getName(), "org.hsqldb.jdbcDriver");
adapterToJDBCDriverMap.put(H2Adapter.class.getName(), "org.h2.Driver");
- adapterToJDBCDriverMap.put(
- PostgresAdapter.class.getName(),
- "org.postgresql.Driver");
- adapterToJDBCDriverMap.put(
- OpenBaseAdapter.class.getName(),
- "com.openbase.jdbc.ObDriver");
- adapterToJDBCDriverMap.put(
- SQLServerAdapter.class.getName(),
- "com.microsoft.sqlserver.jdbc.SQLServerDriver");
- adapterToJDBCDriverMap.put(
- DerbyAdapter.class.getName(),
- "org.apache.derby.jdbc.EmbeddedDriver");
-
- adapterToJDBCDriverMap.put(
- FrontBaseAdapter.class.getName(),
- "jdbc.FrontBase.FBJDriver");
-
- adapterToJDBCDriverMap.put(
- IngresAdapter.class.getName(),
- "com.ingres.jdbc.IngresDriver");
+ adapterToJDBCDriverMap.put(PostgresAdapter.class.getName(), "org.postgresql.Driver");
+ adapterToJDBCDriverMap.put(OpenBaseAdapter.class.getName(), "com.openbase.jdbc.ObDriver");
+ adapterToJDBCDriverMap.put(SQLServerAdapter.class.getName(), "com.microsoft.sqlserver.jdbc.SQLServerDriver");
+ adapterToJDBCDriverMap.put(DerbyAdapter.class.getName(), "org.apache.derby.jdbc.EmbeddedDriver");
+
+ adapterToJDBCDriverMap.put(FrontBaseAdapter.class.getName(), "jdbc.FrontBase.FBJDriver");
+
+ adapterToJDBCDriverMap.put(IngresAdapter.class.getName(), "com.ingres.jdbc.IngresDriver");
adapterToJDBCDriverMap.put(SQLiteAdapter.class.getName(), "org.sqlite.JDBC");
+ adapterToJDBCDriverMap.put(FirebirdAdapter.class.getName(), "org.firebirdsql.jdbc.FBDriver");
// EOF plugins...
- eofPluginToAdapterMap.put(
- "com.webobjects.jdbcadaptor.SybasePlugIn",
- SybaseAdapter.class.getName());
- eofPluginToAdapterMap.put(
- "com.webobjects.jdbcadaptor.MerantPlugIn",
- SQLServerAdapter.class.getName());
- eofPluginToAdapterMap.put(
- "com.webobjects.jdbcadaptor.MicrosoftPlugIn",
- SQLServerAdapter.class.getName());
- eofPluginToAdapterMap.put(
- "com.webobjects.jdbcadaptor.MySQLPlugIn",
- MySQLAdapter.class.getName());
- eofPluginToAdapterMap.put(
- "com.webobjects.jdbcadaptor.OraclePlugIn",
- OracleAdapter.class.getName());
- eofPluginToAdapterMap.put(
- "com.webobjects.jdbcadaptor.FrontbasePlugIn",
- FrontBaseAdapter.class.getName());
+ eofPluginToAdapterMap.put("com.webobjects.jdbcadaptor.SybasePlugIn", SybaseAdapter.class.getName());
+ eofPluginToAdapterMap.put("com.webobjects.jdbcadaptor.MerantPlugIn", SQLServerAdapter.class.getName());
+ eofPluginToAdapterMap.put("com.webobjects.jdbcadaptor.MicrosoftPlugIn", SQLServerAdapter.class.getName());
+ eofPluginToAdapterMap.put("com.webobjects.jdbcadaptor.MySQLPlugIn", MySQLAdapter.class.getName());
+ eofPluginToAdapterMap.put("com.webobjects.jdbcadaptor.OraclePlugIn", OracleAdapter.class.getName());
+ eofPluginToAdapterMap.put("com.webobjects.jdbcadaptor.FrontbasePlugIn", FrontBaseAdapter.class.getName());
eofPluginToAdapterMap.put("PostgresqlPlugIn", PostgresAdapter.class.getName());
}
Modified: cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java?rev=1493563&r1=1493562&r2=1493563&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java Sun Jun 16 18:17:29 2013
@@ -31,6 +31,7 @@ import javax.swing.ListCellRenderer;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.db2.DB2Adapter;
import org.apache.cayenne.dba.derby.DerbyAdapter;
+import org.apache.cayenne.dba.firebird.FirebirdAdapter;
import org.apache.cayenne.dba.frontbase.FrontBaseAdapter;
import org.apache.cayenne.dba.h2.H2Adapter;
import org.apache.cayenne.dba.hsqldb.HSQLDBAdapter;
@@ -43,23 +44,17 @@ import org.apache.cayenne.dba.sqlite.SQL
import org.apache.cayenne.dba.sqlserver.SQLServerAdapter;
import org.apache.cayenne.dba.sybase.SybaseAdapter;
-/**
- */
public final class DbAdapterInfo {
private static final Map<String, String> DEFAULT_ADAPTER_LABELS = new TreeMap<String, String>();
- private static final String[] standardAdapters = new String[] {
- JdbcAdapter.class.getName(), MySQLAdapter.class.getName(),
- OracleAdapter.class.getName(), SybaseAdapter.class.getName(),
- PostgresAdapter.class.getName(), H2Adapter.class.getName(),
- HSQLDBAdapter.class.getName(), DB2Adapter.class.getName(),
- SQLServerAdapter.class.getName(), FrontBaseAdapter.class.getName(),
- OpenBaseAdapter.class.getName(), DerbyAdapter.class.getName(),
- IngresAdapter.class.getName(), SQLiteAdapter.class.getName()
- };
+ private static final String[] standardAdapters = new String[] { JdbcAdapter.class.getName(),
+ MySQLAdapter.class.getName(), OracleAdapter.class.getName(), SybaseAdapter.class.getName(),
+ PostgresAdapter.class.getName(), H2Adapter.class.getName(), HSQLDBAdapter.class.getName(),
+ DB2Adapter.class.getName(), SQLServerAdapter.class.getName(), FrontBaseAdapter.class.getName(),
+ FirebirdAdapter.class.getName(), OpenBaseAdapter.class.getName(), DerbyAdapter.class.getName(),
+ IngresAdapter.class.getName(), SQLiteAdapter.class.getName() };
- private static final Map<String, String> IMMUTABLE_LABELS = Collections
- .unmodifiableMap(DEFAULT_ADAPTER_LABELS);
+ private static final Map<String, String> IMMUTABLE_LABELS = Collections.unmodifiableMap(DEFAULT_ADAPTER_LABELS);
static {
DEFAULT_ADAPTER_LABELS.put(JdbcAdapter.class.getName(), "Generic JDBC Adapter");
@@ -70,10 +65,9 @@ public final class DbAdapterInfo {
DEFAULT_ADAPTER_LABELS.put(HSQLDBAdapter.class.getName(), "HypersonicDB Adapter");
DEFAULT_ADAPTER_LABELS.put(H2Adapter.class.getName(), " H2 Database Adapter");
DEFAULT_ADAPTER_LABELS.put(DB2Adapter.class.getName(), "DB2 Adapter");
- DEFAULT_ADAPTER_LABELS.put(
- SQLServerAdapter.class.getName(),
- "MS SQLServer Adapter");
+ DEFAULT_ADAPTER_LABELS.put(SQLServerAdapter.class.getName(), "MS SQLServer Adapter");
DEFAULT_ADAPTER_LABELS.put(FrontBaseAdapter.class.getName(), "FrontBase Adapter");
+ DEFAULT_ADAPTER_LABELS.put(FirebirdAdapter.class.getName(), "Firebird Adapter");
DEFAULT_ADAPTER_LABELS.put(OpenBaseAdapter.class.getName(), "OpenBase Adapter");
DEFAULT_ADAPTER_LABELS.put(DerbyAdapter.class.getName(), "Derby Adapter");
DEFAULT_ADAPTER_LABELS.put(IngresAdapter.class.getName(), "Ingres Adapter");
@@ -97,17 +91,10 @@ public final class DbAdapterInfo {
Map adapterLabels;
DbAdapterListRenderer(Map adapterLabels) {
- this.adapterLabels = (adapterLabels != null)
- ? adapterLabels
- : Collections.EMPTY_MAP;
+ this.adapterLabels = (adapterLabels != null) ? adapterLabels : Collections.EMPTY_MAP;
}
- public Component getListCellRendererComponent(
- JList list,
- Object object,
- int index,
- boolean arg3,
- boolean arg4) {
+ public Component getListCellRendererComponent(JList list, Object object, int index, boolean arg3, boolean arg4) {
if (object instanceof Class) {
object = ((Class<?>) object).getName();