hammant 01/12/03 03:18:36
Modified: apps/db/src/conf db-assembly.xml db-config.xml
apps/db/src/java/org/apache/avalon/db/actioncache
DefaultActionCache.java
apps/db/src/java/org/apache/avalon/db/actions Action.java
ParameterAdaptable.java
apps/db/src/java/org/apache/avalon/db/basic/data
BasicAggregateView.java
apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql
BasicLXSQLAggregateHandler.java
BasicLXSQLCreateAggregateViewHandler.java
BasicLXSQLCreateIndexHandler.java
BasicLXSQLCreateTableHandler.java
BasicLXSQLCreateViewHandler.java
BasicLXSQLDeleteRowsHandler.java
BasicLXSQLDropIndexHandler.java
BasicLXSQLDropTableHandler.java
BasicLXSQLDropViewHandler.java
BasicLXSQLHandler.java
BasicLXSQLInsertRowsHandler.java
BasicLXSQLQueryableHandler.java
BasicLXSQLSelectSimpleHandler.java
BasicLXSQLUpdateRowsHandler.java
apps/db/src/java/org/apache/avalon/db/bcel/parser
BCELHelper.java BCELLXSQLParser.xinfo
BCELSQLParser.xinfo
apps/db/src/java/org/apache/avalon/db/server
AbstractDatabaseManager.java
AbstractRequestHandler.java
apps/db/src/java/org/apache/avalon/db/server/lxsql
AbstractLXSQLParser.java
apps/db/src/java/org/apache/avalon/db/server/sql
AbstractSQLParser.java
apps/db/src/java/org/apache/avalon/db/services
DatabaseManager.java
apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server
PlainCMDDatabaseManager.xinfo
apps/db/src/java/org/apache/avalon/db/transport/soap/server
SoapDatabaseManager.xinfo
Added: apps/db/src/java/org/apache/avalon/db/basic/parser
BasicDualParserManager.java
BasicDualParserManager.xinfo
BasicLXSQLParserManager.java
BasicLXSQLParserManager.xinfo
BasicSQLParserManager.java
BasicSQLParserManager.xinfo
apps/db/src/java/org/apache/avalon/db/server
AbstractParserManager.java
apps/db/src/java/org/apache/avalon/db/services
ParserManager.java
Removed: apps/db/src/java/org/apache/avalon/db/basic/parser
BasicDualParser.java BasicDualParser.xinfo
BasicLXSQLParser.java BasicLXSQLParser.xinfo
BasicSQLParser.java BasicSQLParser.xinfo
apps/db/src/java/org/apache/avalon/db/server
AbstractParser.java
apps/db/src/java/org/apache/avalon/db/services
SQLParser.java
Log:
SQLParser renamed to ParserManager
Revision Changes Path
1.12 +4 -4
jakarta-avalon-cornerstone/apps/db/src/conf/db-assembly.xml
Index: db-assembly.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/conf/db-assembly.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- db-assembly.xml 2001/11/30 20:43:14 1.11
+++ db-assembly.xml 2001/12/03 11:18:35 1.12
@@ -45,21 +45,21 @@
<!-- SQL Parsing on its own -->
<!--
- <block class="org.apache.avalon.db.basic.parser.BasicSQLParser"
name="sql-parser">
+ <block class="org.apache.avalon.db.basic.parser.BasicSQLParserManager"
name="parser-manager">
<provide name="db-persistor"
role="org.apache.avalon.db.services.DatabasePersistor" />
</block>
-->
<!-- LXSQL Parsing on its own -->
<!--
- <block class="org.apache.avalon.db.basic.parser.BasicLXSQLParser"
name="sql-parser">
+ <block
class="org.apache.avalon.db.basic.parser.BasicLXSQLParserManager"
name="parser-manager">
<provide name="dom-builder-factory"
role="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory" />
<provide name="db-persistor"
role="org.apache.avalon.db.services.DatabasePersistor" />
</block>
-->
<!-- LXSQL & SQL Parsing -->
- <block class="org.apache.avalon.db.basic.parser.BasicDualParser"
name="sql-parser">
+ <block
class="org.apache.avalon.db.basic.parser.BasicDualParserManager"
name="parser-manager">
<provide name="dom-builder-factory"
role="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory" />
<provide name="db-persistor"
role="org.apache.avalon.db.services.DatabasePersistor" />
</block>
@@ -74,7 +74,7 @@
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager" />
- <provide name="sql-parser"
role="org.apache.avalon.db.services.SQLParser" />
+ <provide name="parser-manager"
role="org.apache.avalon.db.services.ParserManager" />
<provide name="sql-optimizer"
role="org.apache.avalon.db.services.SQLOptimizer" />
</block>
1.8 +1 -1 jakarta-avalon-cornerstone/apps/db/src/conf/db-config.xml
Index: db-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/conf/db-config.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- db-config.xml 2001/11/30 20:43:14 1.7
+++ db-config.xml 2001/12/03 11:18:35 1.8
@@ -77,7 +77,7 @@
</dbhandler>
</avalondb-server>
- <sql-parser>TODO</sql-parser>
+ <parser-manager>TODO</parser-manager>
<sql-optimizer>TODO</sql-optimizer>
1.3 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actioncache/DefaultActionCache.java
Index: DefaultActionCache.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actioncache/DefaultActionCache.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultActionCache.java 2001/11/10 21:45:03 1.2
+++ DefaultActionCache.java 2001/12/03 11:18:35 1.3
@@ -11,7 +11,7 @@
import org.apache.avalon.db.services.ActionCache;
-import org.apache.avalon.db.services.SQLParser;
+import org.apache.avalon.db.services.ParserManager;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
@@ -31,7 +31,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class DefaultActionCache extends AbstractLogEnabled
implements ActionCache, Block, Contextualizable, Composable,
Configurable, Initializable {
1.10 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Action.java
Index: Action.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Action.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Action.java 2001/11/14 02:54:30 1.9
+++ Action.java 2001/12/03 11:18:35 1.10
@@ -9,7 +9,7 @@
package org.apache.avalon.db.actions;
import org.apache.avalon.db.services.DatabasePersistor;
-import org.apache.avalon.db.services.SQLParser;
+import org.apache.avalon.db.services.ParserManager;
/**
@@ -18,7 +18,7 @@
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.9 $
+ * @version * $Revision: 1.10 $
*/
public interface Action {
void initialize() throws ActionException;
1.4 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/ParameterAdaptable.java
Index: ParameterAdaptable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/ParameterAdaptable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ParameterAdaptable.java 2001/11/13 17:51:41 1.3
+++ ParameterAdaptable.java 2001/12/03 11:18:35 1.4
@@ -9,7 +9,7 @@
package org.apache.avalon.db.actions;
import org.apache.avalon.db.services.DatabasePersistor;
-import org.apache.avalon.db.services.SQLParser;
+import org.apache.avalon.db.services.ParserManager;
/**
1.6 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicAggregateView.java
Index: BasicAggregateView.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicAggregateView.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicAggregateView.java 2001/12/01 17:50:26 1.5
+++ BasicAggregateView.java 2001/12/03 11:18:35 1.6
@@ -27,11 +27,11 @@
import java.util.Vector;
/**
- * Class BasicView
+ * Class BasicAggregateView
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class BasicAggregateView extends AbstractAggregateQueryable {
1.8 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLAggregateHandler.java
Index: BasicLXSQLAggregateHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLAggregateHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicLXSQLAggregateHandler.java 2001/12/01 15:30:42 1.7
+++ BasicLXSQLAggregateHandler.java 2001/12/03 11:18:35 1.8
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.services.DatabasePersistor;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Queryable;
@@ -35,7 +35,7 @@
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public abstract class BasicLXSQLAggregateHandler extends BasicLXSQLHandler {
@@ -47,7 +47,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLAggregateHandler(BasicLXSQLParser parser,
DatabasePersistor databasePersistor) {
+ public BasicLXSQLAggregateHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor) {
super(parser,databasePersistor);
}
1.9 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateAggregateViewHandler.java
Index: BasicLXSQLCreateAggregateViewHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateAggregateViewHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasicLXSQLCreateAggregateViewHandler.java 2001/12/01 15:30:42 1.8
+++ BasicLXSQLCreateAggregateViewHandler.java 2001/12/03 11:18:35 1.9
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicCriteria;
import org.apache.avalon.db.basic.actions.BasicSelectSimple;
import org.apache.avalon.db.basic.actions.BasicCreateAggregateView;
@@ -36,7 +36,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class BasicLXSQLCreateAggregateViewHandler extends
BasicLXSQLAggregateHandler {
@@ -48,7 +48,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLCreateAggregateViewHandler(BasicLXSQLParser parser,
+ public BasicLXSQLCreateAggregateViewHandler(BasicLXSQLParserManager
parser,
DatabasePersistor databasePersistor) {
super(parser, databasePersistor);
}
1.9 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateIndexHandler.java
Index: BasicLXSQLCreateIndexHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateIndexHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasicLXSQLCreateIndexHandler.java 2001/11/23 12:40:20 1.8
+++ BasicLXSQLCreateIndexHandler.java 2001/12/03 11:18:35 1.9
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicCreateIndex;
import org.apache.avalon.db.services.DatabasePersistor;
import org.apache.avalon.db.transport.Reply;
@@ -28,7 +28,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class BasicLXSQLCreateIndexHandler extends BasicLXSQLHandler {
@@ -40,7 +40,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLCreateIndexHandler(BasicLXSQLParser parser,
+ public BasicLXSQLCreateIndexHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor)
{
super(parser, databasePersistor);
}
1.8 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateTableHandler.java
Index: BasicLXSQLCreateTableHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateTableHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicLXSQLCreateTableHandler.java 2001/11/29 14:26:13 1.7
+++ BasicLXSQLCreateTableHandler.java 2001/12/03 11:18:35 1.8
@@ -10,7 +10,7 @@
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicCreateTable;
import org.apache.avalon.db.services.DatabasePersistor;
import org.apache.avalon.db.transport.Reply;
@@ -32,7 +32,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class BasicLXSQLCreateTableHandler extends BasicLXSQLQueryableHandler
{
@@ -44,7 +44,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLCreateTableHandler(BasicLXSQLParser parser,
+ public BasicLXSQLCreateTableHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor)
{
super(parser, databasePersistor);
}
1.11 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateViewHandler.java
Index: BasicLXSQLCreateViewHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateViewHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BasicLXSQLCreateViewHandler.java 2001/11/29 14:29:06 1.10
+++ BasicLXSQLCreateViewHandler.java 2001/12/03 11:18:35 1.11
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicCreateView;
import org.apache.avalon.db.basic.actions.BasicCriteria;
import org.apache.avalon.db.basic.actions.BasicSelectSimple;
@@ -32,7 +32,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class BasicLXSQLCreateViewHandler extends BasicLXSQLQueryableHandler {
@@ -44,7 +44,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLCreateViewHandler(BasicLXSQLParser parser,
+ public BasicLXSQLCreateViewHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor) {
super(parser, databasePersistor);
}
1.10 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLDeleteRowsHandler.java
Index: BasicLXSQLDeleteRowsHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLDeleteRowsHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BasicLXSQLDeleteRowsHandler.java 2001/12/01 15:30:42 1.9
+++ BasicLXSQLDeleteRowsHandler.java 2001/12/03 11:18:35 1.10
@@ -10,7 +10,7 @@
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicDeleteRows;
import org.apache.avalon.db.basic.actions.BasicCriteria;
import org.apache.avalon.db.services.DatabasePersistor;
@@ -32,7 +32,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class BasicLXSQLDeleteRowsHandler extends BasicLXSQLHandler {
@@ -44,7 +44,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLDeleteRowsHandler(BasicLXSQLParser parser,
+ public BasicLXSQLDeleteRowsHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor) {
super(parser, databasePersistor);
}
1.4 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLDropIndexHandler.java
Index: BasicLXSQLDropIndexHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLDropIndexHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicLXSQLDropIndexHandler.java 2001/11/23 12:40:20 1.3
+++ BasicLXSQLDropIndexHandler.java 2001/12/03 11:18:35 1.4
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicDropIndex;
import org.apache.avalon.db.services.DatabasePersistor;
import org.apache.avalon.db.actions.ActionException;
@@ -26,7 +26,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class BasicLXSQLDropIndexHandler extends BasicLXSQLQueryableHandler {
@@ -38,7 +38,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLDropIndexHandler(BasicLXSQLParser parser,
+ public BasicLXSQLDropIndexHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor)
{
super(parser, databasePersistor);
}
1.4 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLDropTableHandler.java
Index: BasicLXSQLDropTableHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLDropTableHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicLXSQLDropTableHandler.java 2001/11/23 12:40:20 1.3
+++ BasicLXSQLDropTableHandler.java 2001/12/03 11:18:35 1.4
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicDropTable;
import org.apache.avalon.db.services.DatabasePersistor;
import org.apache.avalon.db.actions.ActionException;
@@ -26,7 +26,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class BasicLXSQLDropTableHandler extends BasicLXSQLQueryableHandler {
@@ -38,7 +38,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLDropTableHandler(BasicLXSQLParser parser,
+ public BasicLXSQLDropTableHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor)
{
super(parser, databasePersistor);
}
1.4 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLDropViewHandler.java
Index: BasicLXSQLDropViewHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLDropViewHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicLXSQLDropViewHandler.java 2001/11/23 12:40:20 1.3
+++ BasicLXSQLDropViewHandler.java 2001/12/03 11:18:35 1.4
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicDropView;
import org.apache.avalon.db.services.DatabasePersistor;
import org.apache.avalon.db.actions.ActionException;
@@ -26,7 +26,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class BasicLXSQLDropViewHandler extends BasicLXSQLQueryableHandler {
@@ -38,7 +38,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLDropViewHandler(BasicLXSQLParser parser,
+ public BasicLXSQLDropViewHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor)
{
super(parser, databasePersistor);
}
1.4 +4 -4
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLHandler.java
Index: BasicLXSQLHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicLXSQLHandler.java 2001/11/19 12:11:53 1.3
+++ BasicLXSQLHandler.java 2001/12/03 11:18:35 1.4
@@ -11,7 +11,7 @@
import org.apache.avalon.db.server.AbstractRequestHandler;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.services.DatabasePersistor;
@@ -20,11 +20,11 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public abstract class BasicLXSQLHandler extends AbstractRequestHandler {
- protected final BasicLXSQLParser mParser;
+ protected final BasicLXSQLParserManager mParser;
/**
* Constructor BasicLXSQLHandler
@@ -34,7 +34,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLHandler(BasicLXSQLParser parser, DatabasePersistor
databasePersistor) {
+ public BasicLXSQLHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor) {
super(databasePersistor);
mParser = parser;
}
1.7 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLInsertRowsHandler.java
Index: BasicLXSQLInsertRowsHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLInsertRowsHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicLXSQLInsertRowsHandler.java 2001/11/29 14:26:13 1.6
+++ BasicLXSQLInsertRowsHandler.java 2001/12/03 11:18:35 1.7
@@ -10,7 +10,7 @@
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.data.BasicTable;
import org.apache.avalon.db.basic.data.BasicRow;
import org.apache.avalon.db.basic.actions.BasicInsertRows;
@@ -40,7 +40,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class BasicLXSQLInsertRowsHandler extends BasicLXSQLHandler {
@@ -52,7 +52,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLInsertRowsHandler(BasicLXSQLParser parser,
+ public BasicLXSQLInsertRowsHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor) {
super(parser, databasePersistor);
}
1.5 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLQueryableHandler.java
Index: BasicLXSQLQueryableHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLQueryableHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicLXSQLQueryableHandler.java 2001/11/30 10:07:57 1.4
+++ BasicLXSQLQueryableHandler.java 2001/12/03 11:18:35 1.5
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.services.DatabasePersistor;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.impl.DefaultVarCharColumn;
@@ -34,7 +34,7 @@
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class BasicLXSQLQueryableHandler extends BasicLXSQLHandler {
@@ -46,7 +46,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLQueryableHandler(BasicLXSQLParser parser,
DatabasePersistor databasePersistor) {
+ public BasicLXSQLQueryableHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor) {
super(parser,databasePersistor);
}
1.8 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLSelectSimpleHandler.java
Index: BasicLXSQLSelectSimpleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLSelectSimpleHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicLXSQLSelectSimpleHandler.java 2001/11/29 14:29:06 1.7
+++ BasicLXSQLSelectSimpleHandler.java 2001/12/03 11:18:35 1.8
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicSelectSimple;
import org.apache.avalon.db.basic.actions.BasicCriteria;
import org.apache.avalon.db.services.DatabasePersistor;
@@ -35,7 +35,7 @@
*
* @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class BasicLXSQLSelectSimpleHandler extends BasicLXSQLHandler {
@@ -47,7 +47,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLSelectSimpleHandler(BasicLXSQLParser parser,
+ public BasicLXSQLSelectSimpleHandler(BasicLXSQLParserManager parser,
DatabasePersistor
databasePersistor) {
super(parser, databasePersistor);
}
1.11 +3 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLUpdateRowsHandler.java
Index: BasicLXSQLUpdateRowsHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLUpdateRowsHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BasicLXSQLUpdateRowsHandler.java 2001/12/01 15:30:42 1.10
+++ BasicLXSQLUpdateRowsHandler.java 2001/12/03 11:18:35 1.11
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
import org.apache.avalon.db.basic.actions.BasicUpdateRows;
import org.apache.avalon.db.basic.actions.BasicCriteria;
import org.apache.avalon.db.services.DatabasePersistor;
@@ -31,7 +31,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class BasicLXSQLUpdateRowsHandler extends BasicLXSQLHandler {
@@ -43,7 +43,7 @@
* @param databasePersistor
*
*/
- public BasicLXSQLUpdateRowsHandler(BasicLXSQLParser parser,
+ public BasicLXSQLUpdateRowsHandler(BasicLXSQLParserManager parser,
DatabasePersistor databasePersistor) {
super(parser, databasePersistor);
}
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.java
Index: BasicDualParserManager.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.basic.parser;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.db.services.ParserManager;
import org.apache.avalon.db.transport.Request;
import org.apache.avalon.db.transport.Reply;
import org.apache.avalon.db.actions.Action;
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.server.AbstractRequestHandler;
import java.io.InputStream;
/**
* Class BasicDualParserManager
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
*/
public class BasicDualParserManager extends AbstractLogEnabled
implements Block, ParserManager, Contextualizable, Composable,
Configurable, Initializable {
private BasicLXSQLParserManager mBasicLXSQLParser;
private BasicSQLParserManager mBasicSQLParser;
public BasicDualParserManager() {
mBasicLXSQLParser = new BasicLXSQLParserManager();
// TODO - here Gerhard
//mBasicSQLParser = new BasicSQLParserManager((InputStream) null);
}
/**
* Method compose
*
*
* @param componentManager
*
* @throws ComponentException
*
*/
public void compose(ComponentManager componentManager) throws
ComponentException {
mBasicLXSQLParser.compose(componentManager);
if (mBasicSQLParser != null)
mBasicSQLParser.compose(componentManager);
}
/**
* Set the components logger.
*
* @param logger the logger
*/
public void enableLogging(Logger logger) {
super.enableLogging(logger);
mBasicLXSQLParser.enableLogging(logger);
if (mBasicSQLParser != null) mBasicSQLParser.enableLogging(logger);
}
/**
* Method configure
*
*
* @param configuration
*
* @throws ConfigurationException
*
*/
public void configure(Configuration configuration) throws
ConfigurationException {
mBasicLXSQLParser.configure(configuration);
if (mBasicSQLParser != null) mBasicSQLParser.configure(configuration);
}
/**
* Pass the Context to the component.
* This method is called after the Loggable.setLogger() (if present)
* method and before any other method.
*
* @param context the context
* @exception ContextException if context is invalid
*/
public void contextualize(Context context)
throws ContextException {
mBasicLXSQLParser.contextualize(context);
if (mBasicSQLParser != null) mBasicSQLParser.contextualize(context);
}
/**
* Initialialize the component. Initialization includes
* allocating any resources required throughout the
* components lifecycle.
*
* @exception Exception if an error occurs
*/
public void initialize()
throws Exception {
mBasicLXSQLParser.initialize();
if (mBasicSQLParser != null) mBasicSQLParser.initialize();
}
// overrides parent.
public Reply processRequest(Request request) {
if (request.getSQLSyntax() == Request.SYNTAX_LXSQL) {
System.out.println("LXSQL");
return mBasicLXSQLParser.processRequest(request);
} else {
System.out.println("SQL");
return mBasicSQLParser.processRequest(request);
}
}
public void initializeAction(Action action) throws ActionException {
// not needed.
}
}
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.xinfo
Index: BasicDualParserManager.xinfo
===================================================================
<?xml version="1.0"?>
<blockinfo>
<!-- section to describe block -->
<block>
<version>1.0</version>
</block>
<!-- services that are offered by this block -->
<services>
<service name="org.apache.avalon.db.services.ParserManager" version="1.0"
/>
</services>
<dependencies>
<dependency>
<service
name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.db.services.DatabasePersistor"
version="1.0"/>
</dependency>
</dependencies>
</blockinfo>
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParserManager.java
Index: BasicLXSQLParserManager.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.basic.parser;
import org.apache.avalon.db.server.lxsql.AbstractLXSQLParser;
import org.apache.avalon.db.server.AbstractRequestHandler;
import org.apache.avalon.db.server.stdhandlers.PingHandler;
import org.apache.avalon.db.server.stdhandlers.CatalogHandler;
import org.apache.avalon.db.server.stdhandlers.EstablishConnectionHandler;
import org.apache.avalon.db.transport.Request;
import org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLCreateTableHandler;
import org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLCreateViewHandler;
import org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLCreateIndexHandler;
import org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLDeleteRowsHandler;
import org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLInsertRowsHandler;
import
org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLSelectSimpleHandler;
import org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLUpdateRowsHandler;
import org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLDropTableHandler;
import org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLDropViewHandler;
import org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLDropIndexHandler;
import
org.apache.avalon.db.basic.handlers.lxsql.BasicLXSQLCreateAggregateViewHandler;
import org.apache.avalon.db.basic.handlers.BasicCloseResultSetHandler;
import org.apache.avalon.db.actions.Action;
import org.apache.avalon.db.actions.ActionException;
/**
* Class BasicLXSQLParserManager
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public class BasicLXSQLParserManager extends AbstractLXSQLParser {
protected void getCustomRequestHandlers(AbstractRequestHandler[]
handlers) {
handlers[Request.CREATETABLE] = new
BasicLXSQLCreateTableHandler(this,mDatabasePersistor);
handlers[Request.CREATEVIEW] = new
BasicLXSQLCreateViewHandler(this,mDatabasePersistor);
handlers[Request.CREATEAGGREGATEVIEW] = new
BasicLXSQLCreateAggregateViewHandler(this,mDatabasePersistor);
handlers[Request.CREATEINDEX] = new
BasicLXSQLCreateIndexHandler(this,mDatabasePersistor);
handlers[Request.DELETEROWS] = new
BasicLXSQLDeleteRowsHandler(this,mDatabasePersistor);
handlers[Request.INSERTROWS] = new
BasicLXSQLInsertRowsHandler(this,mDatabasePersistor);
handlers[Request.SELECTSIMPLE] = new
BasicLXSQLSelectSimpleHandler(this,mDatabasePersistor);
handlers[Request.UPDATEROWS] = new
BasicLXSQLUpdateRowsHandler(this,mDatabasePersistor);
handlers[Request.DROPTABLE] = new
BasicLXSQLDropTableHandler(this,mDatabasePersistor);
handlers[Request.DROPVIEW] = new
BasicLXSQLDropViewHandler(this,mDatabasePersistor);
handlers[Request.DROPINDEX] = new
BasicLXSQLDropIndexHandler(this,mDatabasePersistor);
handlers[Request.CLOSERESULTSET] = new
BasicCloseResultSetHandler(mDatabasePersistor);
}
public void initializeAction(Action action) throws ActionException {
action.setDatabasePersistor(mDatabasePersistor);
setupLogger(action);
action.initialize();
}
}
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParserManager.xinfo
Index: BasicLXSQLParserManager.xinfo
===================================================================
<?xml version="1.0"?>
<blockinfo>
<!-- section to describe block -->
<block>
<version>1.0</version>
</block>
<!-- services that are offered by this block -->
<services>
<service name="org.apache.avalon.db.services.ParserManager" version="1.0"
/>
</services>
<dependencies>
<dependency>
<service
name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.db.services.DatabasePersistor"
version="1.0"/>
</dependency>
</dependencies>
</blockinfo>
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicSQLParserManager.java
Index: BasicSQLParserManager.java
===================================================================
/* Generated By:JavaCC: Do not edit this line. BasicSQLParserManager.java */
package org.apache.avalon.db.basic.parser;
import org.apache.avalon.db.server.sql.AbstractSQLParser;
import org.apache.avalon.db.server.sql.ParseException;
import org.apache.avalon.db.server.sql.SimpleCharStream;
import org.apache.avalon.db.server.sql.Token;
import org.apache.avalon.db.server.sql.TokenMgrError;
import org.apache.avalon.db.server.AbstractRequestHandler;
import org.apache.avalon.db.server.stdhandlers.PingHandler;
import org.apache.avalon.db.server.stdhandlers.CatalogHandler;
import org.apache.avalon.db.server.stdhandlers.EstablishConnectionHandler;
import org.apache.avalon.db.transport.Request;
import org.apache.avalon.db.basic.handlers.BasicCloseResultSetHandler;
import org.apache.avalon.db.actions.Action;
import org.apache.avalon.db.actions.ActionException;
import java.util.ArrayList;
/**
* Class BasicSQLParserManager
*
* @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
*/
public class BasicSQLParserManager extends AbstractSQLParser implements
BasicSQLParserConstants {
protected void getCustomRequestHandlers(AbstractRequestHandler[]
handlers) {
}
public BasicSQLParserManager() { }
public void initializeAction(Action action) throws ActionException {
action.setDatabasePersistor(mDatabasePersistor);
setupLogger(action);
action.initialize();
}
public static void main(String args[]) {
BasicSQLParserManager parser = new BasicSQLParserManager(System.in);
try {
parser.Test();
} catch(ParseException pe) {
pe.printStackTrace();
}
}
/**
* Test Method for command line input
*/
static final public void Test() throws ParseException {
parseSQLString();
}
static final public String parseSQLString() throws ParseException {
String stm;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SELECT:
stm = Select();
break;
case UPDATE:
stm = Update();
break;
case INSERT:
stm = Insert();
break;
case DROP:
stm = Drop();
break;
case DELETE:
stm = Delete();
break;
default:
jj_la1[0] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 59:
jj_consume_token(59);
break;
case 0:
jj_consume_token(0);
break;
default:
jj_la1[1] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
{if (true) return stm;}
throw new Error("Missing return statement in function");
}
static final public String Select() throws ParseException {
String stm;
jj_consume_token(SELECT);
stm = "SELECT";
getColumns();
jj_consume_token(FROM);
getTables();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WHERE:
Where();
break;
default:
jj_la1[2] = jj_gen;
;
}
{if (true) return stm;}
throw new Error("Missing return statement in function");
}
static final public String Update() throws ParseException {
String stm;
jj_consume_token(UPDATE);
stm = "UPDATE";
getTables();
jj_consume_token(SET);
label_1:
while (true) {
jj_consume_token(IDENTIFIER);
jj_consume_token(EQUAL);
ExprValue();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 60:
jj_consume_token(60);
System.out.println(",");
break;
default:
jj_la1[3] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
;
break;
default:
jj_la1[4] = jj_gen;
break label_1;
}
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WHERE:
Where();
break;
default:
jj_la1[5] = jj_gen;
;
}
System.out.println("Row(s) updated ;-)");
{if (true) return stm;}
throw new Error("Missing return statement in function");
}
static final public void Rollback() throws ParseException {
jj_consume_token(0);
}
static final public String Insert() throws ParseException {
String stm;
jj_consume_token(INSERT);
jj_consume_token(INTO);
stm = "INSERT";
jj_consume_token(IDENTIFIER);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 61:
label_2:
while (true) {
jj_consume_token(61);
getColumns();
jj_consume_token(62);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 61:
;
break;
default:
jj_la1[6] = jj_gen;
break label_2;
}
}
break;
default:
jj_la1[7] = jj_gen;
;
}
label_3:
while (true) {
jj_consume_token(VALUES);
jj_consume_token(61);
getValues();
jj_consume_token(62);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VALUES:
;
break;
default:
jj_la1[8] = jj_gen;
break label_3;
}
}
{if (true) return stm;}
throw new Error("Missing return statement in function");
}
static final public void Grant() throws ParseException {
jj_consume_token(0);
}
static final public String Drop() throws ParseException {
String stm;
jj_consume_token(DROP);
stm = "DROP";
jj_consume_token(IDENTIFIER);
System.out.println("Table droped ;-)");
{if (true) return stm;}
throw new Error("Missing return statement in function");
}
static final public String Delete() throws ParseException {
String stm;
jj_consume_token(DELETE);
jj_consume_token(FROM);
stm = "DELETE";
jj_consume_token(IDENTIFIER);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WHERE:
Where();
break;
default:
jj_la1[9] = jj_gen;
;
}
System.out.println("Row(s) deleted ;-)");
{if (true) return stm;}
throw new Error("Missing return statement in function");
}
static final public void Commit() throws ParseException {
jj_consume_token(0);
}
static final public void Alter() throws ParseException {
jj_consume_token(0);
}
static final public void Where() throws ParseException {
jj_consume_token(WHERE);
OrExpr();
}
static final public void OrExpr() throws ParseException {
AndExpr();
label_4:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case OR:
;
break;
default:
jj_la1[10] = jj_gen;
break label_4;
}
jj_consume_token(OR);
System.out.println("in or");
AndExpr();
}
}
static final public void AndExpr() throws ParseException {
NotExpr();
label_5:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case AND:
;
break;
default:
jj_la1[11] = jj_gen;
break label_5;
}
jj_consume_token(AND);
System.out.println("in and");
NotExpr();
}
}
static final public void NotExpr() throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NOT:
jj_consume_token(NOT);
System.out.println("in not");
break;
default:
jj_la1[12] = jj_gen;
;
}
CompareExpr();
}
static final public void CompareExpr() throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
case INTEGER_LITERAL:
case FLOATING_POINT_LITERAL:
case STRING_LITERAL:
ExprValue();
CompareOps();
ExprValue();
break;
case 61:
Term();
break;
default:
jj_la1[13] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
static final public void ExprValue() throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
jj_consume_token(IDENTIFIER);
System.out.println("expr is <INDENTIFIER>");
break;
case STRING_LITERAL:
jj_consume_token(STRING_LITERAL);
System.out.println("expr is <STRING_LITERAL>");
break;
case INTEGER_LITERAL:
jj_consume_token(INTEGER_LITERAL);
System.out.println("expr is <INTEGER_LITERAL>");
break;
case FLOATING_POINT_LITERAL:
jj_consume_token(FLOATING_POINT_LITERAL);
System.out.println("expr is
<FLOATING_POINT_LITERAL>");
break;
default:
jj_la1[14] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
static final public void UpdateValue() throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case STRING_LITERAL:
jj_consume_token(STRING_LITERAL);
System.out.println("value is <STRING_LITERAL>");
break;
case INTEGER_LITERAL:
jj_consume_token(INTEGER_LITERAL);
System.out.println("value is <INTEGER_LITERAL>");
break;
case FLOATING_POINT_LITERAL:
jj_consume_token(FLOATING_POINT_LITERAL);
System.out.println("value expr is
<FLOATING_POINT_LITERAL>");
break;
default:
jj_la1[15] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
static final public void CompareOps() throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EQUAL:
jj_consume_token(EQUAL);
System.out.println("EQUAL");
break;
case GREATERTHAN:
jj_consume_token(GREATERTHAN);
System.out.println("GREATERTHAN");
break;
case SMALLERTHAN:
jj_consume_token(SMALLERTHAN);
System.out.println("SMALLERTHAN");
break;
case GREATERTHANOREQUAL:
jj_consume_token(GREATERTHANOREQUAL);
System.out.println("GREATERTHANOREQUAL");
break;
case SMALLERTHANOREQUAL:
jj_consume_token(SMALLERTHANOREQUAL);
System.out.println("SMALLERTHANOREQUAL");
break;
case LIKE:
jj_consume_token(LIKE);
System.out.println("LIKE");
break;
default:
jj_la1[16] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
static final public void Term() throws ParseException {
jj_consume_token(61);
System.out.println("(");
OrExpr();
jj_consume_token(62);
System.out.println(")");
}
static final public void getColumns() throws ParseException {
String col;
Token column;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 63:
jj_consume_token(63);
System.out.println("all columns");
break;
case IDENTIFIER:
column = jj_consume_token(IDENTIFIER);
System.out.println("column=" + column.image);
label_6:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 60:
;
break;
default:
jj_la1[17] = jj_gen;
break label_6;
}
jj_consume_token(60);
System.out.println(",");
column = jj_consume_token(IDENTIFIER);
System.out.println("column=" + column.image);
}
break;
default:
jj_la1[18] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
static final public void getTables() throws ParseException {
String tab;
Token table;
table = jj_consume_token(IDENTIFIER);
System.out.println("table=" + table.image);
label_7:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 60:
;
break;
default:
jj_la1[19] = jj_gen;
break label_7;
}
jj_consume_token(60);
System.out.println(",");
table = jj_consume_token(IDENTIFIER);
System.out.println("table=" + table.image);
}
}
static final public void getValues() throws ParseException {
UpdateValue();
label_8:
while (true) {
jj_consume_token(60);
System.out.println(",");
UpdateValue();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 60:
;
break;
default:
jj_la1[20] = jj_gen;
break label_8;
}
}
}
static private boolean jj_initialized_once = false;
static public BasicSQLParserTokenManager token_source;
static SimpleCharStream jj_input_stream;
static public Token token, jj_nt;
static private int jj_ntk;
static private int jj_gen;
static final private int[] jj_la1 = new int[21];
static final private int[] jj_la1_0 =
{0x6b0000,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
static final private int[] jj_la1_1 =
{0x0,0x8000000,0x4,0x10000000,0x100000,0x4,0x20000000,0x20000000,0x20,0x4,0x1000,0x800,0x2000,0x25900000,0x5900000,0x5800000,0xfc000,0x10000000,0x80100000,0x10000000,0x10000000,};
public BasicSQLParserManager(java.io.InputStream stream) {
if (jj_initialized_once) {
System.out.println("ERROR: Second call to constructor of static parser.
You must");
System.out.println(" either use ReInit() or set the JavaCC option
STATIC to false");
System.out.println(" during parser generation.");
throw new Error();
}
jj_initialized_once = true;
jj_input_stream = new SimpleCharStream(stream, 1, 1);
token_source = new BasicSQLParserTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
}
static public void ReInit(java.io.InputStream stream) {
jj_input_stream.ReInit(stream, 1, 1);
token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
}
public BasicSQLParserManager(java.io.Reader stream) {
if (jj_initialized_once) {
System.out.println("ERROR: Second call to constructor of static parser.
You must");
System.out.println(" either use ReInit() or set the JavaCC option
STATIC to false");
System.out.println(" during parser generation.");
throw new Error();
}
jj_initialized_once = true;
jj_input_stream = new SimpleCharStream(stream, 1, 1);
token_source = new BasicSQLParserTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
}
static public void ReInit(java.io.Reader stream) {
jj_input_stream.ReInit(stream, 1, 1);
token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
}
public BasicSQLParserManager(BasicSQLParserTokenManager tm) {
if (jj_initialized_once) {
System.out.println("ERROR: Second call to constructor of static parser.
You must");
System.out.println(" either use ReInit() or set the JavaCC option
STATIC to false");
System.out.println(" during parser generation.");
throw new Error();
}
jj_initialized_once = true;
token_source = tm;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
}
public void ReInit(BasicSQLParserTokenManager tm) {
token_source = tm;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
}
static final private Token jj_consume_token(int kind) throws ParseException
{
Token oldToken;
if ((oldToken = token).next != null) token = token.next;
else token = token.next = token_source.getNextToken();
jj_ntk = -1;
if (token.kind == kind) {
jj_gen++;
return token;
}
token = oldToken;
jj_kind = kind;
throw generateParseException();
}
static final public Token getNextToken() {
if (token.next != null) token = token.next;
else token = token.next = token_source.getNextToken();
jj_ntk = -1;
jj_gen++;
return token;
}
static final public Token getToken(int index) {
Token t = token;
for (int i = 0; i < index; i++) {
if (t.next != null) t = t.next;
else t = t.next = token_source.getNextToken();
}
return t;
}
static final private int jj_ntk() {
if ((jj_nt=token.next) == null)
return (jj_ntk = (token.next=token_source.getNextToken()).kind);
else
return (jj_ntk = jj_nt.kind);
}
static private java.util.Vector jj_expentries = new java.util.Vector();
static private int[] jj_expentry;
static private int jj_kind = -1;
static final public ParseException generateParseException() {
jj_expentries.removeAllElements();
boolean[] la1tokens = new boolean[64];
for (int i = 0; i < 64; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
for (int i = 0; i < 21; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
la1tokens[j] = true;
}
if ((jj_la1_1[i] & (1<<j)) != 0) {
la1tokens[32+j] = true;
}
}
}
}
for (int i = 0; i < 64; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
jj_expentries.addElement(jj_expentry);
}
}
int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) {
exptokseq[i] = (int[])jj_expentries.elementAt(i);
}
return new ParseException(token, exptokseq, tokenImage);
}
static final public void enable_tracing() {
}
static final public void disable_tracing() {
}
}
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicSQLParserManager.xinfo
Index: BasicSQLParserManager.xinfo
===================================================================
<?xml version="1.0"?>
<blockinfo>
<!-- section to describe block -->
<block>
<version>1.0</version>
</block>
<!-- services that are offered by this block -->
<services>
<service name="org.apache.avalon.db.services.ParserManager" version="1.0"
/>
</services>
<dependencies>
<dependency>
<service name="org.apache.avalon.db.services.DatabasePersistor"
version="1.0"/>
</dependency>
</dependencies>
</blockinfo>
1.5 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELHelper.java
Index: BCELHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BCELHelper.java 2001/11/15 14:29:57 1.4
+++ BCELHelper.java 2001/12/03 11:18:36 1.5
@@ -10,7 +10,7 @@
-import org.apache.avalon.db.services.SQLParser;
+import org.apache.avalon.db.services.ParserManager;
import org.apache.avalon.db.services.DatabasePersistor;
import org.apache.avalon.db.actions.Action;
import org.apache.avalon.db.actions.Select;
1.2 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELLXSQLParser.xinfo
Index: BCELLXSQLParser.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELLXSQLParser.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BCELLXSQLParser.xinfo 2001/11/07 13:51:26 1.1
+++ BCELLXSQLParser.xinfo 2001/12/03 11:18:36 1.2
@@ -9,7 +9,7 @@
<!-- services that are offered by this block -->
<services>
- <service name="org.apache.avalon.db.services.SQLParser" version="1.0" />
+ <service name="org.apache.avalon.db.services.ParserManager"
version="1.0" />
</services>
<dependencies>
<dependency>
1.3 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELSQLParser.xinfo
Index: BCELSQLParser.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELSQLParser.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BCELSQLParser.xinfo 2001/11/07 12:01:14 1.2
+++ BCELSQLParser.xinfo 2001/12/03 11:18:36 1.3
@@ -9,7 +9,7 @@
<!-- services that are offered by this block -->
<services>
- <service name="org.apache.avalon.db.services.SQLParser" version="1.0" />
+ <service name="org.apache.avalon.db.services.ParserManager"
version="1.0" />
</services>
<dependencies>
<dependency>
1.28 +4 -4
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java
Index: AbstractDatabaseManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- AbstractDatabaseManager.java 2001/11/30 12:09:09 1.27
+++ AbstractDatabaseManager.java 2001/12/03 11:18:36 1.28
@@ -13,7 +13,7 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.db.services.SQLParser;
+import org.apache.avalon.db.services.ParserManager;
import org.apache.avalon.db.services.SQLOptimizer;
import org.apache.avalon.db.transport.Reply;
import org.apache.avalon.db.transport.Request;
@@ -27,12 +27,12 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
*/
public abstract class AbstractDatabaseManager extends AbstractLogEnabled
implements Composable, Initializable {
- protected SQLParser mSQLParser;
+ protected ParserManager mSQLParser;
protected SQLOptimizer mSQLOptimizer;
/**
@@ -48,7 +48,7 @@
getLogger().info("AvalonDB.compose()");
- mSQLParser = (SQLParser)
componentManager.lookup(SQLParser.class.getName());
+ mSQLParser = (ParserManager)
componentManager.lookup(ParserManager.class.getName());
mSQLOptimizer = (SQLOptimizer)
componentManager.lookup(SQLOptimizer.class.getName());
}
1.5 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractRequestHandler.java
Index: AbstractRequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractRequestHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractRequestHandler.java 2001/11/19 12:11:54 1.4
+++ AbstractRequestHandler.java 2001/12/03 11:18:36 1.5
@@ -13,7 +13,7 @@
import org.apache.avalon.db.transport.Request;
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.services.DatabasePersistor;
-import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
+import org.apache.avalon.db.basic.parser.BasicLXSQLParserManager;
public abstract class AbstractRequestHandler extends AbstractLogEnabled {
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractParserManager.java
Index: AbstractParserManager.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.server;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.db.services.ParserManager;
import org.apache.avalon.db.services.DatabasePersistor;
import org.apache.avalon.db.bcel.parser.GeneratedObjectClassLoader;
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.transport.Request;
import org.apache.avalon.db.transport.Reply;
import org.apache.avalon.db.transport.UnknownRequestReply;
import org.apache.avalon.db.transport.ExceptionReply;
import org.apache.avalon.db.server.stdhandlers.PingHandler;
import org.apache.avalon.db.server.stdhandlers.CatalogHandler;
import org.apache.avalon.db.server.stdhandlers.EstablishConnectionHandler;
import org.apache.avalon.db.server.stdhandlers.CloseHandler;
import org.apache.avalon.db.server.stdhandlers.MakeStatementHandler;
import java.util.HashMap;
/**
* Class BCELSQLParser
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public abstract class AbstractParserManager extends AbstractLogEnabled
implements Block, ParserManager, Contextualizable, Composable,
Configurable, Initializable {
protected DatabasePersistor mDatabasePersistor;
protected GeneratedObjectClassLoader mGenClassLoader = new
GeneratedObjectClassLoader(AbstractParserManager.class.getClassLoader());
protected static int mGenObjSeq;
protected HashMap mGeneratedObjTranslation = new HashMap();
protected BlockContext mBlockContext;
protected AbstractRequestHandler[] mAbstractRequestHandlers;
/**
* Method contextualize
*
*
* @param context
*
* @throws ContextException
*
*/
public final void contextualize(Context context) throws ContextException {
mBlockContext = (BlockContext) context;
}
/**
* Method compose
*
*
* @param componentManager
*
* @throws ComponentException
*
*/
public void compose(ComponentManager componentManager) throws
ComponentException {
mDatabasePersistor =
(DatabasePersistor)
componentManager.lookup(DatabasePersistor.class.getName());
}
/**
* Method configure
*
*
* @param configuration
*
* @throws ConfigurationException
*
*/
public void configure(Configuration configuration) throws
ConfigurationException {
}
/**
* Initialialize the component. Initialization includes
* allocating any resources required throughout the
* components lifecycle.
*
* @exception Exception if an error occurs
*/
public void initialize()
throws Exception {
mAbstractRequestHandlers = getRequestHandlers();
}
public Reply processRequest(Request request) {
try {
AbstractRequestHandler arh =
mAbstractRequestHandlers[request.getRequestCode()];
if (arh == null ) {
System.out.println("unknown rqst " +
request.getRequestCode());
return new UnknownRequestReply();
} else {
return arh.handleRequest(request);
}
} catch (ActionException ae) {
getLogger().error("processRequest(): ActionException",ae);
return new ExceptionReply(ae.getMessage());
} catch (Throwable t) {
System.err.println("**** Unknown Exception ");
t.printStackTrace();
getLogger().error("processRequest(): unknown exception - " +
t.getMessage() ,t);
return new ExceptionReply("Unknown exception caught in server - "
+ t.getMessage());
}
}
private AbstractRequestHandler[] getRequestHandlers() {
AbstractRequestHandler[] handlers = new AbstractRequestHandler[1000];
// standard
handlers[Request.PING] = new PingHandler(mDatabasePersistor);
handlers[Request.SETCATALOG] = new CatalogHandler(mDatabasePersistor);
handlers[Request.CATALOGREQUEST] = new
CatalogHandler(mDatabasePersistor);
handlers[Request.ESTABLISHCONNECTION] = new
EstablishConnectionHandler(mDatabasePersistor);
handlers[Request.CLOSECONNECTION] = new
CloseHandler(mDatabasePersistor); //TODO
handlers[Request.CLOSESTATEMENT] = new
CloseHandler(mDatabasePersistor); //TODO
handlers[Request.MAKESTATEMENT] = new
MakeStatementHandler(mDatabasePersistor);
// custom
getCustomRequestHandlers(handlers);
// decorate them with logging capability.
for (int i = 0; i < handlers.length; i++) {
if (handlers[i] != null) {
handlers[i].enableLogging(super.getLogger());
}
}
return handlers;
}
protected abstract void getCustomRequestHandlers(AbstractRequestHandler[]
handlers);
}
1.4 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/lxsql/AbstractLXSQLParser.java
Index: AbstractLXSQLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/lxsql/AbstractLXSQLParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractLXSQLParser.java 2001/11/30 20:43:15 1.3
+++ AbstractLXSQLParser.java 2001/12/03 11:18:36 1.4
@@ -8,7 +8,7 @@
*/
package org.apache.avalon.db.server.lxsql;
-import org.apache.avalon.db.server.AbstractParser;
+import org.apache.avalon.db.server.AbstractParserManager;
import org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory;
import org.apache.avalon.framework.component.ComponentException;
@@ -31,7 +31,7 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision: 1.13 $
*/
-public abstract class AbstractLXSQLParser extends AbstractParser {
+public abstract class AbstractLXSQLParser extends AbstractParserManager {
private DocumentBuilderFactory mDocumentBuilderFactory;
private DocumentBuilder mDocumentBuilder;
1.3 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/sql/AbstractSQLParser.java
Index: AbstractSQLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/sql/AbstractSQLParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractSQLParser.java 2001/11/29 13:04:44 1.2
+++ AbstractSQLParser.java 2001/12/03 11:18:36 1.3
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.db.server.sql;
-import org.apache.avalon.db.server.AbstractParser;
+import org.apache.avalon.db.server.AbstractParserManager;
/**
* Class AbstractSQLParser
@@ -17,7 +17,7 @@
* @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision: 1.13 $
*/
-public abstract class AbstractSQLParser extends AbstractParser {
+public abstract class AbstractSQLParser extends AbstractParserManager {
}
1.6 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/services/DatabaseManager.java
Index: DatabaseManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/services/DatabaseManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabaseManager.java 2001/11/19 12:11:54 1.5
+++ DatabaseManager.java 2001/12/03 11:18:36 1.6
@@ -22,7 +22,7 @@
*/
public interface DatabaseManager {
- // Resulting block will depend on SQLParser & SQLOptimizer
+ // Resulting block will depend on ParserManager & SQLOptimizer
Reply processRequest(Request request);
}
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/services/ParserManager.java
Index: ParserManager.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.services;
import org.apache.avalon.db.actions.Action;
import org.apache.avalon.db.actions.Select;
import org.apache.avalon.db.actions.CreateTable;
import org.apache.avalon.db.actions.InsertRows;
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.actions.CreateView;
import org.apache.avalon.db.actions.DeleteRows;
import org.apache.avalon.db.transport.Request;
import org.apache.avalon.db.transport.SelectRequest;
import org.apache.avalon.db.transport.CreateTableRequest;
import org.apache.avalon.db.transport.InsertRowsRequest;
import org.apache.avalon.db.transport.CreateViewRequest;
import org.apache.avalon.db.transport.DeleteRowsRequest;
import org.apache.avalon.db.transport.Reply;
import org.apache.avalon.db.server.AbstractRequestHandler;
/**
* Interface ParserManager
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version * $Revision: 1.1 $
*/
public interface ParserManager {
void initializeAction(Action action) throws ActionException ;
Reply processRequest(Request request);
}
1.5 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.xinfo
Index: PlainCMDDatabaseManager.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.xinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PlainCMDDatabaseManager.xinfo 2001/11/03 15:02:07 1.4
+++ PlainCMDDatabaseManager.xinfo 2001/12/03 11:18:36 1.5
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
- <service name="org.apache.avalon.db.services.SQLParser" version="1.0"/>
+ <service name="org.apache.avalon.db.services.ParserManager"
version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.db.services.SQLOptimizer"
version="1.0"/>
1.3 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.xinfo
Index: SoapDatabaseManager.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/soap/server/SoapDatabaseManager.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SoapDatabaseManager.xinfo 2001/11/02 22:16:17 1.2
+++ SoapDatabaseManager.xinfo 2001/12/03 11:18:36 1.3
@@ -18,7 +18,7 @@
<service
name="org.apache.avalon.cornerstone.services.soapification.SOAPification"
version="1.0"/>
</dependency>
<dependency>
- <service name="org.apache.avalon.db.services.SQLParser" version="1.0"/>
+ <service name="org.apache.avalon.db.services.ParserManager"
version="1.0"/>
</dependency>
<dependency>
<service name="org.apache.avalon.db.services.SQLOptimizer"
version="1.0"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
