cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1577846 - in /cayenne/main/trunk: cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/ cayenne-server/src/main/java/org/apache/cayenne/dba/ cayenne-server/src...
Date Sat, 15 Mar 2014 12:29:48 GMT
Author: aadamchik
Date: Sat Mar 15 12:29:47 2014
New Revision: 1577846

URL: http://svn.apache.org/r1577846
Log:
CAY-1914 Refactor EJBQL-related translators to a standalone 'org.apache.cayenne.access.translator.ejbql' package

Added:
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLAggregateColumnTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAggregateColumnTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDbPathTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDbPathTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDeleteTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDeleteTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLFromTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLGroupByTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLGroupByTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdColumnsTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdColumnsTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdentifierColumnsTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLJoinAppender.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLMultiColumnOperand.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLMultiColumnOperand.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLOrderByTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLOrderByTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLPathTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectColumnsTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTableId.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTableId.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslatorFactory.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslatorFactory.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateItemTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateItemTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateTranslator.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/JdbcEJBQLTranslatorFactory.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorTest.java
      - copied, changed from r1577841, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java
Removed:
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAggregateColumnTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDbPathTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDeleteTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLGroupByTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdColumnsTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLMultiColumnOperand.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLOrderByTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTableId.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslatorFactory.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateItemTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java
Modified:
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLConditionTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLTranslatorFactory.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLConditionTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLConditionTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLTranslatorFactory.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLConditionTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLSubselectTranslator.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLTranslatorFactory.java
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAction.java Sat Mar 15 12:29:47 2014
@@ -23,6 +23,8 @@ import java.sql.SQLException;
 
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.OperationObserver;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
 import org.apache.cayenne.dba.JdbcAdapter;
 import org.apache.cayenne.ejbql.EJBQLBaseVisitor;
 import org.apache.cayenne.ejbql.EJBQLCompiledExpression;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLAggregateColumnTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAggregateColumnTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLAggregateColumnTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLAggregateColumnTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAggregateColumnTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLAggregateColumnTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLAggregateColumnTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Collection;
 

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLConditionTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDbPathTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDbPathTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDbPathTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDbPathTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDbPathTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDbPathTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDbPathTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Collection;
 import java.util.HashMap;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDeleteTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDeleteTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDeleteTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDeleteTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDeleteTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLDeleteTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLDeleteTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import org.apache.cayenne.ejbql.EJBQLBaseVisitor;
 import org.apache.cayenne.ejbql.EJBQLExpression;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLFromTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLFromTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLFromTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLFromTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLFromTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import org.apache.cayenne.ejbql.EJBQLBaseVisitor;
 import org.apache.cayenne.ejbql.EJBQLExpression;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLGroupByTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLGroupByTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLGroupByTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLGroupByTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLGroupByTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLGroupByTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLGroupByTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Collection;
 import java.util.Iterator;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdColumnsTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdColumnsTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdColumnsTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdColumnsTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdColumnsTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdColumnsTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdColumnsTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Map;
 

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdentifierColumnsTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdentifierColumnsTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdentifierColumnsTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLIdentifierColumnsTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLIdentifierColumnsTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.HashSet;
 import java.util.Iterator;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLJoinAppender.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLJoinAppender.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLJoinAppender.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLJoinAppender.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Collection;
 import java.util.HashMap;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLMultiColumnOperand.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLMultiColumnOperand.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLMultiColumnOperand.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLMultiColumnOperand.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLMultiColumnOperand.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLMultiColumnOperand.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLMultiColumnOperand.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Collection;
 import java.util.Map;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLOrderByTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLOrderByTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLOrderByTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLOrderByTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLOrderByTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLOrderByTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLOrderByTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import org.apache.cayenne.ejbql.EJBQLBaseVisitor;
 import org.apache.cayenne.ejbql.EJBQLException;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLPathTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLPathTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLPathTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLPathTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Collection;
 import java.util.HashMap;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectColumnsTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectColumnsTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectColumnsTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectColumnsTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectColumnsTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Collection;
 import java.util.Iterator;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import org.apache.cayenne.ejbql.EJBQLBaseVisitor;
 import org.apache.cayenne.ejbql.EJBQLExpression;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTableId.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTableId.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTableId.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTableId.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTableId.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTableId.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTableId.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Iterator;
 

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslationContext.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -98,7 +98,7 @@ public class EJBQLTranslationContext {
         bufferStack.add(stackTop);
     }
 
