Deprecated scala.dbc.

package than deprecating every individual thing. (There isn't, is
there?) Closes #4313, no review.

66 files changed, 89 insertions, 84 deletions

diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
index 06e3e54c53..3153323858 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -424,7 +424,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter)
    */
   def loop() {
     def readOneLine() = {
-      out.flush
+      out.flush()
       in readLine prompt
     }
     // return false if repl should exit
diff --git a/src/dbc/scala/dbc/DataType.scala b/src/dbc/scala/dbc/DataType.scala
index 6d888ad71a..3a485d317e 100644
--- a/src/dbc/scala/dbc/DataType.scala
+++ b/src/dbc/scala/dbc/DataType.scala
@@ -14,7 +14,7 @@ package scala.dbc;
 /** An ISO-9075:2003 (SQL) data type. Mappings between SQL types and
  *  database specific types should be provided by the database driver.
  */
-abstract class DataType {
+@deprecated(DbcIsDeprecated) abstract class DataType {
 
   /** Tests whether this datatype is equivalent to another. Usually, two
    *  types are defined as equivalent if they are equal. Two types can be
@@ -50,7 +50,7 @@ abstract class DataType {
 
 }
 
-object DataType {
+@deprecated(DbcIsDeprecated) object DataType {
 
   type Id = Int;
 
diff --git a/src/dbc/scala/dbc/Database.scala b/src/dbc/scala/dbc/Database.scala
index f584b47ac9..86774292ea 100644
--- a/src/dbc/scala/dbc/Database.scala
+++ b/src/dbc/scala/dbc/Database.scala
@@ -18,7 +18,7 @@ import java.sql._
  *
  *  @author  Gilles Dubochet
  */
-case class Database(dbms: Vendor) {
+@deprecated(DbcIsDeprecated) case class Database(dbms: Vendor) {
 
   class Closed extends Exception {}
 
diff --git a/src/dbc/scala/dbc/Syntax.scala b/src/dbc/scala/dbc/Syntax.scala
index ab2e8e1166..f8eb810ece 100644
--- a/src/dbc/scala/dbc/Syntax.scala
+++ b/src/dbc/scala/dbc/Syntax.scala
@@ -17,7 +17,7 @@ import java.math.{BigDecimal, BigInteger};
 /** This class ..
  *
  */
-object Syntax {
+@deprecated(DbcIsDeprecated) object Syntax {
 
   import syntax.DataTypeUtil;
 
diff --git a/src/dbc/scala/dbc/Utilities.scala b/src/dbc/scala/dbc/Utilities.scala
index b9112ee728..d0f1300cb0 100644
--- a/src/dbc/scala/dbc/Utilities.scala
+++ b/src/dbc/scala/dbc/Utilities.scala
@@ -15,7 +15,7 @@ package scala.dbc;
  *  This object's members must be visible in an expression to use value
  *  auto-conversion.
  */
-object Utilities {
+@deprecated(DbcIsDeprecated) object Utilities {
 
   implicit def constantToValue (obj: statement.expression.Constant): Value =
     obj.constantValue;
diff --git a/src/dbc/scala/dbc/Value.scala b/src/dbc/scala/dbc/Value.scala
index 1fda698d17..1dabec0377 100644
--- a/src/dbc/scala/dbc/Value.scala
+++ b/src/dbc/scala/dbc/Value.scala
@@ -12,7 +12,7 @@ package scala.dbc;
 
 
 /** A SQL-99 value of any type. */
-abstract class Value {
+@deprecated(DbcIsDeprecated) abstract class Value {
 
   /** The SQL-99 type of the value. */
   val dataType: DataType;
diff --git a/src/dbc/scala/dbc/Vendor.scala b/src/dbc/scala/dbc/Vendor.scala
index ba0374c4d6..2099430646 100644
--- a/src/dbc/scala/dbc/Vendor.scala
+++ b/src/dbc/scala/dbc/Vendor.scala
@@ -16,7 +16,7 @@ import java.sql.{Connection, Driver};
 
 /** This class ..
  */
-abstract class Vendor {
+@deprecated(DbcIsDeprecated) abstract class Vendor {
 
   def nativeDriverClass: Class[_];
   def uri: java.net.URI;
diff --git a/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala b/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala
index 68023e01c9..1be836039f 100644
--- a/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala
+++ b/src/dbc/scala/dbc/datatype/ApproximateNumeric.scala
@@ -15,7 +15,7 @@ package datatype;
 /** A type category for all SQL types that store varying-precision
  * numbers.
  */
-abstract class ApproximateNumeric[Type] (
+@deprecated(DbcIsDeprecated) abstract class ApproximateNumeric[Type] (
   override val nativeTypeId: DataType.Id
 ) extends datatype.Numeric[Type](nativeTypeId) {
 
diff --git a/src/dbc/scala/dbc/datatype/Boolean.scala b/src/dbc/scala/dbc/datatype/Boolean.scala
index 9d38ac7e3f..89498f3d9e 100644
--- a/src/dbc/scala/dbc/datatype/Boolean.scala
+++ b/src/dbc/scala/dbc/datatype/Boolean.scala
@@ -13,7 +13,7 @@ package datatype;
 
 
 /** The SQL type for a truth value. */
-class Boolean extends DataType {
+@deprecated(DbcIsDeprecated) class Boolean extends DataType {
 
   def isEquivalent (datatype:DataType) = datatype match {
     case dt:Boolean => true
diff --git a/src/dbc/scala/dbc/datatype/Character.scala b/src/dbc/scala/dbc/datatype/Character.scala
index 62a65158f4..e3b57a230b 100644
--- a/src/dbc/scala/dbc/datatype/Character.scala
+++ b/src/dbc/scala/dbc/datatype/Character.scala
@@ -15,7 +15,7 @@ package datatype;
 /** A SQL type for a string of characters of arbitrary length with
  *  arbitrary character set.
  */
-abstract class Character extends CharacterString {
+@deprecated(DbcIsDeprecated) abstract class Character extends CharacterString {
 
   def isEquivalent(datatype: DataType) = datatype match {
     case dt: Character =>
diff --git a/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala b/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala
index 8c0470d4eb..ba25acb87c 100644
--- a/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala
+++ b/src/dbc/scala/dbc/datatype/CharacterLargeObject.scala
@@ -14,7 +14,7 @@ package datatype;
 
 /** A SQL type for an unbounded length string of characters with arbitrary
   * character set. */
-class CharacterLargeObject extends CharacterString {
+@deprecated(DbcIsDeprecated) class CharacterLargeObject extends CharacterString {
 
   def isEquivalent (datatype:DataType) = datatype match {
     case dt:CharacterLargeObject => {
diff --git a/src/dbc/scala/dbc/datatype/CharacterString.scala b/src/dbc/scala/dbc/datatype/CharacterString.scala
index ac086501bd..11ad6ed5e5 100644
--- a/src/dbc/scala/dbc/datatype/CharacterString.scala
+++ b/src/dbc/scala/dbc/datatype/CharacterString.scala
@@ -13,7 +13,7 @@ package datatype;
 
 
 /** A type category for all SQL types that store strings of characters. */
-abstract class CharacterString extends String {
+@deprecated(DbcIsDeprecated) abstract class CharacterString extends String {
 
   type NativeType = java.lang.String;
   val nativeTypeId = DataType.STRING;
diff --git a/src/dbc/scala/dbc/datatype/CharacterVarying.scala b/src/dbc/scala/dbc/datatype/CharacterVarying.scala
index 8088a89e58..5951aa07d4 100644
--- a/src/dbc/scala/dbc/datatype/CharacterVarying.scala
+++ b/src/dbc/scala/dbc/datatype/CharacterVarying.scala
@@ -15,7 +15,7 @@ package datatype;
 /** A SQL type for a varying length string of characters with arbitrary
  *  maximal length and arbitrary character set.
  */
-abstract class CharacterVarying extends CharacterString {
+@deprecated(DbcIsDeprecated) abstract class CharacterVarying extends CharacterString {
 
   def isEquivalent(datatype: DataType) = datatype match {
     case dt: CharacterVarying =>
diff --git a/src/dbc/scala/dbc/datatype/ExactNumeric.scala b/src/dbc/scala/dbc/datatype/ExactNumeric.scala
index 1253b11006..b41486c2bc 100644
--- a/src/dbc/scala/dbc/datatype/ExactNumeric.scala
+++ b/src/dbc/scala/dbc/datatype/ExactNumeric.scala
@@ -15,7 +15,7 @@ package datatype;
 /** A type category for all SQL types that store constant-precision
   * numbers.
   */
-abstract class ExactNumeric[Type](
+@deprecated(DbcIsDeprecated) abstract class ExactNumeric[Type](
   override val nativeTypeId: DataType.Id
 ) extends datatype.Numeric[Type](nativeTypeId) {
 
diff --git a/src/dbc/scala/dbc/datatype/Factory.scala b/src/dbc/scala/dbc/datatype/Factory.scala
index 4255000642..eef5f1d0d3 100644
--- a/src/dbc/scala/dbc/datatype/Factory.scala
+++ b/src/dbc/scala/dbc/datatype/Factory.scala
@@ -16,7 +16,7 @@ import java.sql.Types._;
 import java.math.BigInteger;
 import java.math.BigDecimal;
 
-object Factory {
+@deprecated(DbcIsDeprecated) object Factory {
 
   final val java_lang_Integer_SIZE = 32;
   final val java_lang_Long_SIZE    = 64;
diff --git a/src/dbc/scala/dbc/datatype/Numeric.scala b/src/dbc/scala/dbc/datatype/Numeric.scala
index e6abf32a5f..c5a3482a7d 100644
--- a/src/dbc/scala/dbc/datatype/Numeric.scala
+++ b/src/dbc/scala/dbc/datatype/Numeric.scala
@@ -13,7 +13,7 @@ package datatype;
 
 
 /** A type category for all SQL types that store numbers. */
-abstract class Numeric[Type](_nativeTypeId: DataType.Id) extends DataType {
+@deprecated(DbcIsDeprecated) abstract class Numeric[Type](_nativeTypeId: DataType.Id) extends DataType {
 
   type NativeType = Type;
   val nativeTypeId = _nativeTypeId;
diff --git a/src/dbc/scala/dbc/datatype/String.scala b/src/dbc/scala/dbc/datatype/String.scala
index dfc3b82618..85db4e471d 100644
--- a/src/dbc/scala/dbc/datatype/String.scala
+++ b/src/dbc/scala/dbc/datatype/String.scala
@@ -14,7 +14,7 @@ package datatype;
 
 /** A type category for all SQL types that store strings of elements.
  */
-abstract class String extends DataType {
+@deprecated(DbcIsDeprecated) abstract class String extends DataType {
 
   /** The maximal possible length of the string defined in characters.
    *  This is an implementation-specific value.
diff --git a/src/dbc/scala/dbc/datatype/Unknown.scala b/src/dbc/scala/dbc/datatype/Unknown.scala
index 36bf7903c0..ee7a6a15fc 100644
--- a/src/dbc/scala/dbc/datatype/Unknown.scala
+++ b/src/dbc/scala/dbc/datatype/Unknown.scala
@@ -13,7 +13,7 @@ package datatype;
 
 
 /** The SQL type for a truth value. */
-class Unknown extends DataType {
+@deprecated(DbcIsDeprecated) class Unknown extends DataType {
 
   def isEquivalent(datatype: DataType) = datatype match {
     case dt: Unknown =>
diff --git a/src/dbc/scala/dbc/exception/IncompatibleSchema.scala b/src/dbc/scala/dbc/exception/IncompatibleSchema.scala
index f7c7ec7d1b..4e21daba07 100644
--- a/src/dbc/scala/dbc/exception/IncompatibleSchema.scala
+++ b/src/dbc/scala/dbc/exception/IncompatibleSchema.scala
@@ -13,7 +13,7 @@ package exception
 
 
 /** A type category for all SQL types that store constant-precision numbers. */
-case class IncompatibleSchema (
+@deprecated(DbcIsDeprecated) case class IncompatibleSchema (
   expectedSchema: List[DataType],
   foundSchema: List[DataType]
 ) extends Exception;
diff --git a/src/dbc/scala/dbc/exception/UnsupportedFeature.scala b/src/dbc/scala/dbc/exception/UnsupportedFeature.scala
index 340228d0a0..1f286c5bbd 100644
--- a/src/dbc/scala/dbc/exception/UnsupportedFeature.scala
+++ b/src/dbc/scala/dbc/exception/UnsupportedFeature.scala
@@ -13,4 +13,4 @@ package exception
 
 
 /** A type category for all SQL types that store constant-precision numbers. */
-case class UnsupportedFeature (msg: String) extends Exception;
+@deprecated(DbcIsDeprecated) case class UnsupportedFeature (msg: String) extends Exception;
diff --git a/src/dbc/scala/dbc/package.scala b/src/dbc/scala/dbc/package.scala
new file mode 100644
index 0000000000..b1552e11d3
--- /dev/null
+++ b/src/dbc/scala/dbc/package.scala
@@ -0,0 +1,6 @@
+package scala
+
+package object dbc {
+  final val DbcIsDeprecated =
+    "scala.dbc will be removed after version 2.9.  Use an active sql library such as scalaquery instead."
+}
\ No newline at end of file
diff --git a/src/dbc/scala/dbc/result/Field.scala b/src/dbc/scala/dbc/result/Field.scala
index 3143c61310..08acbf010c 100644
--- a/src/dbc/scala/dbc/result/Field.scala
+++ b/src/dbc/scala/dbc/result/Field.scala
@@ -16,7 +16,7 @@ import scala.dbc.datatype._
 import scala.dbc.value._
 
 /** An ISO-9075:2003 (SQL) table field. */
-abstract class Field {
+@deprecated(DbcIsDeprecated) abstract class Field {
 
   /** The content (value) of the field. The type of this value is undefined,
    *  transformation into a useful type will be done by an automatic view
@@ -56,7 +56,7 @@ abstract class Field {
 
 }
 
-object Field {
+@deprecated(DbcIsDeprecated) object Field {
 
   implicit def fieldToValue (field: Field): Value = field.content
 
diff --git a/src/dbc/scala/dbc/result/FieldMetadata.scala b/src/dbc/scala/dbc/result/FieldMetadata.scala
index 4fd7a66f2e..f0ec7cf9eb 100644
--- a/src/dbc/scala/dbc/result/FieldMetadata.scala
+++ b/src/dbc/scala/dbc/result/FieldMetadata.scala
@@ -15,7 +15,7 @@ package result
 /** The class <code>FieldMetadata</cocde> provides informations attached to
  *  a field about its content and its relationship to the originating database.
  */
-abstract class FieldMetadata {
+@deprecated(DbcIsDeprecated) abstract class FieldMetadata {
 
   /** The name of the field. */
   def name: String
diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala
index 6b58507ff9..ef4c3e4ad1 100644
--- a/src/dbc/scala/dbc/result/Relation.scala
+++ b/src/dbc/scala/dbc/result/Relation.scala
@@ -14,7 +14,7 @@ package result
 
 /** An ISO-9075:2003 (SQL) table. This is equivalent to a relation in the
  * relational model. */
-abstract class Relation extends AnyRef with Iterable[Tuple] {
+@deprecated(DbcIsDeprecated) abstract class Relation extends AnyRef with Iterable[Tuple] {
 
   /** The statement that generated this relation. */
   def statement: scala.dbc.statement.Relation
diff --git a/src/dbc/scala/dbc/result/Status.scala b/src/dbc/scala/dbc/result/Status.scala
index 68757edbb9..91ca9131b7 100644
--- a/src/dbc/scala/dbc/result/Status.scala
+++ b/src/dbc/scala/dbc/result/Status.scala
@@ -15,7 +15,7 @@ package result;
 import scala.dbc.datatype._;
 
 /** An object containing the status of a query */
-abstract class Status[ResultType] {
+@deprecated(DbcIsDeprecated) abstract class Status[ResultType] {
 
   /** The statement that generated this status result. */
   def statement: scala.dbc.statement.Statement;
diff --git a/src/dbc/scala/dbc/result/Tuple.scala b/src/dbc/scala/dbc/result/Tuple.scala
index 905b8f9e83..90149c4905 100644
--- a/src/dbc/scala/dbc/result/Tuple.scala
+++ b/src/dbc/scala/dbc/result/Tuple.scala
@@ -13,7 +13,7 @@ package result;
 
 
 /** An ISO-9075:2003 (SQL) table row. This is equivalent to a tuple in the relational model. */
-abstract class Tuple {
+@deprecated(DbcIsDeprecated) abstract class Tuple {
 
   /** All the fields contained in the tuple. */
   def fields: List[Field];
diff --git a/src/dbc/scala/dbc/statement/AccessMode.scala b/src/dbc/scala/dbc/statement/AccessMode.scala
index 99213eb975..35c76981e1 100644
--- a/src/dbc/scala/dbc/statement/AccessMode.scala
+++ b/src/dbc/scala/dbc/statement/AccessMode.scala
@@ -12,11 +12,11 @@ package scala.dbc
 package statement
 
 
-abstract class AccessMode {
+@deprecated(DbcIsDeprecated) abstract class AccessMode {
   def sqlString: String
 }
 
-object AccessMode {
+@deprecated(DbcIsDeprecated) object AccessMode {
   case object ReadOnly extends AccessMode {
     def sqlString = "READ ONLY"
   }
diff --git a/src/dbc/scala/dbc/statement/DerivedColumn.scala b/src/dbc/scala/dbc/statement/DerivedColumn.scala
index da800913c9..61ba5a0224 100644
--- a/src/dbc/scala/dbc/statement/DerivedColumn.scala
+++ b/src/dbc/scala/dbc/statement/DerivedColumn.scala
@@ -12,7 +12,7 @@ package scala.dbc
 package statement
 
 
-abstract class DerivedColumn {
+@deprecated(DbcIsDeprecated) abstract class DerivedColumn {
 
   /** The value for the column. This value can be of any type but must be
    *  calculated from fields that appear in a relation that takes part
diff --git a/src/dbc/scala/dbc/statement/Expression.scala b/src/dbc/scala/dbc/statement/Expression.scala
index f4b379f4a1..9cd04dfb98 100644
--- a/src/dbc/scala/dbc/statement/Expression.scala
+++ b/src/dbc/scala/dbc/statement/Expression.scala
@@ -13,7 +13,7 @@ package statement
 
 
 /** An expression that calculates some value from fields. */
-abstract class Expression extends Relation {
+@deprecated(DbcIsDeprecated) abstract class Expression extends Relation {
 
   def fieldTypes: List[DataType] = Nil
 
diff --git a/src/dbc/scala/dbc/statement/Insert.scala b/src/dbc/scala/dbc/statement/Insert.scala
index b232a44a26..f2f06e27ee 100644
--- a/src/dbc/scala/dbc/statement/Insert.scala
+++ b/src/dbc/scala/dbc/statement/Insert.scala
@@ -15,7 +15,7 @@ package statement
 import scala.dbc.statement.expression._
 
 /** An insertion of values into a table. */
-case class Insert(insertionTarget: String, insertionData: InsertionData)
+@deprecated(DbcIsDeprecated) case class Insert(insertionTarget: String, insertionData: InsertionData)
     extends Status {
 
   /** A SQL-99 compliant string representation of the select statement. */
diff --git a/src/dbc/scala/dbc/statement/InsertionData.scala b/src/dbc/scala/dbc/statement/InsertionData.scala
index c7742c9741..9ba729b645 100644
--- a/src/dbc/scala/dbc/statement/InsertionData.scala
+++ b/src/dbc/scala/dbc/statement/InsertionData.scala
@@ -15,17 +15,17 @@ package statement
 import scala.dbc.statement.expression._
 
 /** Data to be inserted into a table in an <code>Insert</code>. */
-abstract class InsertionData {
+@deprecated(DbcIsDeprecated) abstract class InsertionData {
   def sqlString: String
 }
 
-object InsertionData {
+@deprecated(DbcIsDeprecated) object InsertionData {
   /** Insertion of data resulting from a query on the database. */
-  case class Subquery(query: Relation) extends InsertionData {
+  @deprecated(DbcIsDeprecated) case class Subquery(query: Relation) extends InsertionData {
     def sqlString = query.sqlString
   }
   /** Insertion of data as explicitly defined values. */
-  case class Constructor(
+  @deprecated(DbcIsDeprecated) case class Constructor(
     columnNames: Option[List[String]],
     columnValues: List[Expression]
   ) extends InsertionData {
diff --git a/src/dbc/scala/dbc/statement/IsolationLevel.scala b/src/dbc/scala/dbc/statement/IsolationLevel.scala
index 80aeca142f..2185393316 100644
--- a/src/dbc/scala/dbc/statement/IsolationLevel.scala
+++ b/src/dbc/scala/dbc/statement/IsolationLevel.scala
@@ -12,11 +12,11 @@ package scala.dbc
 package statement
 
 
-abstract class IsolationLevel {
+@deprecated(DbcIsDeprecated) abstract class IsolationLevel {
   def sqlString: String
 }
 
-object IsolationLevel {
+@deprecated(DbcIsDeprecated) object IsolationLevel {
   case object ReadUncommitted extends IsolationLevel {
     def sqlString = "ISOLATION LEVEL READ UNCOMMITTED"
   }
diff --git a/src/dbc/scala/dbc/statement/JoinType.scala b/src/dbc/scala/dbc/statement/JoinType.scala
index 1722334636..68e6168867 100644
--- a/src/dbc/scala/dbc/statement/JoinType.scala
+++ b/src/dbc/scala/dbc/statement/JoinType.scala
@@ -13,12 +13,12 @@ package statement
 
 
 /** A join behaviour in a <code>Jointure</code>. */
-abstract class JoinType {
+@deprecated(DbcIsDeprecated) abstract class JoinType {
   /** A SQL-99 string representation of the join behaviour. */
   def sqlString: String
 }
 
-object JoinType {
+@deprecated(DbcIsDeprecated) object JoinType {
 
   /** A join behaviour where a joined tuple is created only when a
    *  corresponding tuple exists in both original relations.
diff --git a/src/dbc/scala/dbc/statement/Jointure.scala b/src/dbc/scala/dbc/statement/Jointure.scala
index 71d95fdbda..40d9f1e24a 100644
--- a/src/dbc/scala/dbc/statement/Jointure.scala
+++ b/src/dbc/scala/dbc/statement/Jointure.scala
@@ -13,7 +13,7 @@ package statement
 
 
 /** A jointure between two relations. */
-abstract class Jointure extends Relation {
+@deprecated(DbcIsDeprecated) abstract class Jointure extends Relation {
 
   /** The relation on the left part of the join. */
   def leftRelation: Relation
diff --git a/src/dbc/scala/dbc/statement/Relation.scala b/src/dbc/scala/dbc/statement/Relation.scala
index 2c0c83a2a1..ce617f0f75 100644
--- a/src/dbc/scala/dbc/statement/Relation.scala
+++ b/src/dbc/scala/dbc/statement/Relation.scala
@@ -13,7 +13,7 @@ package statement;
 
 
 /** A statement that returns a relation. */
-abstract class Relation extends Statement {
+@deprecated(DbcIsDeprecated) abstract class Relation extends Statement {
 
   def isCompatibleType: (DataType,DataType)=>Boolean =
     ((dt,wdt)=>dt.isSubtypeOf(wdt));
diff --git a/src/dbc/scala/dbc/statement/Select.scala b/src/dbc/scala/dbc/statement/Select.scala
index 8bde922da5..f75cd22082 100644
--- a/src/dbc/scala/dbc/statement/Select.scala
+++ b/src/dbc/scala/dbc/statement/Select.scala
@@ -15,7 +15,7 @@ package statement
 /** A statement that when executed on a database will return a relation.
  * The returned relation will be a subset of a table in the database or
  * a jointure between such subsets. */
-abstract class Select extends Relation {
+@deprecated(DbcIsDeprecated) abstract class Select extends Relation {
 
   /** Defines if duplicated tuples should be removed from the returned
    * relation. <h3>Compatibility notice</h3> Some DBMS (PostgreSQL) allow
diff --git a/src/dbc/scala/dbc/statement/SetClause.scala b/src/dbc/scala/dbc/statement/SetClause.scala
index 0af344274d..4818fdda2a 100644
--- a/src/dbc/scala/dbc/statement/SetClause.scala
+++ b/src/dbc/scala/dbc/statement/SetClause.scala
@@ -15,7 +15,7 @@ package statement
 import scala.dbc.statement.expression._
 
 /** Data to be inserted into a table in an <code>Insert</code>. */
-case class SetClause(name: String, expr: Expression) {
+@deprecated(DbcIsDeprecated) case class SetClause(name: String, expr: Expression) {
   val value: Pair[String,Expression] = (name, expr)
   def sqlString: String = value._1 + " = " + value._2.sqlInnerString
 }
diff --git a/src/dbc/scala/dbc/statement/SetQuantifier.scala b/src/dbc/scala/dbc/statement/SetQuantifier.scala
index 74d37fb692..62245d74fd 100644
--- a/src/dbc/scala/dbc/statement/SetQuantifier.scala
+++ b/src/dbc/scala/dbc/statement/SetQuantifier.scala
@@ -13,12 +13,12 @@ package statement
 
 
 /** A set quantifier that defines the collection type of a relation. */
-abstract class SetQuantifier {
+@deprecated(DbcIsDeprecated) abstract class SetQuantifier {
   /** A SQL-99 compliant string representation of the set quantifier. */
   def sqlString: String
 }
 
-object SetQuantifier {
+@deprecated(DbcIsDeprecated) object SetQuantifier {
 
   /** A set quantifier that defines a relation as being a bag. That means
    *  that duplicates are allowed.
diff --git a/src/dbc/scala/dbc/statement/Statement.scala b/src/dbc/scala/dbc/statement/Statement.scala
index 658317be1b..ad69f5b11f 100644
--- a/src/dbc/scala/dbc/statement/Statement.scala
+++ b/src/dbc/scala/dbc/statement/Statement.scala
@@ -13,4 +13,4 @@ package statement
 
 
 /** An ISO-9075:2003 (SQL) statement. */
-abstract class Statement
+@deprecated(DbcIsDeprecated) abstract class Statement
diff --git a/src/dbc/scala/dbc/statement/Status.scala b/src/dbc/scala/dbc/statement/Status.scala
index 397326a185..e1f358077d 100644
--- a/src/dbc/scala/dbc/statement/Status.scala
+++ b/src/dbc/scala/dbc/statement/Status.scala
@@ -15,7 +15,7 @@ import scala.dbc.Database
 import scala.dbc.result
 
 /** A statement that changes the status of the database. */
-abstract class Status extends Statement {
+@deprecated(DbcIsDeprecated) abstract class Status extends Statement {
 
   /** A SQL-99 compliant string representation of the statement. */
   def sqlString: String
diff --git a/src/dbc/scala/dbc/statement/Table.scala b/src/dbc/scala/dbc/statement/Table.scala
index 118b1aef28..b88f4c1af8 100644
--- a/src/dbc/scala/dbc/statement/Table.scala
+++ b/src/dbc/scala/dbc/statement/Table.scala
@@ -15,7 +15,7 @@ package statement
 /** A reference to a table in the database.
   * @author Gilles Dubochet
   * @version 1.0 */
-abstract class Table extends Relation {
+@deprecated(DbcIsDeprecated) abstract class Table extends Relation {
 
   /** The name of the table in the database. */
   def tableName: String
diff --git a/src/dbc/scala/dbc/statement/Transaction.scala b/src/dbc/scala/dbc/statement/Transaction.scala
index 8e93280c6d..a94b509885 100644
--- a/src/dbc/scala/dbc/statement/Transaction.scala
+++ b/src/dbc/scala/dbc/statement/Transaction.scala
@@ -13,7 +13,7 @@ package statement;
 
 
 /** A statement that changes the status of the database. */
-case class Transaction [ResultType] (
+@deprecated(DbcIsDeprecated) case class Transaction [ResultType] (
   transactionBody: (scala.dbc.Database=>ResultType),
   accessMode: Option[AccessMode],
   isolationLevel: Option[IsolationLevel]
diff --git a/src/dbc/scala/dbc/statement/Update.scala b/src/dbc/scala/dbc/statement/Update.scala
index 76674cc0ab..918bfae3cd 100644
--- a/src/dbc/scala/dbc/statement/Update.scala
+++ b/src/dbc/scala/dbc/statement/Update.scala
@@ -15,7 +15,7 @@ package statement;
 import scala.dbc.statement.expression._;
 
 /** An update of the state of a table. */
-case class Update (
+@deprecated(DbcIsDeprecated) case class Update (
   updateTarget: String,
   setClauses: List[SetClause],
   whereClause: Option[Expression]
diff --git a/src/dbc/scala/dbc/statement/expression/Aggregate.scala b/src/dbc/scala/dbc/statement/expression/Aggregate.scala
index 61f26abbd5..02225b5cfa 100644
--- a/src/dbc/scala/dbc/statement/expression/Aggregate.scala
+++ b/src/dbc/scala/dbc/statement/expression/Aggregate.scala
@@ -13,7 +13,7 @@ package statement
 package expression
 
 
-abstract class Aggregate extends Expression {
+@deprecated(DbcIsDeprecated) abstract class Aggregate extends Expression {
 
   def aggregateName: String;
 
diff --git a/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala b/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala
index 1c3cca01ec..7a52e10537 100644
--- a/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala
+++ b/src/dbc/scala/dbc/statement/expression/BinaryOperator.scala
@@ -13,7 +13,7 @@ package statement
 package expression;
 
 
-abstract class BinaryOperator extends Expression {
+@deprecated(DbcIsDeprecated) abstract class BinaryOperator extends Expression {
 
   /** The name of the operator. */
   def operator: String;
diff --git a/src/dbc/scala/dbc/statement/expression/Constant.scala b/src/dbc/scala/dbc/statement/expression/Constant.scala
index 6e3b764a91..ae12917f65 100644
--- a/src/dbc/scala/dbc/statement/expression/Constant.scala
+++ b/src/dbc/scala/dbc/statement/expression/Constant.scala
@@ -13,7 +13,7 @@ package statement
 package expression;
 
 
-abstract class Constant extends Expression {
+@deprecated(DbcIsDeprecated) abstract class Constant extends Expression {
   /** A SQL-99 compliant string representation of the relation sub-
     * statement. This only has a meaning inside another statement. */
   def sqlInnerString: String = constantValue.sqlString;
diff --git a/src/dbc/scala/dbc/statement/expression/Field.scala b/src/dbc/scala/dbc/statement/expression/Field.scala
index 681dccabad..57177d9ab9 100644
--- a/src/dbc/scala/dbc/statement/expression/Field.scala
+++ b/src/dbc/scala/dbc/statement/expression/Field.scala
@@ -13,7 +13,7 @@ package statement
 package expression;
 
 
-abstract class Field extends Expression {
+@deprecated(DbcIsDeprecated) abstract class Field extends Expression {
 
   /** The name of the schema in the database where the field is located. */
   def schemaName: Option[String] = None;
diff --git a/src/dbc/scala/dbc/statement/expression/FunctionCall.scala b/src/dbc/scala/dbc/statement/expression/FunctionCall.scala
index f70f0e4af9..9c2f412413 100644
--- a/src/dbc/scala/dbc/statement/expression/FunctionCall.scala
+++ b/src/dbc/scala/dbc/statement/expression/FunctionCall.scala
@@ -13,7 +13,7 @@ package statement
 package expression;
 
 
-case class FunctionCall (
+@deprecated(DbcIsDeprecated) case class FunctionCall (
   functionName: String,
   arguments: List[Expression]
 ) extends Expression {
diff --git a/src/dbc/scala/dbc/statement/expression/Select.scala b/src/dbc/scala/dbc/statement/expression/Select.scala
index f173d1ac06..24b46f2d3d 100644
--- a/src/dbc/scala/dbc/statement/expression/Select.scala
+++ b/src/dbc/scala/dbc/statement/expression/Select.scala
@@ -13,7 +13,7 @@ package statement
 package expression;
 
 
-abstract class Select extends Expression {
+@deprecated(DbcIsDeprecated) abstract class Select extends Expression {
 
   /** The actual select statement */
   def selectStatement: statement.Select;
diff --git a/src/dbc/scala/dbc/statement/expression/SetFunction.scala b/src/dbc/scala/dbc/statement/expression/SetFunction.scala
index 4f13c47b81..07bd94ada7 100644
--- a/src/dbc/scala/dbc/statement/expression/SetFunction.scala
+++ b/src/dbc/scala/dbc/statement/expression/SetFunction.scala
@@ -13,12 +13,12 @@ package statement
 package expression;
 
 
-abstract class SetFunction {
+@deprecated(DbcIsDeprecated) abstract class SetFunction {
   /** A SQL-99 compliant string representation of the set quantifier. */
   def sqlString: String;
 }
 
-object SetFunction {
+@deprecated(DbcIsDeprecated) object SetFunction {
   abstract class Asterisk extends SetFunction {
     def sqlString = "(*)";
   }
diff --git a/src/dbc/scala/dbc/statement/expression/TypeCast.scala b/src/dbc/scala/dbc/statement/expression/TypeCast.scala
index 899e60d322..54ef99ebc0 100644
--- a/src/dbc/scala/dbc/statement/expression/TypeCast.scala
+++ b/src/dbc/scala/dbc/statement/expression/TypeCast.scala
@@ -13,7 +13,7 @@ package statement
 package expression;
 
 
-case class TypeCast (
+@deprecated(DbcIsDeprecated) case class TypeCast (
   expression: Expression,
   castType: DataType
 ) extends Expression {
diff --git a/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala b/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala
index 00db996ee4..29f01f702b 100644
--- a/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala
+++ b/src/dbc/scala/dbc/statement/expression/UnaryOperator.scala
@@ -13,7 +13,7 @@ package statement
 package expression;
 
 
-abstract class UnaryOperator extends Expression {
+@deprecated(DbcIsDeprecated) abstract class UnaryOperator extends Expression {
 
   /** The name of the operator */
   def operator: String;
diff --git a/src/dbc/scala/dbc/syntax/DataTypeUtil.scala b/src/dbc/scala/dbc/syntax/DataTypeUtil.scala
index d22460fa65..573337d01c 100644
--- a/src/dbc/scala/dbc/syntax/DataTypeUtil.scala
+++ b/src/dbc/scala/dbc/syntax/DataTypeUtil.scala
@@ -15,7 +15,7 @@ package syntax;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-object DataTypeUtil {
+@deprecated(DbcIsDeprecated) object DataTypeUtil {
 
   final val java_lang_Integer_SIZE = 32;
   final val java_lang_Long_SIZE    = 64;
diff --git a/src/dbc/scala/dbc/syntax/Database.scala b/src/dbc/scala/dbc/syntax/Database.scala
index c4d292e39a..1fbaaf8210 100644
--- a/src/dbc/scala/dbc/syntax/Database.scala
+++ b/src/dbc/scala/dbc/syntax/Database.scala
@@ -14,7 +14,7 @@ package syntax;
 
 import java.net.URI;
 
-object Database {
+@deprecated(DbcIsDeprecated) object Database {
 
   def database (server:String, username:String, password:String): dbc.Database = {
     val uri = new URI(server);
diff --git a/src/dbc/scala/dbc/syntax/Statement.scala b/src/dbc/scala/dbc/syntax/Statement.scala
index 825da0d400..21294a2f87 100644
--- a/src/dbc/scala/dbc/syntax/Statement.scala
+++ b/src/dbc/scala/dbc/syntax/Statement.scala
@@ -31,7 +31,7 @@ FIXED:
 
 */
 
-object Statement {
+@deprecated(DbcIsDeprecated) object Statement {
 
   // SELECT ZYGOTE ...
 
diff --git a/src/dbc/scala/dbc/syntax/StatementExpression.scala b/src/dbc/scala/dbc/syntax/StatementExpression.scala
index a9603684a2..60211df3aa 100644
--- a/src/dbc/scala/dbc/syntax/StatementExpression.scala
+++ b/src/dbc/scala/dbc/syntax/StatementExpression.scala
@@ -15,7 +15,7 @@ package syntax;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-abstract class StatementExpression {
+@deprecated(DbcIsDeprecated) abstract class StatementExpression {
 
   def toStatement: statement.Expression;
 
@@ -171,7 +171,7 @@ abstract class StatementExpression {
 
 }
 
-object StatementExpression {
+@deprecated(DbcIsDeprecated) object StatementExpression {
 
   def not (se:StatementExpression): StatementExpression = new StatementExpression {
     val toStatement = new statement.expression.UnaryOperator {
diff --git a/src/dbc/scala/dbc/value/ApproximateNumeric.scala b/src/dbc/scala/dbc/value/ApproximateNumeric.scala
index 4261c08865..435da796c5 100644
--- a/src/dbc/scala/dbc/value/ApproximateNumeric.scala
+++ b/src/dbc/scala/dbc/value/ApproximateNumeric.scala
@@ -12,7 +12,7 @@ package scala.dbc
 package value;
 
 
-abstract class ApproximateNumeric [Type] extends Value {
+@deprecated(DbcIsDeprecated) abstract class ApproximateNumeric [Type] extends Value {
 
   val dataType: datatype.ApproximateNumeric[Type];
 
@@ -20,7 +20,7 @@ abstract class ApproximateNumeric [Type] extends Value {
 
   }
 
-object ApproximateNumeric {
+@deprecated(DbcIsDeprecated) object ApproximateNumeric {
 
   implicit def approximateNumericToFloar (obj:value.ApproximateNumeric[Float]): Float = obj.nativeValue;
   implicit def approximateNumericToDouble (obj:value.ApproximateNumeric[Double]): Double = obj.nativeValue;
diff --git a/src/dbc/scala/dbc/value/Boolean.scala b/src/dbc/scala/dbc/value/Boolean.scala
index 8da498264a..399c3a3450 100644
--- a/src/dbc/scala/dbc/value/Boolean.scala
+++ b/src/dbc/scala/dbc/value/Boolean.scala
@@ -12,7 +12,7 @@ package scala.dbc
 package value;
 
 
-abstract class Boolean extends Value {
+@deprecated(DbcIsDeprecated) abstract class Boolean extends Value {
 
   val dataType: datatype.Boolean;
 
@@ -20,7 +20,7 @@ abstract class Boolean extends Value {
 
 }
 
-object Boolean {
+@deprecated(DbcIsDeprecated) object Boolean {
 
   implicit def booleanToBoolean (obj:value.Boolean): scala.Boolean = obj.nativeValue;
 
diff --git a/src/dbc/scala/dbc/value/Character.scala b/src/dbc/scala/dbc/value/Character.scala
index 81057b168e..e328bb2edc 100644
--- a/src/dbc/scala/dbc/value/Character.scala
+++ b/src/dbc/scala/dbc/value/Character.scala
@@ -13,7 +13,7 @@ package value;
 
 
 /** A SQL-99 value of type character string. */
-abstract class Character extends Value {
+@deprecated(DbcIsDeprecated) abstract class Character extends Value {
 
   override val dataType: datatype.Character;
 
@@ -27,7 +27,7 @@ abstract class Character extends Value {
 /** An object offering transformation methods (views) on the value.
   * This object must be visible in an expression to use value auto-
   * conversion. */
-object Character {
+@deprecated(DbcIsDeprecated) object Character {
 
   /** A character string value as a native string. */
   implicit def characterToString (obj:value.Character): String = obj.nativeValue;
diff --git a/src/dbc/scala/dbc/value/CharacterLargeObject.scala b/src/dbc/scala/dbc/value/CharacterLargeObject.scala
index 32f812c2b4..19ceaeee59 100644
--- a/src/dbc/scala/dbc/value/CharacterLargeObject.scala
+++ b/src/dbc/scala/dbc/value/CharacterLargeObject.scala
@@ -13,7 +13,7 @@ package value;
 
 
 /** A SQL-99 value of type character large object. */
-abstract class CharacterLargeObject extends Value {
+@deprecated(DbcIsDeprecated) abstract class CharacterLargeObject extends Value {
 
   override val dataType: datatype.CharacterLargeObject;
 
@@ -27,7 +27,7 @@ abstract class CharacterLargeObject extends Value {
 /** An object offering transformation methods (views) on the value.
   * This object must be visible in an expression to use value auto-
   * conversion. */
-object CharacterLargeObject {
+@deprecated(DbcIsDeprecated) object CharacterLargeObject {
 
   /** A character large object value as a native string. */
   implicit def characterLargeObjectToString (obj:value.CharacterLargeObject): String = obj.nativeValue;
diff --git a/src/dbc/scala/dbc/value/CharacterVarying.scala b/src/dbc/scala/dbc/value/CharacterVarying.scala
index 36b31a1b9e..d114a28b07 100644
--- a/src/dbc/scala/dbc/value/CharacterVarying.scala
+++ b/src/dbc/scala/dbc/value/CharacterVarying.scala
@@ -13,7 +13,7 @@ package value;
 
 
 /** A SQL-99 value of type character varying string. */
-abstract class CharacterVarying extends Value {
+@deprecated(DbcIsDeprecated) abstract class CharacterVarying extends Value {
 
   override val dataType: datatype.CharacterVarying;
 
@@ -27,7 +27,7 @@ abstract class CharacterVarying extends Value {
 /** An object offering transformation methods (views) on the value.
   * This object must be visible in an expression to use value auto-
   * conversion. */
-object CharacterVarying {
+@deprecated(DbcIsDeprecated) object CharacterVarying {
 
   /** A character varying string value as a native string. */
   implicit def characterVaryingToString (obj:value.CharacterVarying): String = obj.nativeValue;
diff --git a/src/dbc/scala/dbc/value/Conversion.scala b/src/dbc/scala/dbc/value/Conversion.scala
index 922dec2d6b..5b3d3ef7af 100644
--- a/src/dbc/scala/dbc/value/Conversion.scala
+++ b/src/dbc/scala/dbc/value/Conversion.scala
@@ -11,10 +11,9 @@
 package scala.dbc
 package value;
 
-
 import java.math._;
 
-object Conversion {
+@deprecated(DbcIsDeprecated) object  Conversion {
 
   class Illegal (msg:String) extends Exception(msg);
 
diff --git a/src/dbc/scala/dbc/value/ExactNumeric.scala b/src/dbc/scala/dbc/value/ExactNumeric.scala
index cbb2868580..5176d15028 100644
--- a/src/dbc/scala/dbc/value/ExactNumeric.scala
+++ b/src/dbc/scala/dbc/value/ExactNumeric.scala
@@ -15,7 +15,7 @@ package value;
 import java.math.BigInteger;
 import java.math.BigDecimal;
 
-abstract class ExactNumeric [Type] extends Value {
+@deprecated(DbcIsDeprecated) abstract class ExactNumeric [Type] extends Value {
 
   val dataType: datatype.ExactNumeric[Type];
 
@@ -23,7 +23,7 @@ abstract class ExactNumeric [Type] extends Value {
 
 }
 
-object ExactNumeric {
+@deprecated(DbcIsDeprecated) object ExactNumeric {
 
   implicit def exactNumericToByte (obj:value.ExactNumeric[Byte]): Byte = obj.nativeValue;
   implicit def exactNumericToShort (obj:value.ExactNumeric[Short]): Short = obj.nativeValue;
diff --git a/src/dbc/scala/dbc/value/Factory.scala b/src/dbc/scala/dbc/value/Factory.scala
index f22ba75b7e..cc7406a945 100644
--- a/src/dbc/scala/dbc/value/Factory.scala
+++ b/src/dbc/scala/dbc/value/Factory.scala
@@ -15,7 +15,7 @@ package value;
 import java.math.BigInteger;
 import java.math.BigDecimal;
 
-object Factory {
+@deprecated(DbcIsDeprecated) object Factory {
 
   def create (result: java.sql.ResultSet, index: Int, expectedDataType: DataType): Value = {
     expectedDataType.nativeTypeId match {
diff --git a/src/dbc/scala/dbc/value/Unknown.scala b/src/dbc/scala/dbc/value/Unknown.scala
index b91804168c..90bf565a58 100644
--- a/src/dbc/scala/dbc/value/Unknown.scala
+++ b/src/dbc/scala/dbc/value/Unknown.scala
@@ -12,7 +12,7 @@ package scala.dbc
 package value;
 
 
-abstract class Unknown extends Value {
+@deprecated(DbcIsDeprecated) abstract class Unknown extends Value {
 
   val dataType: datatype.Unknown;
 
@@ -20,7 +20,7 @@ abstract class Unknown extends Value {
 
 }
 
-object UnknownType {
+@deprecated(DbcIsDeprecated) object UnknownType {
 
   def view (obj:value.Unknown): AnyRef = obj.nativeValue;
 
diff --git a/src/dbc/scala/dbc/vendor/PostgreSQL.scala b/src/dbc/scala/dbc/vendor/PostgreSQL.scala
index 8989185b10..4bd10c6629 100644
--- a/src/dbc/scala/dbc/vendor/PostgreSQL.scala
+++ b/src/dbc/scala/dbc/vendor/PostgreSQL.scala
@@ -14,7 +14,7 @@ package vendor;
 
 import compat.Platform
 
-abstract class PostgreSQL extends Vendor {
+@deprecated(DbcIsDeprecated) abstract class PostgreSQL extends Vendor {
 
   def uri:java.net.URI;
   def user:String;