cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r423749 [2/4] - in /incubator/cayenne/main/trunk/cayenne/cayenne-java/src: cayenne/java/org/apache/cayenne/ cayenne/java/org/apache/cayenne/access/ cayenne/java/org/apache/cayenne/access/event/ cayenne/java/org/apache/cayenne/access/jdbc/ c...
Date Thu, 20 Jul 2006 04:04:10 GMT
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/Transaction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/Transaction.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/Transaction.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/Transaction.java Wed Jul 19 21:04:04 2006
@@ -21,13 +21,10 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Level;
 import org.apache.cayenne.CayenneException;
-import org.apache.cayenne.CayenneRuntimeException;
 
 /**
  * A Cayenne transaction. Currently supports managing JDBC connections.
@@ -71,11 +68,6 @@
     protected int status;
     protected TransactionDelegate delegate;
 
-    /**
-     * @deprecated since 1.2
-     */
-    protected Level logLevel;
-
     static String decodeStatus(int status) {
         switch (status) {
             case STATUS_ACTIVE:
@@ -150,71 +142,6 @@
         status = STATUS_NO_TRANSACTION;
     }
 
-    /**
-     * Helper method that wraps a number of queries in this transaction, runs them, and
-     * commits or rolls back depending on the outcome. This method allows users to define
-     * their own custom Transactions and wrap Cayenne queries in them.
-     * 
-     * @deprecated since 1.2 this method is not used in Cayenne and is deprecated.
-     *             Thread-bound transactions should be used instead.
-     */
-    public void performQueries(
-            QueryEngine engine,
-            Collection queries,
-            OperationObserver observer) throws CayenneRuntimeException {
-
-        Transaction old = Transaction.getThreadTransaction();
-        Transaction.bindThreadTransaction(this);
-
-        try {
-            // implicit begin..
-            engine.performQueries(queries, observer);
-
-            // don't commit iterated queries - leave it up to the caller
-            // at the same time rollbacks of iterated queries must be processed here,
-            // since caller will no longer be processing stuff on exception
-            if (!observer.isIteratedResult()
-                    && (getStatus() == Transaction.STATUS_ACTIVE)) {
-                commit();
-            }
-        }
-        catch (Exception ex) {
-            setRollbackOnly();
-
-            // must rethrow
-            if (ex instanceof CayenneRuntimeException) {
-                throw (CayenneRuntimeException) ex;
-            }
-            else {
-                throw new CayenneRuntimeException(ex);
-            }
-        }
-        finally {
-            Transaction.bindThreadTransaction(old);
-            if (getStatus() == Transaction.STATUS_MARKED_ROLLEDBACK) {
-                try {
-                    rollback();
-                }
-                catch (Exception rollbackEx) {
-                }
-            }
-        }
-    }
-
-    /**
-     * @deprecated since 1.2 unused
-     */
-    public Level getLogLevel() {
-        return logLevel != null ? logLevel : Level.INFO;
-    }
-
-    /**
-     * @deprecated since 1.2 unused
-     */
-    public void setLogLevel(Level logLevel) {
-        this.logLevel = logLevel;
-    }
-
     public TransactionDelegate getDelegate() {
         return delegate;
     }
@@ -246,14 +173,6 @@
      * when the first connection is added.
      */
     public abstract void begin();
-
-    /**
-     * @deprecated since 1.2 use {@link #addConnection(String, Connection)}.
-     */
-    public void addConnection(Connection connection) throws IllegalStateException,
-            SQLException, CayenneException {
-        addConnection("x" + System.currentTimeMillis(), connection);
-    }
 
     public abstract void commit() throws IllegalStateException, SQLException,
             CayenneException;

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/event/SnapshotEvent.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/event/SnapshotEvent.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/event/SnapshotEvent.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/event/SnapshotEvent.java Wed Jul 19 21:04:04 2006
@@ -29,7 +29,7 @@
  * Event sent on modification of the DataRowStore.
  * 
  * @since 1.1
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public class SnapshotEvent extends CayenneEvent {
 
@@ -38,21 +38,6 @@
     protected Collection invalidatedIds;
     protected Map modifiedDiffs;
     protected Collection indirectlyModifiedIds;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public SnapshotEvent(Object source, Object postedBy, Map modifiedDiffs,
-            Collection deletedIds, Collection indirectlyModifiedIds) {
-
-        this(
-                source,
-                postedBy,
-                modifiedDiffs,
-                deletedIds,
-                Collections.EMPTY_LIST,
-                indirectlyModifiedIds);
-    }
 
     public SnapshotEvent(Object source, Object postedBy, Map modifiedDiffs,
             Collection deletedIds, Collection invalidatedIds,

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java Wed Jul 19 21:04:04 2006
@@ -17,26 +17,25 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access.jdbc;
 
 import java.io.Serializable;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.cayenne.dba.TypesMapping;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ProcedureParameter;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  * A descriptor of a ResultSet column.
  * 
  * @since 1.1
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public class ColumnDescriptor implements Serializable {
 
@@ -50,11 +49,6 @@
     // identifies column in a DataRow
     protected String label;
 
-    /**
-     * @deprecated since 1.2
-     */
-    protected boolean primaryKey;
-
     protected int jdbcType;
     protected String javaClass;
 
@@ -63,7 +57,7 @@
      */
     public ColumnDescriptor() {
     }
-    
+
     /**
      * Creates a column descriptor with user-specified parameters.
      * 
@@ -77,16 +71,6 @@
         this.javaClass = javaClass;
     }
 
-
-    /**
-     * Creates a ColumnDescriptor from Cayenne ObjAttribute and DbAttribute.
-     * 
-     * @deprecated since 1.2 use constructor with column alias parameter.
-     */
-    public ColumnDescriptor(ObjAttribute objAttribute, DbAttribute dbAttribute) {
-        this(objAttribute, dbAttribute, null);
-    }
-
     /**
      * Creates a ColumnDescriptor from Cayenne DbAttribute.
      * 
@@ -97,7 +81,6 @@
         this.qualifiedColumnName = attribute.getAliasedName(columnAlias);
         this.label = name;
         this.jdbcType = attribute.getType();
-        this.primaryKey = attribute.isPrimaryKey();
         this.javaClass = getDefaultJavaClass(attribute.getMaxLength(), attribute
                 .getPrecision());
 
@@ -153,7 +136,8 @@
         this.qualifiedColumnName = name;
         this.label = name;
         this.jdbcType = metaData.getColumnType(position);
-        this.javaClass = getDefaultJavaClass(metaData.getColumnDisplaySize(position),
+        this.javaClass = getDefaultJavaClass(
+                metaData.getColumnDisplaySize(position),
                 metaData.getScale(position));
     }
 
@@ -169,13 +153,11 @@
         }
 
         ColumnDescriptor rhs = (ColumnDescriptor) o;
-        return new EqualsBuilder()
-                .append(name, rhs.name)
-                .append(qualifiedColumnName, rhs.qualifiedColumnName)
-                .append(procedureName, rhs.procedureName)
-                .append(label, rhs.label)
-                .append(tableName, rhs.tableName)
-                .isEquals();
+        return new EqualsBuilder().append(name, rhs.name).append(
+                qualifiedColumnName,
+                rhs.qualifiedColumnName).append(procedureName, rhs.procedureName).append(
+                label,
+                rhs.label).append(tableName, rhs.tableName).isEquals();
     }
 
     /**
@@ -243,22 +225,8 @@
         this.name = name;
     }
 
-    /**
-     * @deprecated since 1.2
-     */
-    public boolean isPrimaryKey() {
-        return primaryKey;
-    }
-
     public String getJavaClass() {
         return javaClass;
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public void setPrimaryKey(boolean b) {
-        primaryKey = b;
     }
 
     public void setJavaClass(String string) {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessor.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessor.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessor.java Wed Jul 19 21:04:04 2006
@@ -100,42 +100,6 @@
     }
 
     /**
-     * Builds and returns a SQLSelectStatement based on SQL template and a set of
-     * parameters. During rendering VelocityContext exposes the following as variables:
-     * all parameters in the map, {@link SQLTemplateRenderingUtils} as a "helper" variable
-     * and SQLStatement object as "statement" variable.
-     * 
-     * @deprecated since 1.2 as there is no longer a distinction between selecting and
-     *             updating queries processing.
-     */
-    SQLSelectStatement processSelectTemplate(String template, Map parameters)
-            throws Exception {
-
-        // have to make a copy of parameter map since we are gonna modify it..
-        Map internalParameters = (parameters != null && !parameters.isEmpty())
-                ? new HashMap(parameters)
-                : new HashMap(3);
-
-        List bindings = new ArrayList();
-        List results = new ArrayList();
-        internalParameters.put(BINDINGS_LIST_KEY, bindings);
-        internalParameters.put(RESULT_COLUMNS_LIST_KEY, results);
-        internalParameters.put(HELPER_KEY, renderingUtils);
-
-        String sql = buildStatement(
-                new VelocityContext(internalParameters),
-                template,
-                parameters);
-
-        ParameterBinding[] bindingsArray = new ParameterBinding[bindings.size()];
-        bindings.toArray(bindingsArray);
-
-        ColumnDescriptor[] resultsArray = new ColumnDescriptor[results.size()];
-        results.toArray(resultsArray);
-        return new SQLSelectStatement(sql, resultsArray, bindingsArray);
-    }
-
-    /**
      * Builds and returns a SQLStatement based on SQL template and a set of parameters.
      * During rendering, VelocityContext exposes the following as variables: all
      * parameters in the map, {@link SQLTemplateRenderingUtils} as a "helper" variable and

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SelectAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SelectAction.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SelectAction.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SelectAction.java Wed Jul 19 21:04:04 2006
@@ -41,7 +41,7 @@
  * A SQLAction that handles SelectQuery execution.
  * 
  * @since 1.2
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public class SelectAction extends BaseSQLAction {
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/UpdateAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/UpdateAction.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/UpdateAction.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/UpdateAction.java Wed Jul 19 21:04:04 2006
@@ -49,19 +49,17 @@
     }
 
     protected QueryTranslator createTranslator(Connection connection) {
-        QueryTranslator translator = checkDeprecatedQueries(query);
+        QueryTranslator translator;
 
-        if (translator == null) {
-            if (query instanceof UpdateQuery) {
-                translator = new UpdateTranslator();
-            }
-            else if (query instanceof DeleteQuery) {
-                translator = new DeleteTranslator();
-            }
-            else {
-                throw new CayenneRuntimeException("Can't make a translator for query "
-                        + query);
-            }
+        if (query instanceof UpdateQuery) {
+            translator = new UpdateTranslator();
+        }
+        else if (query instanceof DeleteQuery) {
+            translator = new DeleteTranslator();
+        }
+        else {
+            throw new CayenneRuntimeException("Can't make a translator for query "
+                    + query);
         }
 
         translator.setAdapter(getAdapter());
@@ -70,17 +68,6 @@
         translator.setConnection(connection);
 
         return translator;
-    }
-
-    /**
-     * @deprecated remove once deprcated queries processed here are removed.
-     */
-    final QueryTranslator checkDeprecatedQueries(Query query) {
-        if (query instanceof org.apache.cayenne.query.InsertQuery) {
-            return new org.apache.cayenne.access.trans.InsertTranslator();
-        }
-
-        return null;
     }
 
     public void performAction(Connection connection, OperationObserver observer)

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java Wed Jul 19 21:04:04 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access.trans;
 
 import java.sql.PreparedStatement;
@@ -87,18 +86,6 @@
 
     public void setTrimFunction(String string) {
         trimFunction = string;
-    }
-
-    /**
-     * Binds parameters for the current batch iteration to the PreparedStatement.
-     * 
-     * @deprecated since 1.1 use 'bindParameters' without dbAttributes argument.
-     */
-    public void bindParameters(
-            PreparedStatement statement,
-            BatchQuery query,
-            List dbAttributes) throws SQLException, Exception {
-        this.bindParameters(statement, query);
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/ProcedureTranslator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/ProcedureTranslator.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/ProcedureTranslator.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/ProcedureTranslator.java Wed Jul 19 21:04:04 2006
@@ -135,18 +135,6 @@
     }
 
     /**
-     * Returns a result descriptor for the stored procedure OUT parameters.
-     * 
-     * @deprecated Since 1.2 is unused. Instead OUTParametersReader is created inside a
-     *             SQLAction.
-     */
-    public org.apache.cayenne.access.util.ResultDescriptor getProcedureResultDescriptor() {
-        return org.apache.cayenne.access.util.ResultDescriptor.createDescriptor(
-                getProcedure(),
-                getAdapter().getExtendedTypes());
-    }
-
-    /**
      * Set IN and OUT parameters.
      */
     protected void initStatement(CallableStatement stmt) throws Exception {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/QualifierTranslator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/QualifierTranslator.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/QualifierTranslator.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/QualifierTranslator.java Wed Jul 19 21:04:04 2006
@@ -295,14 +295,6 @@
             //     qualBuf.append('+');
             else if (node.getType() == Expression.NOT)
                 qualBuf.append("NOT ");
-            else if (node.getType() == Expression.EXISTS)
-                qualBuf.append("EXISTS ");
-            else if (node.getType() == Expression.ALL)
-                qualBuf.append("ALL ");
-            else if (node.getType() == Expression.SOME)
-                qualBuf.append("SOME ");
-            else if (node.getType() == Expression.ANY)
-                qualBuf.append("ANY ");
         }
         else if (
             node.getType() == Expression.LIKE_IGNORE_CASE
@@ -332,10 +324,7 @@
     }
 
     public void objectNode(Object leaf, Expression parentNode) {
-        if (parentNode.getType() == Expression.RAW_SQL) {
-            appendRawSql(leaf);
-        }
-        else if (parentNode.getType() == Expression.OBJ_PATH) {
+        if (parentNode.getType() == Expression.OBJ_PATH) {
             appendObjPath(qualBuf, parentNode);
         }
         else if (parentNode.getType() == Expression.DB_PATH) {
@@ -364,12 +353,6 @@
             return false;
 
         return true;
-    }
-
-    private void appendRawSql(Object sql) {
-        if (sql != null) {
-            qualBuf.append(sql);
-        }
     }
 
     private final void appendList(Expression listExpr, DbAttribute paramDesc) {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/SelectTranslator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/SelectTranslator.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/SelectTranslator.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/SelectTranslator.java Wed Jul 19 21:04:04 2006
@@ -92,17 +92,6 @@
     boolean forcingDistinct;
 
     /**
-     * Returns a list of DbAttributes representing columns in this query.
-     * 
-     * @deprecated since 1.2 - contents of this list are now ColumnDescriptors, not
-     *             DbAttributes. Anyway, use getResultColumns() instead to reduce
-     *             confusion.
-     */
-    protected List getColumns() {
-        return resultColumns;
-    }
-
-    /**
      * Returns query translated to SQL. This is a main work method of the
      * SelectTranslator.
      */

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/DefaultOperationObserver.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/DefaultOperationObserver.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/DefaultOperationObserver.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/DefaultOperationObserver.java Wed Jul 19 21:04:04 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access.util;
 
 import java.io.PrintWriter;
@@ -27,7 +26,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Level;
 import org.apache.cayenne.CayenneException;
 import org.apache.cayenne.access.OperationObserver;
 import org.apache.cayenne.access.ResultIterator;
@@ -47,12 +45,6 @@
  */
 public class DefaultOperationObserver implements OperationObserver {
 
-
-    /**
-     * @deprecated Unused since 1.2
-     */
-    public static final Level DEFAULT_LOG_LEVEL = Level.INFO;
-
     protected List globalExceptions = new ArrayList();
     protected Map queryExceptions = new HashMap();
 
@@ -109,31 +101,11 @@
         return globalExceptions.size() > 0 || queryExceptions.size() > 0;
     }
 
-    /**
-     * Returns a log level level that should be used when logging query execution.
-     * 
-     * @deprecated since 1.2
-     */
-    public Level getLoggingLevel() {
-        return Level.INFO;
-    }
-
-    /**
-     * Sets log level that should be used for queries. If <code>level</code> argument is
-     * null, level is set to DEFAULT_LOG_LEVEL. If <code>level</code> is equal or higher
-     * than log level configured for QueryLogger, query SQL statements will be logged.
-     * 
-     * @deprecated since 1.2
-     */
-    public void setLoggingLevel(Level level) {
-        // noop
-    }
-
     public void nextCount(Query query, int resultCount) {
     }
 
     public void nextBatchCount(Query query, int[] resultCount) {
-        
+
     }
 
     public void nextDataRows(Query query, List dataRows) {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/Configuration.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/Configuration.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/Configuration.java Wed Jul 19 21:04:04 2006
@@ -30,11 +30,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.Predicate;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.ConfigurationException;
 import org.apache.cayenne.access.DataDomain;
@@ -42,6 +37,10 @@
 import org.apache.cayenne.event.EventManager;
 import org.apache.cayenne.util.CayenneMap;
 import org.apache.cayenne.util.ResourceLocator;
+import org.apache.commons.collections.Predicate;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
 
 /**
  * This class is an entry point to Cayenne. It loads all configuration files and
@@ -95,13 +94,6 @@
     protected EventManager eventManager;
 
     /**
-     * @deprecated since 1.2. Use Thread.currentThread().setContextClassLoader() instead.
-     */
-    public static void bootstrapSharedConfiguration(Class cl) {
-        logObj.warn("This method does nothing.");
-    }
-
-    /**
      * Configures Cayenne logging properties. Search for the properties file called
      * <code>cayenne-log.properties</code> is first done in $HOME/.cayenne, then in
      * CLASSPATH.
@@ -177,39 +169,6 @@
         }
 
         return Configuration.sharedConfiguration;
-    }
-
-    /**
-     * @deprecated since 1.2 use Thread.currentThread().getContextClassLoader(). This is
-     *             what Cayenne uses internally.
-     */
-    public static ClassLoader getResourceLoader() {
-        ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        if (loader == null) {
-            loader = Configuration.class.getClassLoader();
-        }
-
-        return loader;
-    }
-
-    /**
-     * Returns default log level for loading configuration. Log level is made static so
-     * that applications can set it before shared Configuration object is instantiated.
-     * 
-     * @deprecated since 1.2 unused
-     */
-    public static Level getLoggingLevel() {
-        Level l = logObj.getLevel();
-        return (l != null ? l : Level.DEBUG);
-    }
-
-    /**
-     * Sets the default log level for loading a configuration.
-     * 
-     * @deprecated since 1.2 unused.
-     */
-    public static void setLoggingLevel(Level logLevel) {
-        logObj.setLevel(logLevel);
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java Wed Jul 19 21:04:04 2006
@@ -26,6 +26,7 @@
 
 import javax.sql.DataSource;
 
+import org.apache.cayenne.ConfigurationException;
 import org.apache.commons.dbcp.ConnectionFactory;
 import org.apache.commons.dbcp.DriverManagerConnectionFactory;
 import org.apache.commons.dbcp.PoolableConnectionFactory;
@@ -34,9 +35,7 @@
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.impl.GenericKeyedObjectPoolFactory;
 import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.apache.cayenne.ConfigurationException;
 
 /**
  * An implementation of DataSourceFactory that instantiates a DataSource from Apache
@@ -46,154 +45,154 @@
  * properties file:
  * 
  * <pre>
- * 
  *  
  *   
  *    
  *     
- *           #
- *           # This file defines the configuration properties for Commons DBCP pool
- *           # which is used for Cayenne during some of the test cases. 
- *           # For more info on setting parameters see the documentation for commons
- *           # dbcp and commons pool. The following prefixes are required:
- *           # cayenne.dbcp.&lt;param&gt; = configure the connection pool
- *           # cayenne.dbcp.ps.&lt;param&gt; = configuration for the prepared connection pools
- *           # that are associated with each pooled connections
- *          
- *          
- *           #driver class to use to connect to the database
- *           cayenne.dbcp.driverClassName=net.sourceforge.jtds.jdbc.Driver
- *          
- *           #url to the database, the parameters should be part of the connection string
- *           #and not here
- *           cayenne.dbcp.url=jdbc:jtds:sqlserver://192.168.20.2:1433/x_test2;TDS=8.0
- *          
- *           #username to use to connect to the database
- *           cayenne.dbcp.username=garyj
- *          
- *           #password to use to connect to the database
- *           cayenne.dbcp.password=somepass
- *          
- *           #maximum number of active connections
- *           cayenne.dbcp.maxActive=500
- *          
- *           #minimum number of idle connections
- *           cayenne.dbcp.minIdle=10
- *          
- *           #maximum number of active connections that can remain idle in the pool
- *           cayenne.dbcp.maxIdle=10
- *          
- *           #maximum number of milliseconds to wait for a connection to be returned to the 
- *           #pool before throwing an exception when the connection is required and the pool
- *           #is exhaused of the active connections. -1 for indefinetly
- *           cayenne.dbcp.maxWait=10000
- *          
- *           #sql query to be used to validate connections from the pool. Must return
- *           #at least one row
- *           cayenne.dbcp.validationQuery=SELECT GETDATE()
- *          
- *           #should the object be validated when it is borrowed from the pool
- *           cayenne.dbcp.testOnBorrow=false
- *          
- *           #should the object be validated when it is returned to the pool
- *           cayenne.dbcp.testOnReturn=true
- *          
- *           #should the object be validated when it is idle
- *           cayenne.dbcp.testWhileIdle=true
- *          
- *           #number of milliseconds to sleep between runs of the idle object evictor thread
- *           cayenne.dbcp.timeBetweenEvictionRunsMillis=120000
- *          
- *          
- *           #number of objects to examin during each run of the idle object evictor
- *           cayenne.dbcp.numTestsPerEvictionRun=10
- *          
- *           #minimum time an object may sit idle in the pool before it is elegible for
- *           #an eviction
- *           cayenne.dbcp.minEvictableIdleTimeMillis=2000000
- *          
- *           #action to take the the pool is exhausted of all active connections
- *           #see GenericObjectPool class
- *           #this value can be set as either an int or a String the setter method
- *           #will attempt to convert the String value to it's resective representation
- *           #in the GenericObjectPool class and if successfull will use the byte 
- *           #value as the config paramter to the pool. If not the default value will
- *           #be used
- *           cayenne.dbcp.whenExhaustedAction=WHEN_EXHAUSTED_GROW
- *          
- *           #The default auto-commit state of connections created by this pool
- *           caynne.dbcp.defaultAutoCommit=false
- *          
- *           #Default read only state of connections created by the pool. Can be left
- *           #as null for driver default
- *           cayenne.dbcp.defaultReadOnly=true
- *          
- *          
- *           # Default TransactionIsolation state of connections created by this pool. This can
- *           # be either a String representation of the isolation level defined in the interface 
- *           # java.sql.Connection. Can be left as null for 
- *           # driver default
- *           cayenne.dbcp.defaultTransactionIsolation=TRANSACTION_SERIALIZABLE
- *          
- *           #If set to true the application will be able to get access to the
- *           #actual connection object which is normally wrapped by a poolable connections
- *           cayenne.dbcp.accessToUnderlyingConnectionAllowed=true
- *          
- *           #Default catalog of connections created by this pool
- *           cayenne.dbcp.defaultCatalog=someCat
- *          
- *           #Specifies whether prepared statments should be pooled
- *           cayenne.dbcp.poolPreparedStatements=true
- *          
- *          
- *           #Controlls the maximum number of objects that can be borrowed from the pool at 
- *           #one time
- *           cayenne.dbcp.ps.maxActive=500
- *          
- *           #Maximum number of idle objects in the pool
- *           cayenne.dbcp.ps.maxIdle=50
- *          
- *           #Maximum number of objects that can exist in the prepared statement pool at one time
- *           cayenne.dbcp.ps.maxTotal=600
- *          
- *          
- *           # Minimum number of milliseconds to wait for an objec the the pool of 
- *           # prepared statements is exhausted and the whenExhaustedAction is set to 
- *           # 1 (WHEN_EXHAUSTED_BLOCK)
- *           cayenne.dbcp.ps.maxWait=10000
- *          
- *          
- *           # Number of milliseconds an object can sit idle in the pool before it is 
- *           # elegible for eviction
- *           cayenne.dbcp.ps.minEvictableIdleTimeMillis=2000000
- *          
- *          
- *           #Number of idle objects that should be examined per eviction run
- *           cayenne.dbcp.ps.numTestsPerEvictionRun=20
- *          
- *          
- *           #Specifies whether objects should be validated before they are borrowed from this pool
- *           cayenne.dbcp.ps.testOnBorrow=false
- *          
- *           #Specifies whether objects should be validated when they are returned to the pool
- *           cayenne.dbcp.ps.testOnReturn=true
- *          
- *          
- *           #Specifies whether objects should be validated in the idle eviction thread
- *           cayenne.dbcp.ps.testWhileIdle=true
- *          
- *           #Specifies the time between the runs of the eviction thread
- *           cayenne.dbcp.ps.timeBetweenEvictionRunsMillis=120000
- *          
- *           # action to take when the the pool is exhausted of all active objects.
- *           # acceptable values are strings (WHEN_EXHAUSTED_FAIL, WHEN_EXHAUSTED_BLOCK (default), 
- *           # WHEN_EXHAUSTED_GROW), or their corresponding int values defined in commons-pool GenericObjectPool:
- *           cayenne.dbcp.ps.whenExhaustedAction=WHEN_EXHAUSTED_FAIL
+ *      
+ *            #
+ *            # This file defines the configuration properties for Commons DBCP pool
+ *            # which is used for Cayenne during some of the test cases. 
+ *            # For more info on setting parameters see the documentation for commons
+ *            # dbcp and commons pool. The following prefixes are required:
+ *            # cayenne.dbcp.&lt;param&gt; = configure the connection pool
+ *            # cayenne.dbcp.ps.&lt;param&gt; = configuration for the prepared connection pools
+ *            # that are associated with each pooled connections
+ *           
+ *           
+ *            #driver class to use to connect to the database
+ *            cayenne.dbcp.driverClassName=net.sourceforge.jtds.jdbc.Driver
+ *           
+ *            #url to the database, the parameters should be part of the connection string
+ *            #and not here
+ *            cayenne.dbcp.url=jdbc:jtds:sqlserver://192.168.20.2:1433/x_test2;TDS=8.0
+ *           
+ *            #username to use to connect to the database
+ *            cayenne.dbcp.username=garyj
+ *           
+ *            #password to use to connect to the database
+ *            cayenne.dbcp.password=somepass
+ *           
+ *            #maximum number of active connections
+ *            cayenne.dbcp.maxActive=500
+ *           
+ *            #minimum number of idle connections
+ *            cayenne.dbcp.minIdle=10
+ *           
+ *            #maximum number of active connections that can remain idle in the pool
+ *            cayenne.dbcp.maxIdle=10
+ *           
+ *            #maximum number of milliseconds to wait for a connection to be returned to the 
+ *            #pool before throwing an exception when the connection is required and the pool
+ *            #is exhaused of the active connections. -1 for indefinetly
+ *            cayenne.dbcp.maxWait=10000
+ *           
+ *            #sql query to be used to validate connections from the pool. Must return
+ *            #at least one row
+ *            cayenne.dbcp.validationQuery=SELECT GETDATE()
+ *           
+ *            #should the object be validated when it is borrowed from the pool
+ *            cayenne.dbcp.testOnBorrow=false
+ *           
+ *            #should the object be validated when it is returned to the pool
+ *            cayenne.dbcp.testOnReturn=true
+ *           
+ *            #should the object be validated when it is idle
+ *            cayenne.dbcp.testWhileIdle=true
+ *           
+ *            #number of milliseconds to sleep between runs of the idle object evictor thread
+ *            cayenne.dbcp.timeBetweenEvictionRunsMillis=120000
+ *           
+ *           
+ *            #number of objects to examin during each run of the idle object evictor
+ *            cayenne.dbcp.numTestsPerEvictionRun=10
+ *           
+ *            #minimum time an object may sit idle in the pool before it is elegible for
+ *            #an eviction
+ *            cayenne.dbcp.minEvictableIdleTimeMillis=2000000
+ *           
+ *            #action to take the the pool is exhausted of all active connections
+ *            #see GenericObjectPool class
+ *            #this value can be set as either an int or a String the setter method
+ *            #will attempt to convert the String value to it's resective representation
+ *            #in the GenericObjectPool class and if successfull will use the byte 
+ *            #value as the config paramter to the pool. If not the default value will
+ *            #be used
+ *            cayenne.dbcp.whenExhaustedAction=WHEN_EXHAUSTED_GROW
+ *           
+ *            #The default auto-commit state of connections created by this pool
+ *            caynne.dbcp.defaultAutoCommit=false
+ *           
+ *            #Default read only state of connections created by the pool. Can be left
+ *            #as null for driver default
+ *            cayenne.dbcp.defaultReadOnly=true
+ *           
+ *           
+ *            # Default TransactionIsolation state of connections created by this pool. This can
+ *            # be either a String representation of the isolation level defined in the interface 
+ *            # java.sql.Connection. Can be left as null for 
+ *            # driver default
+ *            cayenne.dbcp.defaultTransactionIsolation=TRANSACTION_SERIALIZABLE
+ *           
+ *            #If set to true the application will be able to get access to the
+ *            #actual connection object which is normally wrapped by a poolable connections
+ *            cayenne.dbcp.accessToUnderlyingConnectionAllowed=true
+ *           
+ *            #Default catalog of connections created by this pool
+ *            cayenne.dbcp.defaultCatalog=someCat
+ *           
+ *            #Specifies whether prepared statments should be pooled
+ *            cayenne.dbcp.poolPreparedStatements=true
+ *           
+ *           
+ *            #Controlls the maximum number of objects that can be borrowed from the pool at 
+ *            #one time
+ *            cayenne.dbcp.ps.maxActive=500
+ *           
+ *            #Maximum number of idle objects in the pool
+ *            cayenne.dbcp.ps.maxIdle=50
+ *           
+ *            #Maximum number of objects that can exist in the prepared statement pool at one time
+ *            cayenne.dbcp.ps.maxTotal=600
+ *           
+ *           
+ *            # Minimum number of milliseconds to wait for an objec the the pool of 
+ *            # prepared statements is exhausted and the whenExhaustedAction is set to 
+ *            # 1 (WHEN_EXHAUSTED_BLOCK)
+ *            cayenne.dbcp.ps.maxWait=10000
+ *           
+ *           
+ *            # Number of milliseconds an object can sit idle in the pool before it is 
+ *            # elegible for eviction
+ *            cayenne.dbcp.ps.minEvictableIdleTimeMillis=2000000
+ *           
+ *           
+ *            #Number of idle objects that should be examined per eviction run
+ *            cayenne.dbcp.ps.numTestsPerEvictionRun=20
+ *           
+ *           
+ *            #Specifies whether objects should be validated before they are borrowed from this pool
+ *            cayenne.dbcp.ps.testOnBorrow=false
+ *           
+ *            #Specifies whether objects should be validated when they are returned to the pool
+ *            cayenne.dbcp.ps.testOnReturn=true
+ *           
+ *           
+ *            #Specifies whether objects should be validated in the idle eviction thread
+ *            cayenne.dbcp.ps.testWhileIdle=true
+ *           
+ *            #Specifies the time between the runs of the eviction thread
+ *            cayenne.dbcp.ps.timeBetweenEvictionRunsMillis=120000
+ *           
+ *            # action to take when the the pool is exhausted of all active objects.
+ *            # acceptable values are strings (WHEN_EXHAUSTED_FAIL, WHEN_EXHAUSTED_BLOCK (default), 
+ *            # WHEN_EXHAUSTED_GROW), or their corresponding int values defined in commons-pool GenericObjectPool:
+ *            cayenne.dbcp.ps.whenExhaustedAction=WHEN_EXHAUSTED_FAIL
+ *       
  *      
  *     
  *    
  *   
- *  
  * </pre>
  * 
  * @since 1.2
@@ -226,13 +225,6 @@
 
     public void initializeWithParentConfiguration(Configuration parentConfiguration) {
         this.parentConfiguration = parentConfiguration;
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public DataSource getDataSource(String location, Level logLevel) throws Exception {
-        return getDataSource(location);
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DataSourceFactory.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DataSourceFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DataSourceFactory.java Wed Jul 19 21:04:04 2006
@@ -21,8 +21,6 @@
 
 import javax.sql.DataSource;
 
-import org.apache.log4j.Level;
-
 /**
  * A pluggable factory for javax.sql.DataSource instances used by Cayenne runtime.
  */
@@ -39,9 +37,4 @@
      * etc.
      */
     public DataSource getDataSource(String location) throws Exception;
-
-    /**
-     * @deprecated since 1.2 use and implement "getDataSource(String)" instead.
-     */
-    public DataSource getDataSource(String location, Level logLevel) throws Exception;
 }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DriverDataSourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DriverDataSourceFactory.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DriverDataSourceFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DriverDataSourceFactory.java Wed Jul 19 21:04:04 2006
@@ -23,14 +23,13 @@
 
 import javax.sql.DataSource;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.apache.cayenne.ConfigurationException;
 import org.apache.cayenne.access.ConnectionLogger;
 import org.apache.cayenne.access.QueryLogger;
 import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.conn.PoolManager;
 import org.apache.cayenne.util.Util;
+import org.apache.log4j.Logger;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -69,13 +68,6 @@
         this.parentConfiguration = parentConfiguration;
     }
 
-    /**
-     * @deprecated since 1.2
-     */
-    public DataSource getDataSource(String location, Level logLevel) throws Exception {
-        return this.getDataSource(location);
-    }
-
     public DataSource getDataSource(String location) throws Exception {
         this.load(location);
 
@@ -149,7 +141,7 @@
                 new DriverHandler(parser, this).init(localName, atts);
             }
             else {
-                logObj.info( "<driver> must be the root element. <"
+                logObj.info("<driver> must be the root element. <"
                         + localName
                         + "> is unexpected.");
                 throw new SAXException("Config file is not of expected XML type. '"
@@ -168,7 +160,7 @@
 
         public void init(String name, Attributes attrs) {
             String className = attrs.getValue("", "class");
-            logObj.info( "loading driver " + className);
+            logObj.info("loading driver " + className);
             driverInfo = new DataSourceInfo();
             driverInfo.setJdbcDriver(className);
         }
@@ -195,7 +187,7 @@
                         .init(localName, atts, driverInfo);
             }
             else {
-                logObj.info( "<login, url, connectionPool> are valid. <"
+                logObj.info("<login, url, connectionPool> are valid. <"
                         + localName
                         + "> is unexpected.");
                 throw new SAXException("Config file is not of expected XML type");
@@ -220,7 +212,7 @@
                 throws SAXException {
             driverInfo.setDataSourceUrl(atts.getValue("value"));
             if (driverInfo.getDataSourceUrl() == null) {
-                logObj.info( "error: <url> has no 'value'.");
+                logObj.info("error: <url> has no 'value'.");
                 throw new SAXException("'<url value=' attribute is required.");
             }
         }
@@ -269,7 +261,7 @@
                     driverInfo.setMaxConnections(Integer.parseInt(max));
             }
             catch (NumberFormatException nfex) {
-                logObj.info( "Error loading numeric attribute", nfex);
+                logObj.info("Error loading numeric attribute", nfex);
                 throw new SAXException("Error reading numeric attribute.", nfex);
             }
         }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java Wed Jul 19 21:04:04 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.conf;
 
 import javax.naming.Context;
@@ -25,15 +24,14 @@
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.apache.cayenne.access.QueryLogger;
 import org.apache.cayenne.util.Util;
+import org.apache.log4j.Logger;
 
 /**
  * Looks up DataSource objects via JNDI.
  * 
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public class JNDIDataSourceFactory implements DataSourceFactory {
 
@@ -46,16 +44,6 @@
     }
 
     /**
-     * Returns DataSource object corresponding to <code>location</code>. Location is
-     * expected to be a path mapped in JNDI InitialContext.
-     * 
-     * @deprecated since 1.2
-     */
-    public DataSource getDataSource(String location, Level logLevel) throws Exception {
-        return getDataSource(location);
-    }
-
-    /**
      * Attempts to load DataSource using JNDI. In case of failure tries to get the
      * DataSource with the same name from CayenneModeler preferences.
      */
@@ -109,8 +97,7 @@
         // reflection ...
 
         DataSourceFactory prefsFactory = (DataSourceFactory) Class
-                .forName(
-                        "org.apache.cayenne.modeler.pref.PreferencesDataSourceFactory")
+                .forName("org.apache.cayenne.modeler.pref.PreferencesDataSourceFactory")
                 .newInstance();
 
         prefsFactory.initializeWithParentConfiguration(parentConfig);

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/RuntimeLoadDelegate.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/RuntimeLoadDelegate.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/RuntimeLoadDelegate.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/RuntimeLoadDelegate.java Wed Jul 19 21:04:04 2006
@@ -26,8 +26,6 @@
 
 import javax.sql.DataSource;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.apache.cayenne.ConfigurationException;
 import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.access.DataNode;
@@ -35,6 +33,7 @@
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.MapLoader;
+import org.apache.log4j.Logger;
 import org.xml.sax.InputSource;
 
 /**
@@ -49,7 +48,7 @@
     // upgrade, or implement some consistent upgrade API across variou loaders
     final static String _1_2_PACKAGE_PREFIX = "org.objectstyle.cayenne.";
     final static String _2_0_PACKAGE_PREFIX = "org.apache.cayenne.";
-    
+
     private static Logger logObj = Logger.getLogger(RuntimeLoadDelegate.class);
 
     protected Map domains = new HashMap();
@@ -58,13 +57,6 @@
     protected Configuration config;
     protected long startTime;
 
-    /**
-     * @deprecated since 1.2
-     */
-    public RuntimeLoadDelegate(Configuration config, ConfigStatus status, Level logLevel) {
-        this(config, status);
-    }
-
     public RuntimeLoadDelegate(Configuration config, ConfigStatus status) {
 
         this.config = config;
@@ -230,9 +222,10 @@
             return null;
         }
     }
-    
+
     /**
-     * Creates a new DataNode. Subclasses may override this method to provide a custom node class.
+     * Creates a new DataNode. Subclasses may override this method to provide a custom
+     * node class.
      * 
      * @since 1.
      */
@@ -258,14 +251,14 @@
         if (nodeName == null) {
             throw new ConfigurationException("Error: <node> without 'name'.");
         }
-        
+
         factory = convertClassNameFromV1_2(factory);
         adapter = convertClassNameFromV1_2(adapter);
 
         if (dataSource == null) {
             logObj.info("Warning: <node> '" + nodeName + "' has no 'datasource'.");
         }
-   
+
         if (factory == null) {
             if (config.getDataSourceFactory() != null) {
                 logObj.info("Warning: <node> '" + nodeName + "' without 'factory'.");
@@ -325,7 +318,7 @@
                     "can't load node, unknown domain: " + domainName);
         }
     }
-    
+
     /**
      * @since 2.0
      */
@@ -435,24 +428,6 @@
      */
     public void setConfig(Configuration config) {
         this.config = config;
-    }
-
-    /**
-     * Returns the logLevel.
-     * 
-     * @deprecated since 1.2
-     */
-    public Level getLogLevel() {
-        return Level.INFO;
-    }
-
-    /**
-     * Sets the logLevel.
-     * 
-     * @deprecated since 1.2
-     */
-    public void setLogLevel(Level logLevel) {
-        // noop
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java Wed Jul 19 21:04:04 2006
@@ -29,9 +29,7 @@
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.OperationObserver;
 import org.apache.cayenne.access.QueryLogger;
-import org.apache.cayenne.access.QueryTranslator;
 import org.apache.cayenne.access.trans.QualifierTranslator;
 import org.apache.cayenne.access.trans.QueryAssembler;
 import org.apache.cayenne.access.types.ExtendedTypeMap;
@@ -50,7 +48,6 @@
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.query.BatchQuery;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.SQLAction;
 
@@ -178,20 +175,6 @@
         return getAdapter().getBatchTerminator();
     }
 
-    /**
-     * @deprecated since 1.2 this method is deprecated in DbAdapter interface.
-     */
-    public DataNode createDataNode(String name) {
-        return getAdapter().createDataNode(name);
-    }
-
-    /**
-     * @deprecated since 1.2 this method is deprecated in DbAdapter interface.
-     */
-    public QueryTranslator getQueryTranslator(Query query) throws Exception {
-        return getAdapter().getQueryTranslator(query);
-    }
-
     public QualifierTranslator getQualifierTranslator(QueryAssembler queryAssembler) {
         return getAdapter().getQualifierTranslator(queryAssembler);
     }
@@ -287,16 +270,5 @@
 
     public String tableTypeForView() {
         return getAdapter().tableTypeForView();
-    }
-
-    /**
-     * @deprecated since 1.2 this method is deprecated in DbAdapter interface.
-     */
-    public boolean shouldRunBatchQuery(
-            DataNode node,
-            Connection con,
-            BatchQuery query,
-            OperationObserver delegate) throws SQLException, Exception {
-        return getAdapter().shouldRunBatchQuery(node, con, query, delegate);
     }
 }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/DbAdapter.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/DbAdapter.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/DbAdapter.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/DbAdapter.java Wed Jul 19 21:04:04 2006
@@ -16,25 +16,19 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-
-
 package org.apache.cayenne.dba;
 
-import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Collection;
 
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.OperationObserver;
-import org.apache.cayenne.access.QueryTranslator;
 import org.apache.cayenne.access.trans.QualifierTranslator;
 import org.apache.cayenne.access.trans.QueryAssembler;
 import org.apache.cayenne.access.types.ExtendedTypeMap;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.query.BatchQuery;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.SQLAction;
 
@@ -59,27 +53,6 @@
      */
     public String getBatchTerminator();
 
-    /**
-     * Creates an returns a named instance of a DataNode.
-     * 
-     * @deprecated since 1.2 this method is not used as node behavior customization is
-     *             done via SQLActionVisitor.
-     */
-    public DataNode createDataNode(String name);
-
-    /**
-     * Creates and returns a QueryTranslator appropriate for the specified
-     * <code>query</code> parameter. Sets translator "query" and "adapter" property.
-     * <p>
-     * This factory method allows subclasses to specify their own translators that
-     * implement vendor-specific optimizations.
-     * </p>
-     * 
-     * @deprecated since 1.2 this method is unneeded as customizations are done via custom
-     *             SQLActions.
-     */
-    public QueryTranslator getQueryTranslator(Query query) throws Exception;
-
     // TODO: deprecate and move into SQLAction implementation
     public QualifierTranslator getQualifierTranslator(QueryAssembler queryAssembler);
 
@@ -200,13 +173,4 @@
      * <code>DatabaseMetaData.getTableTypes</code>) for a view table.
      */
     public String tableTypeForView();
-
-    /**
-     * @deprecated Since 1.2 this method is obsolete and is ignored across Cayenne.
-     */
-    public boolean shouldRunBatchQuery(
-            DataNode node,
-            Connection con,
-            BatchQuery query,
-            OperationObserver delegate) throws SQLException, Exception;
 }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcAdapter.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcAdapter.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcAdapter.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcAdapter.java Wed Jul 19 21:04:04 2006
@@ -21,7 +21,6 @@
 package org.apache.cayenne.dba;
 
 import java.net.URL;
-import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Collection;
@@ -29,14 +28,8 @@
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.OperationObserver;
-import org.apache.cayenne.access.QueryTranslator;
-import org.apache.cayenne.access.trans.DeleteTranslator;
-import org.apache.cayenne.access.trans.ProcedureTranslator;
 import org.apache.cayenne.access.trans.QualifierTranslator;
 import org.apache.cayenne.access.trans.QueryAssembler;
-import org.apache.cayenne.access.trans.SelectTranslator;
-import org.apache.cayenne.access.trans.UpdateTranslator;
 import org.apache.cayenne.access.types.BooleanType;
 import org.apache.cayenne.access.types.ByteArrayType;
 import org.apache.cayenne.access.types.CharType;
@@ -48,13 +41,8 @@
 import org.apache.cayenne.map.DbJoin;
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.DerivedDbEntity;
-import org.apache.cayenne.query.BatchQuery;
-import org.apache.cayenne.query.DeleteQuery;
-import org.apache.cayenne.query.ProcedureQuery;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.SQLAction;
-import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.query.UpdateQuery;
 import org.apache.cayenne.util.ResourceLocator;
 import org.apache.cayenne.util.Util;
 
@@ -173,58 +161,6 @@
     }
 
     /**
-     * @deprecated since 1.2 this method is unneeded as customizations are done via custom
-     *             SQLActions.
-     */
-    public QueryTranslator getQueryTranslator(Query query) throws Exception {
-        Class queryClass = queryTranslatorClass(query);
-
-        try {
-            QueryTranslator t = (QueryTranslator) queryClass.newInstance();
-            t.setQuery(query);
-            t.setAdapter(this);
-            return t;
-        }
-        catch (Exception ex) {
-            throw new CayenneRuntimeException("Can't load translator class: "
-                    + queryClass);
-        }
-    }
-
-    /**
-     * Returns a class of the query translator that should be used to translate the query
-     * <code>q</code> to SQL. Exists mainly for the benefit of subclasses that can
-     * override this method providing their own translator.
-     * 
-     * @deprecated since 1.2 this method is unneeded as customizations are done via custom
-     *             SQLActions.
-     */
-    protected Class queryTranslatorClass(Query q) {
-        if (q == null) {
-            throw new NullPointerException("Null query.");
-        }
-        else if (q instanceof SelectQuery) {
-            return SelectTranslator.class;
-        }
-        else if (q instanceof UpdateQuery) {
-            return UpdateTranslator.class;
-        }
-        else if (q instanceof org.apache.cayenne.query.InsertQuery) {
-            return org.apache.cayenne.access.trans.InsertTranslator.class;
-        }
-        else if (q instanceof DeleteQuery) {
-            return DeleteTranslator.class;
-        }
-        else if (q instanceof ProcedureQuery) {
-            return ProcedureTranslator.class;
-        }
-        else {
-            throw new CayenneRuntimeException("Unrecognized query class..."
-                    + q.getClass().getName());
-        }
-    }
-
-    /**
      * Returns true.
      */
     public boolean supportsFkConstraints() {
@@ -493,18 +429,6 @@
     }
 
     /**
-     * Creates an instance of DataNode class.
-     * 
-     * @deprecated since 1.2 this method is not used as node behavior customization is
-     *             done via SQLActionVisitor.
-     */
-    public DataNode createDataNode(String name) {
-        DataNode node = new DataNode(name);
-        node.setAdapter(this);
-        return node;
-    }
-
-    /**
      * Uses JdbcActionBuilder to create the right action.
      * 
      * @since 1.2
@@ -551,18 +475,5 @@
      */
     public void setSupportsGeneratedKeys(boolean flag) {
         this.supportsGeneratedKeys = flag;
-    }
-
-    /**
-     * Always returns <code>true</code>, letting DataNode to handle the query.
-     * 
-     * @deprecated Since 1.2 this method is obsolete and is ignored across Cayenne.
-     */
-    public boolean shouldRunBatchQuery(
-            DataNode node,
-            Connection con,
-            BatchQuery query,
-            OperationObserver delegate) throws SQLException, Exception {
-        return true;
     }
 }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcPkGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcPkGenerator.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcPkGenerator.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcPkGenerator.java Wed Jul 19 21:04:04 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.dba;
 
 import java.sql.Connection;
@@ -33,7 +32,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Level;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.OperationObserver;
@@ -42,7 +40,6 @@
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbKeyGenerator;
-import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.SQLTemplate;
 import org.apache.cayenne.util.IDUtil;
@@ -51,38 +48,15 @@
  * Default primary key generator implementation. Uses a lookup table named
  * "AUTO_PK_SUPPORT" to search and increment primary keys for tables.
  * 
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public class JdbcPkGenerator implements PkGenerator {
 
     public static final int DEFAULT_PK_CACHE_SIZE = 20;
 
-    /**
-     * @deprecated Since 1.2 unused.
-     */
-    protected static final String NEXT_ID = "NEXT_ID";
-
-    /**
-     * @deprecated Since 1.2 unused.
-     */
-    protected static final ObjAttribute[] objDesc = new ObjAttribute[] {
-        new ObjAttribute("nextId", Integer.class.getName(), null)
-    };
-
-    /**
-     * @deprecated Since 1.2 unused.
-     */
-    protected static final DbAttribute[] resultDesc = new DbAttribute[] {
-        new DbAttribute(NEXT_ID, Types.INTEGER, null)
-    };
-
     protected Map pkCache = new HashMap();
     protected int pkCacheSize = DEFAULT_PK_CACHE_SIZE;
 
-    static {
-        objDesc[0].setDbAttributePath(NEXT_ID);
-    }
-
     public void createAutoPk(DataNode node, List dbEntities) throws Exception {
         // check if a table exists
 
@@ -237,16 +211,6 @@
     }
 
     /**
-     * @deprecated Since 1.2 corresponding interface method is deprecated.
-     */
-    public String generatePkForDbEntityString(DbEntity ent) {
-        StringBuffer buf = new StringBuffer();
-        buf.append(pkSelectString(ent.getName())).append('\n').append(
-                pkUpdateString(ent.getName()));
-        return buf.toString();
-    }
-
-    /**
      * <p>
      * Generates new (unique and non-repeating) primary key for specified dbEntity.
      * </p>
@@ -378,13 +342,6 @@
 
         PkRetrieveProcessor(String entityName) {
             this.entityName = entityName;
-        }
-
-        /**
-         * @deprecated since 1.2 super is deprecated
-         */
-        public Level getLoggingLevel() {
-            return null;
         }
 
         public boolean isIteratedResult() {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/PkGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/PkGenerator.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/PkGenerator.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/PkGenerator.java Wed Jul 19 21:04:04 2006
@@ -28,7 +28,7 @@
 /**
  * Defines methods to support automatic primary key generation.
  * 
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public interface PkGenerator {
 
@@ -70,14 +70,6 @@
      * @param ent DbEntity for which automatic PK is generated.
      */
     Object generatePkForDbEntity(DataNode dataNode, DbEntity ent) throws Exception;
-
-    /**
-     * Returns SQL string that can generate new (unique and non-repeating) primary key for
-     * specified DbEntity. No actual database operations are performed.
-     * 
-     * @deprecated Since 1.2. This method is not used.
-     */
-    String generatePkForDbEntityString(DbEntity ent);
 
     /**
      * Resets any cached primary keys forcing generator to go to the database next time id

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java Wed Jul 19 21:04:04 2006
@@ -43,13 +43,6 @@
 public class OpenBasePkGenerator extends JdbcPkGenerator {
 
     /**
-     * @deprecated Since 1.2 corresponding interface method is unused and deprecated.
-     */
-    public String generatePkForDbEntityString(DbEntity ent) {
-        return newIDString(ent);
-    }
-
-    /**
      * Returns a non-repeating primary key for a given entity. Since OpenBase-specific
      * mechanism is used, key caching is disabled. Instead a database operation is
      * performed on every call.
@@ -68,7 +61,7 @@
      * Executed SQL looks like this:
      * 
      * <pre>
-     * NEWID FOR Table Column
+     *  NEWID FOR Table Column
      * </pre>
      * 
      * COLUMN must be marked as UNIQUE in order for this to work properly.

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/oracle/OracleAdapter.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/oracle/OracleAdapter.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/oracle/OracleAdapter.java Wed Jul 19 21:04:04 2006
@@ -17,22 +17,17 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.dba.oracle;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.OperationObserver;
 import org.apache.cayenne.access.trans.QualifierTranslator;
 import org.apache.cayenne.access.trans.QueryAssembler;
 import org.apache.cayenne.access.trans.TrimmingQualifierTranslator;
@@ -50,9 +45,9 @@
 import org.apache.cayenne.query.InsertBatchQuery;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.SQLAction;
-import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.query.UpdateBatchQuery;
 import org.apache.cayenne.util.Util;
+import org.apache.log4j.Logger;
 
 /**
  * DbAdapter implementation for <a href="http://www.oracle.com">Oracle RDBMS </a>. Sample
@@ -60,15 +55,15 @@
  * settings </a> to use with Oracle are shown below:
  * 
  * <pre>
- *       
  *        
- *         test-oracle.cayenne.adapter = org.apache.cayenne.dba.oracle.OracleAdapter
- *         test-oracle.jdbc.username = test
- *         test-oracle.jdbc.password = secret
- *         test-oracle.jdbc.url = jdbc:oracle:thin:@192.168.0.20:1521:ora1 
- *         test-oracle.jdbc.driver = oracle.jdbc.driver.OracleDriver
  *         
- *        
+ *          test-oracle.cayenne.adapter = org.apache.cayenne.dba.oracle.OracleAdapter
+ *          test-oracle.jdbc.username = test
+ *          test-oracle.jdbc.password = secret
+ *          test-oracle.jdbc.url = jdbc:oracle:thin:@192.168.0.20:1521:ora1 
+ *          test-oracle.jdbc.driver = oracle.jdbc.driver.OracleDriver
+ *          
+ *         
  * </pre>
  * 
  * @author Andrei Adamchik
@@ -282,20 +277,6 @@
     }
 
     /**
-     * Returns Oracle-specific translator for object SELECT queries.
-     * 
-     * @deprecated Since 1.2 this is done via custom SQLActions.
-     */
-    protected Class queryTranslatorClass(Query q) {
-        if (q instanceof SelectQuery) {
-            return OracleSelectTranslator.class;
-        }
-        else {
-            return super.queryTranslatorClass(q);
-        }
-    }
-
-    /**
      * Returns a trimming translator.
      */
     public QualifierTranslator getQualifierTranslator(QueryAssembler queryAssembler) {
@@ -312,32 +293,6 @@
     public SQLAction getAction(Query query, DataNode node) {
         return query.createSQLAction(new OracleActionBuilder(this, node
                 .getEntityResolver()));
-    }
-
-    /**
-     * Implements special LOB handling in batches.
-     * 
-     * @deprecated Since 1.2
-     */
-    public boolean shouldRunBatchQuery(
-            DataNode node,
-            Connection con,
-            BatchQuery query,
-            OperationObserver delegate) throws SQLException, Exception {
-
-        // special handling for LOB updates
-        if (isSupportsOracleLOB()
-                && OracleAdapter.updatesLOBColumns(query)
-                && (node instanceof OracleDataNode)) {
-
-            OracleDataNode oracleNode = (OracleDataNode) node;
-            oracleNode.runBatchUpdateWithLOBColumns(con, query, delegate);
-
-            return false;
-        }
-        else {
-            return super.shouldRunBatchQuery(node, con, query, delegate);
-        }
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java Wed Jul 19 21:04:04 2006
@@ -27,7 +27,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.log4j.Level;
 import org.apache.cayenne.access.OperationObserver;
 import org.apache.cayenne.access.QueryLogger;
 import org.apache.cayenne.access.ResultIterator;
@@ -197,13 +196,6 @@
 
         public void nextQueryException(Query query, Exception ex) {
             observer.nextQueryException(query, ex);
-        }
-
-        /**
-         * @deprecated Unused since 1.2
-         */
-        public Level getLoggingLevel() {
-            return observer.getLoggingLevel();
         }
 
         public boolean isIteratedResult() {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridge.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridge.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridge.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridge.java Wed Jul 19 21:04:04 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.event;
 
 import java.util.ArrayList;
@@ -27,7 +26,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 
-import org.apache.cayenne.util.IDUtil;
 import org.apache.cayenne.util.Util;
 
 /**
@@ -60,16 +58,6 @@
 // be done by the factory singleton.
 public abstract class EventBridge implements EventListener {
 
-    /**
-     * @deprecated unused since 1.2
-     */
-    public static final String VM_ID = new String(IDUtil.pseudoUniqueByteSequence16());
-
-    /**
-     * @deprecated unused since 1.2
-     */
-    public static final String VM_ID_PROPERRTY = "VM_ID";
-
     public static final int RECEIVE_LOCAL = 1;
     public static final int RECEIVE_EXTERNAL = 2;
     public static final int RECEIVE_LOCAL_EXTERNAL = 3;
@@ -135,19 +123,6 @@
     }
 
     /**
-     * Returns a subject used for events within the local JVM.
-     * 
-     * @deprecated since 1.2 EventBridge supports multiple local subjects, so use
-     *             'getLocalSubjects()' instead. This method returns the first subject
-     *             from the subject array for backwards compatibility.
-     */
-    public EventSubject getLocalSubject() {
-        return localSubjects.size() > 0
-                ? (EventSubject) localSubjects.iterator().next()
-                : null;
-    }
-
-    /**
      * Returns a Collection of local EventSubjects.
      * 
      * @since 1.2
@@ -334,18 +309,6 @@
             throw new IllegalStateException(
                     "Can't post events. EventBridge was not started properly. "
                             + "EventManager is null.");
-        }
-    }
-
-    /**
-     * Invoked by local EventManager when a local event of interest occurred. Internally
-     * delegates to "sendExternalEvent" abstract method.
-     * 
-     * @deprecated Unused since 1.2, as event dispatch is done via internal listeners.
-     */
-    public void onLocalEvent(CayenneEvent event) throws Exception {
-        if (event.getSource() != getExternalEventSource()) {
-            sendExternalEvent(event);
         }
     }
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridgeFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridgeFactory.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridgeFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridgeFactory.java Wed Jul 19 21:04:04 2006
@@ -31,11 +31,6 @@
 public interface EventBridgeFactory {
 
     /**
-     * @deprecated since 1.2 EventBridge must support multiple subjects.
-     */
-    EventBridge createEventBridge(EventSubject localSubject, Map properties);
-
-    /**
      * Creates an EventBridge with the specified parameters.
      * 
      * @since 1.2

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JMSBridgeFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JMSBridgeFactory.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JMSBridgeFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JMSBridgeFactory.java Wed Jul 19 21:04:04 2006
@@ -20,7 +20,6 @@
 package org.apache.cayenne.event;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -37,14 +36,6 @@
 
     public static final String TOPIC_CONNECTION_FACTORY_PROPERTY = "cayenne.JMSBridge.topic.connection.factory";
 
-    /**
-     * @deprecated since 1.2, as we now need to support multiple subjects.
-     */
-    public EventBridge createEventBridge(EventSubject localSubject, Map properties) {
-        return createEventBridge(Collections.singleton(localSubject), EventBridge
-                .convertToExternalSubject(localSubject), properties);
-    }
-    
     /**
      * @since 1.2
      */

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JavaGroupsBridgeFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JavaGroupsBridgeFactory.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JavaGroupsBridgeFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JavaGroupsBridgeFactory.java Wed Jul 19 21:04:04 2006
@@ -50,14 +50,6 @@
     public static final String JGROUPS_CONFIG_URL_PROPERTY = "javagroupsbridge.config.url";
 
     /**
-     * @deprecated since 1.2, as we now need to support multiple subjects.
-     */
-    public EventBridge createEventBridge(EventSubject localSubject, Map properties) {
-        return createEventBridge(Collections.singleton(localSubject), EventBridge
-                .convertToExternalSubject(localSubject), properties);
-    }
-
-    /**
      * Creates a JavaGroupsBridge instance. Since JavaGroups is not shipped with Cayenne
      * and should be installed separately, a common misconfiguration problem may be the
      * absense of JavaGroups jar file. This factory returns a dummy noop EventBridge, if
@@ -93,9 +85,9 @@
         // ClassNotFound exceptions due to JavaGroups absence.
 
         try {
-            Constructor c = Class.forName(
-                    "org.apache.cayenne.event.JavaGroupsBridge").getConstructor(
-                    new Class[] {
+            Constructor c = Class
+                    .forName("org.apache.cayenne.event.JavaGroupsBridge")
+                    .getConstructor(new Class[] {
                             Collection.class, String.class
                     });
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/XMPPBridgeFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/XMPPBridgeFactory.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/XMPPBridgeFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/XMPPBridgeFactory.java Wed Jul 19 21:04:04 2006
@@ -20,7 +20,6 @@
 package org.apache.cayenne.event;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
 
 import org.apache.cayenne.CayenneRuntimeException;
@@ -49,14 +48,6 @@
     public static final String XMPP_SECURE_CONNECTION_PROPERTY = "cayenne.XMPPBridge.xmppSecure";
     public static final String XMPP_LOGIN_PROPERTY = "cayenne.XMPPBridge.xmppLogin";
     public static final String XMPP_PASSWORD_PROPERTY = "cayenne.XMPPBridge.xmppPassword";
-
-    /**
-     * @deprecated since 1.2, as we now need to support multiple subjects.
-     */
-    public EventBridge createEventBridge(EventSubject localSubject, Map properties) {
-        return createEventBridge(Collections.singleton(localSubject), EventBridge
-                .convertToExternalSubject(localSubject), properties);
-    }
 
     public EventBridge createEventBridge(
             Collection localSubjects,

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/Expression.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/Expression.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/Expression.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/Expression.java Wed Jul 19 21:04:04 2006
@@ -115,68 +115,6 @@
     public static final int NOT_LIKE = 37;
     public static final int NOT_LIKE_IGNORE_CASE = 38;
 
-    // *** deprecated expressions
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int EXISTS = 15;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int POSITIVE = 21;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int ALL = 22;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int SOME = 23;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int ANY = 24;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int RAW_SQL = 25;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int SUBQUERY = 29;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int SUM = 32;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int COUNT = 30;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int AVG = 31;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int MAX = 33;
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static final int MIN = 34;
-
     protected int type;
 
     /**
@@ -235,8 +173,6 @@
                 return "LIKE";
             case LIKE_IGNORE_CASE:
                 return "LIKE_IGNORE_CASE";
-            case EXISTS:
-                return "EXISTS";
             case OBJ_PATH:
                 return "OBJ_PATH";
             case DB_PATH:



Mime
View raw message