-    SQLTemplate getQuery() {
+    public SQLTemplate getQuery() {
 
         // concatenate buffers...
         StringBuilder main = bufferChain.get(0);

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslatorFactory.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslatorFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslatorFactory.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslatorFactory.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslatorFactory.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslatorFactory.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLTranslatorFactory.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import org.apache.cayenne.ejbql.EJBQLExpressionVisitor;
 

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateItemTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateItemTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateItemTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateItemTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateItemTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateItemTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateItemTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Iterator;
 

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateTranslator.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateTranslator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateTranslator.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EJBQLUpdateTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/EJBQLUpdateTranslator.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import org.apache.cayenne.ejbql.EJBQLBaseVisitor;
 import org.apache.cayenne.ejbql.EJBQLExpression;

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/JdbcEJBQLTranslatorFactory.java (from r1577841, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/JdbcEJBQLTranslatorFactory.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/JdbcEJBQLTranslatorFactory.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JdbcEJBQLTranslatorFactory.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ejbql/JdbcEJBQLTranslatorFactory.java Sat Mar 15 12:29:47 2014
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import org.apache.cayenne.ejbql.EJBQLExpressionVisitor;
 

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java Sat Mar 15 12:29:47 2014
@@ -30,9 +30,9 @@ import java.util.List;
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.jdbc.EJBQLTranslatorFactory;
-import org.apache.cayenne.access.jdbc.JdbcEJBQLTranslatorFactory;
 import org.apache.cayenne.access.translator.batch.BatchTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
 import org.apache.cayenne.access.translator.select.QualifierTranslator;
 import org.apache.cayenne.access.translator.select.QueryAssembler;
 import org.apache.cayenne.access.types.ExtendedType;

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java Sat Mar 15 12:29:47 2014
@@ -25,8 +25,8 @@ import java.sql.Types;
 import java.util.List;
 
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.access.jdbc.EJBQLTranslatorFactory;
-import org.apache.cayenne.access.jdbc.JdbcEJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
 import org.apache.cayenne.access.translator.select.QualifierTranslator;
 import org.apache.cayenne.access.translator.select.QueryAssembler;
 import org.apache.cayenne.access.types.ByteType;

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLConditionTranslator.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLConditionTranslator.java Sat Mar 15 12:29:47 2014
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.dba.derby;
 
-import org.apache.cayenne.access.jdbc.EJBQLConditionTranslator;
-import org.apache.cayenne.access.jdbc.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.EJBQLConditionTranslator;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
 import org.apache.cayenne.ejbql.EJBQLExpression;
 
 /**

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLTranslatorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLTranslatorFactory.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLTranslatorFactory.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyEJBQLTranslatorFactory.java Sat Mar 15 12:29:47 2014
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.dba.derby;
 
-import org.apache.cayenne.access.jdbc.EJBQLTranslationContext;
-import org.apache.cayenne.access.jdbc.JdbcEJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
 import org.apache.cayenne.ejbql.EJBQLExpressionVisitor;
 
 /**

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java Sat Mar 15 12:29:47 2014
@@ -30,8 +30,8 @@ import java.util.List;
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.jdbc.EJBQLTranslatorFactory;
-import org.apache.cayenne.access.jdbc.JdbcEJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
 import org.apache.cayenne.access.translator.select.QualifierTranslator;
 import org.apache.cayenne.access.translator.select.QueryAssembler;
 import org.apache.cayenne.access.types.ByteArrayType;

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLConditionTranslator.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLConditionTranslator.java Sat Mar 15 12:29:47 2014
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.dba.mysql;
 
-import org.apache.cayenne.access.jdbc.EJBQLConditionTranslator;
-import org.apache.cayenne.access.jdbc.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.EJBQLConditionTranslator;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
 import org.apache.cayenne.ejbql.EJBQLExpression;
 
 /**

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLEJBQLTranslatorFactory.java Sat Mar 15 12:29:47 2014
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.dba.mysql;
 
-import org.apache.cayenne.access.jdbc.EJBQLTranslationContext;
-import org.apache.cayenne.access.jdbc.JdbcEJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
 import org.apache.cayenne.ejbql.EJBQLExpressionVisitor;
 
 /**

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java Sat Mar 15 12:29:47 2014
@@ -31,7 +31,7 @@ import java.util.List;
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.jdbc.EJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
 import org.apache.cayenne.access.translator.select.QualifierTranslator;
 import org.apache.cayenne.access.translator.select.QueryAssembler;
 import org.apache.cayenne.access.types.ByteType;

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLConditionTranslator.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLConditionTranslator.java Sat Mar 15 12:29:47 2014
@@ -20,10 +20,10 @@ package org.apache.cayenne.dba.oracle;
 
 import java.sql.Types;
 
-import org.apache.cayenne.access.jdbc.EJBQLConditionTranslator;
-import org.apache.cayenne.access.jdbc.EJBQLMultiColumnOperand;
-import org.apache.cayenne.access.jdbc.EJBQLPathTranslator;
-import org.apache.cayenne.access.jdbc.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.EJBQLConditionTranslator;
+import org.apache.cayenne.access.translator.ejbql.EJBQLMultiColumnOperand;
+import org.apache.cayenne.access.translator.ejbql.EJBQLPathTranslator;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
 import org.apache.cayenne.ejbql.EJBQLExpression;
 import org.apache.cayenne.map.ObjAttribute;
 

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLTranslatorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLTranslatorFactory.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLTranslatorFactory.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleEJBQLTranslatorFactory.java Sat Mar 15 12:29:47 2014
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.dba.oracle;
 
-import org.apache.cayenne.access.jdbc.EJBQLTranslationContext;
-import org.apache.cayenne.access.jdbc.JdbcEJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
 import org.apache.cayenne.ejbql.EJBQLExpressionVisitor;
 
 /**

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java Sat Mar 15 12:29:47 2014
@@ -24,7 +24,7 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.List;
 
-import org.apache.cayenne.access.jdbc.EJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
 import org.apache.cayenne.access.types.ByteArrayType;
 import org.apache.cayenne.access.types.ByteType;
 import org.apache.cayenne.access.types.CharType;

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLConditionTranslator.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLConditionTranslator.java Sat Mar 15 12:29:47 2014
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.dba.sybase;
 
-import org.apache.cayenne.access.jdbc.EJBQLConditionTranslator;
-import org.apache.cayenne.access.jdbc.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.EJBQLConditionTranslator;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
 import org.apache.cayenne.ejbql.EJBQLExpression;
 
 class SybaseEJBQLConditionTranslator extends EJBQLConditionTranslator {

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLSubselectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLSubselectTranslator.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLSubselectTranslator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLSubselectTranslator.java Sat Mar 15 12:29:47 2014
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.dba.sybase;
 
-import org.apache.cayenne.access.jdbc.EJBQLSelectTranslator;
-import org.apache.cayenne.access.jdbc.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.EJBQLSelectTranslator;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
 import org.apache.cayenne.ejbql.EJBQLExpression;
 
 class SybaseEJBQLSubselectTranslator extends EJBQLSelectTranslator {

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLTranslatorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLTranslatorFactory.java?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLTranslatorFactory.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseEJBQLTranslatorFactory.java Sat Mar 15 12:29:47 2014
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.dba.sybase;
 
-import org.apache.cayenne.access.jdbc.EJBQLTranslationContext;
-import org.apache.cayenne.access.jdbc.JdbcEJBQLTranslatorFactory;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
 import org.apache.cayenne.ejbql.EJBQLExpressionVisitor;
 
 class SybaseEJBQLTranslatorFactory extends JdbcEJBQLTranslatorFactory {

Copied: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorTest.java (from r1577841, cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorTest.java?p2=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorTest.java&p1=cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java&r1=1577841&r2=1577846&rev=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/ejbql/EJBQLSelectTranslatorTest.java Sat Mar 15 12:29:47 2014
@@ -16,12 +16,15 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.translator.ejbql;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.cayenne.access.translator.ejbql.EJBQLSelectTranslator;
+import org.apache.cayenne.access.translator.ejbql.EJBQLTranslationContext;
+import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
 import org.apache.cayenne.configuration.server.ServerRuntime;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.di.Inject;

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1577846&r1=1577845&r2=1577846&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Sat Mar 15 12:29:47 2014
@@ -39,6 +39,7 @@ CAY-1908 Refactor all SQLActions to work
 CAY-1911 BatchQuery refactoring - make Iterable
 CAY-1912 BatchQueryBuilder refactoring
 CAY-1913 Refactor org.apache.cayenne.access.trans into query-specific packages
+CAY-1914 Refactor EJBQL-related translators to a standalone 'org.apache.cayenne.access.translator.ejbql' package
 
 Bug Fixes:
 



Mime
View raw message