Author: aadamchik
Date: Mon Aug 7 18:51:03 2006
New Revision: 429536
URL: http://svn.apache.org/viewvc?rev=429536&view=rev
Log:
CAY-623 - removing firebird adapter from 2.0 branch
Removed:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/firebird/
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/unit/FirebirdStackAdapter.java
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/AdapterMapping.java
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java?rev=429536&r1=429535&r2=429536&view=diff
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java
Mon Aug 7 18:51:03 2006
@@ -37,7 +37,6 @@
import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.dba.db2.DB2Sniffer;
import org.apache.cayenne.dba.derby.DerbySniffer;
-import org.apache.cayenne.dba.firebird.FirebirdSniffer;
import org.apache.cayenne.dba.frontbase.FrontBaseSniffer;
import org.apache.cayenne.dba.hsqldb.HSQLDBSniffer;
import org.apache.cayenne.dba.ingres.IngresSniffer;
@@ -69,7 +68,7 @@
new MySQLSniffer(), new PostgresSniffer(), new OracleSniffer(),
new SQLServerSniffer(), new HSQLDBSniffer(), new DB2Sniffer(),
new SybaseSniffer(), new DerbySniffer(), new OpenBaseSniffer(),
- new FirebirdSniffer(), new FrontBaseSniffer(), new IngresSniffer()
+ new FrontBaseSniffer(), new IngresSniffer()
};
/**
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/AdapterMapping.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/AdapterMapping.java?rev=429536&r1=429535&r2=429536&view=diff
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/AdapterMapping.java
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/AdapterMapping.java
Mon Aug 7 18:51:03 2006
@@ -25,7 +25,6 @@
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.hsqldb.HSQLDBAdapter;
import org.apache.cayenne.dba.ingres.IngresAdapter;
@@ -72,8 +71,6 @@
.put("org.hsqldb.jdbcDriver", HSQLDBAdapter.class.getName());
jdbcDriverToAdapterMap.put("org.postgresql.Driver",
PostgresAdapter.class
.getName());
- jdbcDriverToAdapterMap.put("org.firebirdsql.jdbc.FBDriver",
FirebirdAdapter.class
- .getName());
jdbcDriverToAdapterMap.put("com.openbase.jdbc.ObDriver",
OpenBaseAdapter.class
.getName());
jdbcDriverToAdapterMap.put(
@@ -107,9 +104,6 @@
PostgresAdapter.class.getName(),
"jdbc:postgresql://localhost:5432/database");
adapterToJDBCURLMap.put(
- FirebirdAdapter.class.getName(),
- "jdbc:firebirdsql:localhost/port:/path/to/file.gdb");
- adapterToJDBCURLMap.put(
OpenBaseAdapter.class.getName(),
"jdbc:openbase://localhost/database");
adapterToJDBCURLMap
@@ -145,9 +139,6 @@
adapterToJDBCDriverMap.put(
PostgresAdapter.class.getName(),
"org.postgresql.Driver");
- adapterToJDBCDriverMap.put(
- FirebirdAdapter.class.getName(),
- "org.firebirdsql.jdbc.FBDriver");
adapterToJDBCDriverMap.put(
OpenBaseAdapter.class.getName(),
"com.openbase.jdbc.ObDriver");
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java?rev=429536&r1=429535&r2=429536&view=diff
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/util/DbAdapterInfo.java
Mon Aug 7 18:51:03 2006
@@ -31,7 +31,6 @@
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.hsqldb.HSQLDBAdapter;
import org.apache.cayenne.dba.ingres.IngresAdapter;
@@ -54,8 +53,7 @@
PostgresAdapter.class.getName(), HSQLDBAdapter.class.getName(),
DB2Adapter.class.getName(), SQLServerAdapter.class.getName(),
FrontBaseAdapter.class.getName(), OpenBaseAdapter.class.getName(),
- DerbyAdapter.class.getName(), FirebirdAdapter.class.getName(),
- IngresAdapter.class.getName()
+ DerbyAdapter.class.getName(), IngresAdapter.class.getName()
};
private static final Map IMMUTABLE_LABELS = Collections
@@ -76,7 +74,6 @@
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");
- DEFAULT_ADAPTER_LABELS.put(FirebirdAdapter.class.getName(), "FireBird
Adapter");
}
public static Map getStandardAdapterLabels() {
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml?rev=429536&r1=429535&r2=429536&view=diff
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml
Mon Aug 7 18:51:03 2006
@@ -8,7 +8,6 @@
<bean id="OracleAdapter"
class="org.apache.cayenne.dba.oracle.OracleAdapter"/>
<bean id="Oracle8Adapter"
class="org.apache.cayenne.dba.oracle.Oracle8Adapter"/>
<bean id="SybaseAdapter"
class="org.apache.cayenne.dba.sybase.SybaseAdapter"/>
- <bean id="FirebirdAdapter"
class="org.apache.cayenne.dba.firebird.FirebirdAdapter"/>
<bean id="MySQLAdapter"
class="org.apache.cayenne.dba.mysql.MySQLAdapter"/>
<bean id="PostgresAdapter"
class="org.apache.cayenne.dba.postgres.PostgresAdapter"/>
<bean id="OpenBaseAdapter"
class="org.apache.cayenne.dba.openbase.OpenBaseAdapter"/>
@@ -31,9 +30,6 @@
<bean id="SybaseStackAdapter"
class="org.apache.cayenne.unit.SybaseStackAdapter">
<constructor-arg><ref bean="SybaseAdapter"/></constructor-arg>
</bean>
- <bean id="FirebirdStackAdapter"
class="org.apache.cayenne.unit.FirebirdStackAdapter">
- <constructor-arg><ref bean="FirebirdAdapter"/></constructor-arg>
- </bean>
<bean id="MySQLStackAdapter"
class="org.apache.cayenne.unit.MySQLStackAdapter">
<constructor-arg><ref bean="MySQLAdapter"/></constructor-arg>
</bean>
@@ -173,7 +169,6 @@
<entry
key="org.apache.cayenne.dba.oracle.OracleAdapter"><ref
bean="OracleStackAdapter"/></entry>
<entry
key="org.apache.cayenne.dba.oracle.Oracle8Adapter"><ref
bean="Oracle8StackAdapter"/></entry>
<entry
key="org.apache.cayenne.dba.sybase.SybaseAdapter"><ref
bean="SybaseStackAdapter"/></entry>
- <entry
key="org.apache.cayenne.dba.firebird.FirebirdAdapter"><ref
bean="FirebirdStackAdapter"/></entry>
<entry
key="org.apache.cayenne.dba.mysql.MySQLAdapter"><ref
bean="MySQLStackAdapter"/></entry>
<entry
key="org.apache.cayenne.dba.postgres.PostgresAdapter"><ref
bean="PostgresStackAdapter"/></entry>
<entry
key="org.apache.cayenne.dba.openbase.OpenBaseAdapter"><ref
bean="OpenBaseStackAdapter"/></entry>
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt?rev=429536&r1=429535&r2=429536&view=diff
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt
Mon Aug 7 18:51:03 2006
@@ -16,4 +16,7 @@
Bug Fixes:
CAY-601 Problem resolving relationships in nested DataContext
- CAY-603 QueryChain.isFetchingDataRows() incorrectly returns "false" -
must be "true" all the time
\ No newline at end of file
+ CAY-603 QueryChain.isFetchingDataRows() incorrectly returns "false" -
must be "true" all the time
+
+Changes:
+ CAY-623 Removing broken FireBird adapter
\ No newline at end of file
