bloritsch 01/07/13 06:22:30
Modified: src/org/apache/cocoon/acting Tag: cocoon_20_branch
DatabaseAddAction.java DatabaseDeleteAction.java
DatabaseUpdateAction.java OraAddAction.java
Log:
synchronize "descriptor" changes
Revision Changes Path
No revision
No revision
1.6.2.2 +6 -6 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- DatabaseAddAction.java 2001/07/07 19:07:40 1.6.2.1
+++ DatabaseAddAction.java 2001/07/13 13:22:05 1.6.2.2
@@ -38,12 +38,12 @@
* Adds record in a database. The action can update one or more tables,
* and can add more than one row to a table at a time. The form descriptor
* semantics for this are still in a bit of a state of flux. Note
- * that if a secondary table relies on the value of a new primary key in a
+ * that if a secondary table relies on the value of a new primary key in a
* primary table, the primary key must be created using manual mode.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.6.2.1 $ $Date: 2001/07/07 19:07:40 $
+ * @version CVS $Revision: 1.6.2.2 $ $Date: 2001/07/13 13:22:05 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction {
protected static final Map addStatements = new HashMap();
@@ -51,7 +51,7 @@
/**
* Add a record to the database. This action assumes that
- * the file referenced by the "form-descriptor" parameter conforms
+ * the file referenced by the "descriptor" parameter conforms
* to the AbstractDatabaseAction specifications.
*/
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
String source, Parameters param) throws Exception {
@@ -60,7 +60,7 @@
Map results = new HashMap();
try {
- Configuration conf =
this.getConfiguration(param.getParameter("form-descriptor", null));
+ Configuration conf =
this.getConfiguration(param.getParameter("descriptor", null));
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
@@ -207,8 +207,8 @@
* </dl>
*
* This method has a couple of side effects. If the mode is manual,
- * the key value is stored in the request object's attributes for use
- * by other inserts. The key is the string "key:TABLENAME:DBCOL".
+ * the key value is stored in the request object's attributes for use
+ * by other inserts. The key is the string "key:TABLENAME:DBCOL".
* This method also puts the value of manually created keys in the results
* map. That key is simply the value of the dbcol attribute. Note this
* stuff is definitely up in the air.
1.3.2.2 +3 -3
xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- DatabaseDeleteAction.java 2001/07/07 19:07:40 1.3.2.1
+++ DatabaseDeleteAction.java 2001/07/13 13:22:09 1.3.2.2
@@ -38,14 +38,14 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/07 19:07:40 $
+ * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/07/13 13:22:09 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction {
private static final Map deleteStatements = new HashMap();
/**
* Delete a record from the database. This action assumes that
- * the file referenced by the "form-descriptor" parameter conforms
+ * the file referenced by the "descriptor" parameter conforms
* to the AbstractDatabaseAction specifications.
*/
public final Map act(Redirector redirector, SourceResolver resolver, Map
objectModel, String source, Parameters param) throws Exception {
@@ -54,7 +54,7 @@
int currentIndex = 0;
try {
- Configuration conf =
this.getConfiguration(param.getParameter("form-descriptor", null));
+ Configuration conf =
this.getConfiguration(param.getParameter("descriptor", null));
String query = this.getDeleteQuery(conf);
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
1.3.2.2 +3 -3
xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- DatabaseUpdateAction.java 2001/07/07 19:07:41 1.3.2.1
+++ DatabaseUpdateAction.java 2001/07/13 13:22:11 1.3.2.2
@@ -35,14 +35,14 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/07 19:07:41 $
+ * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/07/13 13:22:11 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction {
private static final Map updateStatements = new HashMap();
/**
* Delete a record from the database. This action assumes that
- * the file referenced by the "form-descriptor" parameter conforms
+ * the file referenced by the "descriptor" parameter conforms
* to the AbstractDatabaseAction specifications.
*/
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
String source, Parameters param) throws Exception {
@@ -51,7 +51,7 @@
int currentIndex = 0;
try {
- Configuration conf =
this.getConfiguration(param.getParameter("form-descriptor", null));
+ Configuration conf =
this.getConfiguration(param.getParameter("descriptor", null));
String query = this.getUpdateQuery(conf);
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
1.3.2.1 +3 -3 xml-cocoon2/src/org/apache/cocoon/acting/OraAddAction.java
Index: OraAddAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/OraAddAction.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- OraAddAction.java 2001/06/05 21:36:21 1.3
+++ OraAddAction.java 2001/07/13 13:22:14 1.3.2.1
@@ -40,14 +40,14 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/05 21:36:21 $
+ * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/07/13 13:22:14 $
*/
public class OraAddAction extends DatabaseAddAction {
private static final Map selectLOBStatements = new HashMap();
/**
* Add a record to the database. This action assumes that
- * the file referenced by the "form-descriptor" parameter conforms
+ * the file referenced by the "descriptor" parameter conforms
* to the AbstractDatabaseAction specifications.
*/
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
String source, Parameters param) throws Exception {
@@ -56,7 +56,7 @@
int currentIndex = 0;
try {
- Configuration conf =
this.getConfiguration(param.getParameter("form-descriptor", null));
+ Configuration conf =
this.getConfiguration(param.getParameter("descriptor", null));
String query = this.getAddQuery(conf);
datasource = this.getDataSource(conf);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
