hammant 01/10/30 12:06:33
Modified: apps/db/lib readme.txt
apps/db/src/java/org/apache/avalon/db/actions Action.java
Select.java
apps/db/src/java/org/apache/avalon/db/server
AbstractDatabaseManager.java
Log:
Instructions for BCEL jar and tidy of up compilation bugs
Revision Changes Path
1.2 +1 -1 jakarta-avalon-cornerstone/apps/db/lib/readme.txt
Index: readme.txt
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/lib/readme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readme.txt 2001/10/28 14:09:19 1.1
+++ readme.txt 2001/10/30 20:06:32 1.2
@@ -1 +1 @@
-No libs as yet for DB
\ No newline at end of file
+place bcel.jar from Jakarta's BCEL project here.
\ No newline at end of file
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Action.java 2001/10/30 17:45:14 1.2
+++ Action.java 2001/10/30 20:06:32 1.3
@@ -15,8 +15,8 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.2 $
+ * @version * $Revision: 1.3 $
*/
public interface Action {
- void execute();
+ void execute() throws ActionException;
}
1.3 +3 -5
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Select.java
Index: Select.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/Select.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Select.java 2001/10/28 20:57:39 1.2
+++ Select.java 2001/10/30 20:06:32 1.3
@@ -18,18 +18,16 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version * $Revision: 1.2 $
+ * @version * $Revision: 1.3 $
*/
public interface Select extends ReadAction {
/**
- * Method execute
+ * Method getRowSet
*
*
* @return
*
- * @throws ActionException
- *
*/
- RowSet execute() throws ActionException;
+ RowSet getRowSet();
}
1.4 +3 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractDatabaseManager.java 2001/10/29 17:59:24 1.3
+++ AbstractDatabaseManager.java 2001/10/30 20:06:33 1.4
@@ -27,7 +27,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public abstract class AbstractDatabaseManager extends AbstractLoggable {
@@ -94,6 +94,7 @@
mSQLOptimizer.optimizeSelectRequest(selectRequest);
Select select =
mSQLParser.createSelectAction(optimizedSelectRequest);
- return new ResultSetReply(select.execute());
+ select.execute();
+ return new ResultSetReply(select.getRowSet());
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
