bloritsch 01/07/13 06:21:37
Modified: src/org/apache/cocoon/acting DatabaseAddAction.java
DatabaseDeleteAction.java DatabaseUpdateAction.java
OraAddAction.java
Log:
synchronize "descriptor" parameters.
Revision Changes Path
1.9 +3 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DatabaseAddAction.java 2001/07/11 08:47:49 1.8
+++ DatabaseAddAction.java 2001/07/13 13:21:10 1.9
@@ -43,7 +43,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/07/11 08:47:49 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/07/13 13:21:10 $
*/
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 {
@@ -66,7 +66,7 @@
// read local parameter settings
try {
Configuration conf =
- this.getConfiguration(param.getParameter("form-descriptor", (String)
this.settings.get("descriptor")),
+ this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")),
param.getParameterAsBoolean("reloadable",reloadable));
datasource = this.getDataSource(conf);
1.6 +10 -10
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabaseDeleteAction.java 2001/07/11 08:47:52 1.5
+++ DatabaseDeleteAction.java 2001/07/13 13:21:15 1.6
@@ -38,14 +38,14 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/07/11 08:47:52 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/07/13 13:21:15 $
*/
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 {
@@ -53,15 +53,15 @@
Connection conn = null;
int currentIndex = 0;
- // read global parameter settings
- boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT;
- if (this.settings.containsKey("reloadable"))
- reloadable = Boolean.getBoolean((String) this.settings.get("reloadable"));
- // read local parameter settings
+ // read global parameter settings
+ boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT;
+ if (this.settings.containsKey("reloadable"))
+ reloadable = Boolean.getBoolean((String) this.settings.get("reloadable"));
+ // read local parameter settings
try {
- Configuration conf =
- this.getConfiguration(param.getParameter("form-descriptor", (String)
this.settings.get("descriptor")),
-
param.getParameterAsBoolean("reloadable",reloadable));
+ Configuration conf =
+ this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")),
+ param.getParameterAsBoolean("reloadable",reloadable));
String query = this.getDeleteQuery(conf);
datasource = this.getDataSource(conf);
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabaseUpdateAction.java 2001/07/11 08:47:53 1.5
+++ DatabaseUpdateAction.java 2001/07/13 13:21:19 1.6
@@ -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.5 $ $Date: 2001/07/11 08:47:53 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/07/13 13:21:19 $
*/
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 {
@@ -57,7 +57,7 @@
// read local parameter settings
try {
Configuration conf =
- this.getConfiguration(param.getParameter("form-descriptor", (String)
this.settings.get("descriptor")),
+ this.getConfiguration(param.getParameter("descriptor", (String)
this.settings.get("descriptor")),
param.getParameterAsBoolean("reloadable",reloadable));
String query = this.getUpdateQuery(conf);
1.4 +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.4
diff -u -r1.3 -r1.4
--- OraAddAction.java 2001/06/05 21:36:21 1.3
+++ OraAddAction.java 2001/07/13 13:21:21 1.4
@@ -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.4 $ $Date: 2001/07/13 13:21:21 $
*/
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]
