You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by fr...@apache.org on 2001/12/03 18:37:05 UTC
cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser BasicSQLParserManager.java BasicLXSQLParserManager.java BasicDualParserManager.java
froehlich 01/12/03 09:37:05
Modified: apps/db/src/java/org/apache/avalon/db/basic/parser
BasicSQLParserManager.java
BasicLXSQLParserManager.java
BasicDualParserManager.java
Log:
start integrating SQL parser into AvalonDB
Revision Changes Path
1.4 +2 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicSQLParserManager.java
Index: BasicSQLParserManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicSQLParserManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicSQLParserManager.java 2001/12/03 12:47:23 1.3
+++ BasicSQLParserManager.java 2001/12/03 17:37:05 1.4
@@ -12,6 +12,7 @@
import org.apache.avalon.db.transport.Request;
import org.apache.avalon.db.actions.Action;
import org.apache.avalon.db.actions.ActionException;
+import org.apache.avalon.db.basic.handlers.sql.BasicSQLSelectSimpleHandler;
/**
* Class BasicSQLParserManager
@@ -21,9 +22,8 @@
public class BasicSQLParserManager extends AbstractSQLParser {
protected void getCustomRequestHandlers(AbstractRequestHandler[] handlers) {
+ handlers[Request.SELECTSIMPLE] = new BasicSQLSelectSimpleHandler(this,mDatabasePersistor);
}
-
- public BasicSQLParserManager() { }
public void initializeAction(Action action) throws ActionException {
action.setDatabasePersistor(mDatabasePersistor);
1.2 +1 -2 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParserManager.java
Index: BasicLXSQLParserManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParserManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicLXSQLParserManager.java 2001/12/03 11:18:36 1.1
+++ BasicLXSQLParserManager.java 2001/12/03 17:37:05 1.2
@@ -35,7 +35,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class BasicLXSQLParserManager extends AbstractLXSQLParser {
@@ -60,5 +60,4 @@
setupLogger(action);
action.initialize();
}
-
}
1.2 +16 -17 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.java
Index: BasicDualParserManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicDualParserManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicDualParserManager.java 2001/12/03 11:18:36 1.1
+++ BasicDualParserManager.java 2001/12/03 17:37:05 1.2
@@ -38,13 +38,12 @@
public class BasicDualParserManager extends AbstractLogEnabled
implements Block, ParserManager, Contextualizable, Composable, Configurable, Initializable {
- private BasicLXSQLParserManager mBasicLXSQLParser;
- private BasicSQLParserManager mBasicSQLParser;
+ private BasicLXSQLParserManager mBasicLXSQLParserMgr;
+ private BasicSQLParserManager mBasicSQLParserMgr;
public BasicDualParserManager() {
- mBasicLXSQLParser = new BasicLXSQLParserManager();
- // TODO - here Gerhard
- //mBasicSQLParser = new BasicSQLParserManager((InputStream) null);
+ mBasicLXSQLParserMgr = new BasicLXSQLParserManager();
+ mBasicSQLParserMgr = new BasicSQLParserManager();
}
/**
@@ -57,8 +56,8 @@
*
*/
public void compose(ComponentManager componentManager) throws ComponentException {
- mBasicLXSQLParser.compose(componentManager);
- if (mBasicSQLParser != null) mBasicSQLParser.compose(componentManager);
+ mBasicLXSQLParserMgr.compose(componentManager);
+ if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.compose(componentManager);
}
/**
@@ -68,8 +67,8 @@
*/
public void enableLogging(Logger logger) {
super.enableLogging(logger);
- mBasicLXSQLParser.enableLogging(logger);
- if (mBasicSQLParser != null) mBasicSQLParser.enableLogging(logger);
+ mBasicLXSQLParserMgr.enableLogging(logger);
+ if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.enableLogging(logger);
}
/**
@@ -82,8 +81,8 @@
*
*/
public void configure(Configuration configuration) throws ConfigurationException {
- mBasicLXSQLParser.configure(configuration);
- if (mBasicSQLParser != null) mBasicSQLParser.configure(configuration);
+ mBasicLXSQLParserMgr.configure(configuration);
+ if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.configure(configuration);
}
/**
@@ -96,8 +95,8 @@
*/
public void contextualize(Context context)
throws ContextException {
- mBasicLXSQLParser.contextualize(context);
- if (mBasicSQLParser != null) mBasicSQLParser.contextualize(context);
+ mBasicLXSQLParserMgr.contextualize(context);
+ if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.contextualize(context);
}
/**
@@ -109,8 +108,8 @@
*/
public void initialize()
throws Exception {
- mBasicLXSQLParser.initialize();
- if (mBasicSQLParser != null) mBasicSQLParser.initialize();
+ mBasicLXSQLParserMgr.initialize();
+ if (mBasicSQLParserMgr != null) mBasicSQLParserMgr.initialize();
}
// overrides parent.
@@ -118,10 +117,10 @@
if (request.getSQLSyntax() == Request.SYNTAX_LXSQL) {
System.out.println("LXSQL");
- return mBasicLXSQLParser.processRequest(request);
+ return mBasicLXSQLParserMgr.processRequest(request);
} else {
System.out.println("SQL");
- return mBasicSQLParser.processRequest(request);
+ return mBasicSQLParserMgr.processRequest(request);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>