You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2001/12/06 01:54:46 UTC
cvs commit: jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server AbstractParserManager.java
hammant 01/12/05 16:54:46
Modified: apps/db/src/java/org/apache/avalon/db/basic/actions
BasicCreateView.java
apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql
BasicLXSQLCreateIndexHandler.java
BasicLXSQLCreateTableHandler.java
BasicLXSQLCreateViewHandler.java
BasicLXSQLDeleteRowsHandler.java
BasicLXSQLDropIndexHandler.java
BasicLXSQLDropTableHandler.java
BasicLXSQLDropViewHandler.java
BasicLXSQLQueryableHandler.java
BasicLXSQLUpdateRowsHandler.java
apps/db/src/java/org/apache/avalon/db/server
AbstractParserManager.java
Added: apps/db/src/java/org/apache/avalon/db/data/impl
AbstractDelegatedColumn.java
DefaultDelegatedIntegerColumn.java
DefaultDelegatedVarcharColumn.java
Log:
Columns for Views uses Delegates now
Revision Changes Path
1.15 +7 -7 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateView.java
Index: BasicCreateView.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/BasicCreateView.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BasicCreateView.java 2001/11/29 10:35:26 1.14
+++ BasicCreateView.java 2001/12/06 00:54:45 1.15
@@ -15,6 +15,7 @@
import org.apache.avalon.db.data.Table;
import org.apache.avalon.db.data.View;
import org.apache.avalon.db.data.Queryable;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
import org.apache.avalon.db.basic.data.BasicTable;
import org.apache.avalon.db.basic.data.BasicView;
import org.apache.avalon.db.services.DatabasePersistor;
@@ -27,17 +28,18 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public class BasicCreateView extends BasicCreateQueryable implements CreateView {
- private String mViewName, mOnName;
+ private String mViewName;
+ private AbstractQueryable mOnQueryable;
private BasicCriteria mBasicCriteria;
- public BasicCreateView(String viewName, String onName, Column[] columns ,BasicCriteria basicCriteria) {
+ public BasicCreateView(String viewName, AbstractQueryable onQueryable, Column[] columns ,BasicCriteria basicCriteria) {
super(columns);
mViewName = viewName;
- mOnName = onName;
+ mOnQueryable = onQueryable;
mBasicCriteria = basicCriteria;
}
@@ -53,9 +55,7 @@
System.out.println("cv execute");
- Queryable queryable = mDatabasePersistor.getQueryable(mOnName);
-
- BasicView view = new BasicView(mViewName, mColumns, queryable, mBasicCriteria);
+ BasicView view = new BasicView(mViewName, mColumns, mOnQueryable, mBasicCriteria);
view.enableLogging(this.getLogger());
1.10 +11 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BasicLXSQLCreateIndexHandler.java 2001/12/03 11:18:35 1.9
+++ BasicLXSQLCreateIndexHandler.java 2001/12/06 00:54:45 1.10
@@ -18,9 +18,12 @@
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.actions.CreateIndex;
import org.apache.avalon.db.server.DBRequestContext;
+import org.apache.avalon.db.data.Column;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
@@ -28,7 +31,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class BasicLXSQLCreateIndexHandler extends BasicLXSQLHandler {
@@ -75,4 +78,11 @@
return new WriteReply(action.getRecordCount());
}
}
+
+ protected Column makeColumn(AbstractQueryable aq, Node columnNode, int ix) throws ActionException {
+ return null;
+ // not needed
+ // TODO some more abstracting
+ }
+
}
1.9 +8 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasicLXSQLCreateTableHandler.java 2001/12/03 11:18:35 1.8
+++ BasicLXSQLCreateTableHandler.java 2001/12/06 00:54:45 1.9
@@ -20,11 +20,13 @@
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.actions.CreateTable;
import org.apache.avalon.db.data.Column;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
import org.apache.avalon.db.server.DBRequestContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
/**
@@ -32,7 +34,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class BasicLXSQLCreateTableHandler extends BasicLXSQLQueryableHandler {
@@ -49,6 +51,10 @@
super(parser, databasePersistor);
}
+ protected Column makeColumn(AbstractQueryable aq, Node columnNode, int ix) throws ActionException {
+ return super.createColumn(columnNode, ix);
+ }
+
/**
* Method handleRequest
*
@@ -75,7 +81,7 @@
NodeList subRootNodes = rootElement.getChildNodes();
for (int i = 0; i < subRootNodes.getLength(); i++) {
if (subRootNodes.item(i).getNodeName().equals("columns")) {
- columns = getColumns((Element) subRootNodes.item(i));
+ columns = getColumns(null, (Element) subRootNodes.item(i));
}
}
CreateTable action = new BasicCreateTable(tableName, columns);
1.12 +11 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasicLXSQLCreateViewHandler.java 2001/12/03 11:18:35 1.11
+++ BasicLXSQLCreateViewHandler.java 2001/12/06 00:54:45 1.12
@@ -20,11 +20,13 @@
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.actions.CreateView;
import org.apache.avalon.db.data.Column;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
import org.apache.avalon.db.server.DBRequestContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
/**
@@ -32,7 +34,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class BasicLXSQLCreateViewHandler extends BasicLXSQLQueryableHandler {
@@ -67,7 +69,7 @@
Element rootElement = doc.getDocumentElement();
String viewName = rootElement.getAttribute("name");
String onName = rootElement.getAttribute("on");
-
+ AbstractQueryable onQueryable = (AbstractQueryable) mDatabasePersistor.getQueryable(onName);
if (mDatabasePersistor.queryableExists(viewName)) {
throw new ActionException("View " + viewName + " already exists as a Table/View/Index");
} else {
@@ -77,7 +79,7 @@
for (int i = 0; i < subRootNodes.getLength(); i++) {
System.out.println(">>>"+subRootNodes.item(i).getNodeName());
if (subRootNodes.item(i).getNodeName().equals("columns")) {
- columns = this.getColumns((Element) subRootNodes.item(i));
+ columns = this.getColumns(onQueryable, (Element) subRootNodes.item(i));
}
}
@@ -86,7 +88,7 @@
CreateView action = new BasicCreateView(
viewName,
- onName,
+ onQueryable,
columns,
new BasicCriteria(basicCriteriaHelper.getCriteria())
);
@@ -97,4 +99,9 @@
return new WriteReply(action.getRecordCount());
}
}
+
+ protected Column makeColumn(AbstractQueryable aq, Node columnNode, int ix) throws ActionException {
+ return createDelegatedColumn(aq, columnNode, ix);
+ }
+
}
1.11 +5 -1 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BasicLXSQLDeleteRowsHandler.java 2001/12/03 11:18:35 1.10
+++ BasicLXSQLDeleteRowsHandler.java 2001/12/06 00:54:45 1.11
@@ -21,10 +21,13 @@
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.actions.DeleteRows;
import org.apache.avalon.db.data.impl.AbstractConstituentQueryable;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
+import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.server.DBRequestContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
@@ -32,7 +35,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class BasicLXSQLDeleteRowsHandler extends BasicLXSQLHandler {
@@ -79,4 +82,5 @@
return new WriteReply(action.getRecordCount());
}
+
}
1.5 +2 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicLXSQLDropIndexHandler.java 2001/12/03 11:18:35 1.4
+++ BasicLXSQLDropIndexHandler.java 2001/12/06 00:54:45 1.5
@@ -26,9 +26,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
-public class BasicLXSQLDropIndexHandler extends BasicLXSQLQueryableHandler {
+public class BasicLXSQLDropIndexHandler extends BasicLXSQLHandler {
/**
* Constructor BasicLXSQLDropIndexHandler
1.5 +10 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicLXSQLDropTableHandler.java 2001/12/03 11:18:35 1.4
+++ BasicLXSQLDropTableHandler.java 2001/12/06 00:54:45 1.5
@@ -18,15 +18,18 @@
import org.apache.avalon.db.transport.DropTableRequest;
import org.apache.avalon.db.transport.WriteReply;
import org.apache.avalon.db.server.DBRequestContext;
+import org.apache.avalon.db.data.Column;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* Class BasicLXSQLDropTableHandler
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class BasicLXSQLDropTableHandler extends BasicLXSQLQueryableHandler {
@@ -66,5 +69,11 @@
mParser.initializeAction(action);
action.execute();
return new WriteReply(action.getRecordCount());
+ }
+
+ protected Column makeColumn(AbstractQueryable aq, Node columnNode, int ix) throws ActionException {
+ return null;
+ // not needed
+ // TODO some more abstracting
}
}
1.5 +2 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicLXSQLDropViewHandler.java 2001/12/03 11:18:35 1.4
+++ BasicLXSQLDropViewHandler.java 2001/12/06 00:54:45 1.5
@@ -26,9 +26,9 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
-public class BasicLXSQLDropViewHandler extends BasicLXSQLQueryableHandler {
+public class BasicLXSQLDropViewHandler extends BasicLXSQLHandler {
/**
* Constructor BasicLXSQLDropViewHandler
1.6 +29 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicLXSQLQueryableHandler.java 2001/12/03 11:18:35 1.5
+++ BasicLXSQLQueryableHandler.java 2001/12/06 00:54:45 1.6
@@ -11,6 +11,8 @@
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.types.StringColumn;
+import org.apache.avalon.db.data.types.NumericColumn;
import org.apache.avalon.db.data.impl.DefaultVarCharColumn;
import org.apache.avalon.db.data.impl.DefaultIntegerColumn;
import org.apache.avalon.db.data.impl.DefaultDateColumn;
@@ -20,6 +22,9 @@
import org.apache.avalon.db.data.impl.DefaultRealColumn;
import org.apache.avalon.db.data.impl.DefaultBigIntColumn;
import org.apache.avalon.db.data.impl.DefaultDecimalColumn;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
+import org.apache.avalon.db.data.impl.DefaultDelegatedVarcharColumn;
+import org.apache.avalon.db.data.impl.DefaultDelegatedIntegerColumn;
import org.apache.avalon.db.actions.ActionException;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -34,7 +39,7 @@
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @author Gerhard Froehlich <a href="mailto:g-froehlich@gmx.de">g-froehlich@gmx.de</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public abstract class BasicLXSQLQueryableHandler extends BasicLXSQLHandler {
@@ -55,7 +60,7 @@
*
*
*/
- protected Column[] getColumns(Element columnsNode) throws ActionException {
+ protected Column[] getColumns(AbstractQueryable aq, Element columnsNode) throws ActionException {
Vector columns = new Vector();
@@ -63,7 +68,7 @@
for (int x = 0 ; x < subColumnsNodes.getLength(); x++) {
String nodeName = subColumnsNodes.item(x).getNodeName();
if (nodeName.equals("column")) {
- columns.add(createColumn(subColumnsNodes.item(x), x));
+ columns.add(makeColumn(aq, subColumnsNodes.item(x), x));
} else if (nodeName.equals("#text")) {
// do nothing, whitespace between elems
} else {
@@ -81,6 +86,7 @@
}
+ protected abstract Column makeColumn(AbstractQueryable aq, Node columnNode, int ix) throws ActionException;
protected Column createColumn(Node columnNode, int ix) throws ActionException {
Node nameNode = columnNode.getAttributes().getNamedItem("name");
@@ -116,6 +122,26 @@
column= new DefaultDecimalColumn(fieldName);
} else {
throw new ActionException("Column type " + sqlFieldType + " not recognised");
+ }
+ column.setIndex(ix);
+ return column;
+ }
+
+ protected Column createDelegatedColumn(AbstractQueryable aq, Node columnNode, int ix) throws ActionException {
+ Node nameNode = columnNode.getAttributes().getNamedItem("name");
+ if (nameNode == null) {
+ throw new ActionException("'name' not specified for one of the columns");
+ }
+
+ Column col = aq.getColumn(nameNode.getNodeValue());
+ Column column = null;
+ if (col instanceof StringColumn) {
+ column = new DefaultDelegatedVarcharColumn((StringColumn)col,null);
+ } else if (col instanceof NumericColumn) {
+ //TODO
+ column = new DefaultDelegatedIntegerColumn((NumericColumn)col,null);
+ } else {
+ //TODO
}
column.setIndex(ix);
return column;
1.12 +5 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasicLXSQLUpdateRowsHandler.java 2001/12/03 11:18:35 1.11
+++ BasicLXSQLUpdateRowsHandler.java 2001/12/06 00:54:45 1.12
@@ -19,11 +19,14 @@
import org.apache.avalon.db.actions.ActionException;
import org.apache.avalon.db.actions.UpdateRows;
import org.apache.avalon.db.data.impl.AbstractConstituentQueryable;
+import org.apache.avalon.db.data.impl.AbstractQueryable;
+import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.server.DBRequestContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
/**
@@ -31,7 +34,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class BasicLXSQLUpdateRowsHandler extends BasicLXSQLHandler {
@@ -113,4 +116,5 @@
String value = setElement.getAttribute("value");
instructionBuffer.append("row.setValue('"+name+"','" + value + "');\n");
}
+
}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractDelegatedColumn.java
Index: AbstractDelegatedColumn.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.data.impl;
import org.apache.avalon.db.data.Column;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.actions.ActionException;
import java.math.BigDecimal;
/**
* Class AbstractDelegatedColumn
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class AbstractDelegatedColumn extends AbstractColumn {
protected String mAlias;
protected Column mColumn;
/**
* Constructor AbstractDelegatedColumn
*
*
* @param name
*
*/
public AbstractDelegatedColumn(Column column, String alias, String sqlType, String javaType) throws ActionException {
super(column.getName(), sqlType, javaType);
mAlias = alias;
mColumn = column;
}
public Object getValue(Row row) {
return mColumn.getValue(row);
}
public Integer toInteger(Row row) {
return mColumn.toInteger(row);
}
public Long toLong(Row row) {
return mColumn.toLong(row);
}
public BigDecimal toBigDecimal(Row row) {
return mColumn.toBigDecimal(row);
}
public Float toFloat(Row row) {
return mColumn.toFloat(row);
}
public Short toShort(Row row) {
return mColumn.toShort(row);
}
public String toString(Row row) {
return mColumn.toString(row);
}
public int getPrecesion() {
return mColumn.getPrecesion();
}
}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDelegatedIntegerColumn.java
Index: DefaultDelegatedIntegerColumn.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.data.impl;
import org.apache.avalon.db.data.types.NumericColumn;
import org.apache.avalon.db.actions.ActionException;
/**
* Class DefaultDelegatedIntegerColumn
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class DefaultDelegatedIntegerColumn extends AbstractDelegatedColumn implements NumericColumn {
/**
* Constructor DefaultDelegatedIntegerColumn
*
*
* @param name
*
*/
public DefaultDelegatedIntegerColumn(NumericColumn numericColumn, String alias) throws ActionException {
super(numericColumn, alias, "integer", Integer.class.getName());
}
}
1.1 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/DefaultDelegatedVarcharColumn.java
Index: DefaultDelegatedVarcharColumn.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.data.impl;
import org.apache.avalon.db.data.types.StringColumn;
import org.apache.avalon.db.actions.ActionException;
/**
* Class DefaultDelegatedVarcharColumn
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
* @version $Revision: 1.1 $
*/
public class DefaultDelegatedVarcharColumn extends AbstractDelegatedColumn implements StringColumn {
/**
* Constructor DefaultDelegatedVarcharColumn
*
*
* @param name
*
*/
public DefaultDelegatedVarcharColumn(StringColumn stringColumn, String alias) throws ActionException {
super(stringColumn, alias, "varchar", String.class.getName());
}
public int getMaxLength() {
return ((StringColumn) mColumn).getMaxLength();
}
}
1.3 +1 -4 jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractParserManager.java
Index: AbstractParserManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractParserManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractParserManager.java 2001/12/03 17:37:20 1.2
+++ AbstractParserManager.java 2001/12/06 00:54:45 1.3
@@ -43,7 +43,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public abstract class AbstractParserManager extends AbstractLogEnabled
implements Block, ParserManager, Contextualizable, Composable, Configurable, Initializable {
@@ -112,14 +112,11 @@
public Reply processRequest(Request request) {
try {
- System.out.println("here 1");
AbstractRequestHandler arh = mAbstractRequestHandlers[request.getRequestCode()];
- System.out.println("here 2");
if (arh == null ) {
System.out.println("unknown rqst " + request.getRequestCode());
return new UnknownRequestReply();
} else {
- System.out.println("here 3");
return arh.handleRequest(request);
}
} catch (ActionException ae) {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>