donaldp 01/04/16 20:55:17
Modified: lib Tag: xml-cocoon2 avalonapi.jar
src/org/apache/cocoon Tag: xml-cocoon2 Main.java
src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractDatabaseAction.java DatabaseAddAction.java
DatabaseAuthenticatorAction.java
DatabaseDeleteAction.java DatabaseUpdateAction.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
DatabaseReader.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
SQLTransformer.java
Log:
Update to latest avalonapi version to include changes to excalibur hierarchy.
Revision Changes Path
No revision
No revision
1.1.2.46 +558 -576 xml-cocoon/lib/Attic/avalonapi.jar
<<Binary file>>
No revision
No revision
1.1.4.29 +5 -5 xml-cocoon/src/org/apache/cocoon/Attic/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Main.java,v
retrieving revision 1.1.4.28
retrieving revision 1.1.4.29
diff -u -r1.1.4.28 -r1.1.4.29
--- Main.java 2001/04/02 16:35:50 1.1.4.28
+++ Main.java 2001/04/17 03:55:01 1.1.4.29
@@ -25,10 +25,10 @@
import java.util.Map;
import java.util.HashMap;
-import org.apache.avalon.util.cli.CLArgsParser;
-import org.apache.avalon.util.cli.CLOption;
-import org.apache.avalon.util.cli.CLOptionDescriptor;
-import org.apache.avalon.util.cli.CLUtil;
+import org.apache.excalibur.cli.CLArgsParser;
+import org.apache.excalibur.cli.CLOption;
+import org.apache.excalibur.cli.CLOptionDescriptor;
+import org.apache.excalibur.cli.CLUtil;
import org.apache.avalon.DefaultContext;
import org.apache.cocoon.util.IOUtils;
@@ -51,7 +51,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.4.28 $ $Date: 2001/04/02 16:35:50 $
+ * @version CVS $Revision: 1.1.4.29 $ $Date: 2001/04/17 03:55:01 $
*/
public class Main {
No revision
No revision
1.1.2.27 +2 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- AbstractDatabaseAction.java 2001/04/13 16:02:18 1.1.2.26
+++ AbstractDatabaseAction.java 2001/04/17 03:55:05 1.1.2.27
@@ -47,7 +47,7 @@
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.configuration.Parameters;
import org.apache.avalon.configuration.SAXConfigurationHandler;
-import org.apache.avalon.util.datasource.DataSourceComponent;
+import org.apache.excalibur.datasource.DataSourceComponent;
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
@@ -176,7 +176,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/04/13 16:02:18 $
+ * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/04/17 03:55:05 $
*/
public abstract class AbstractDatabaseAction extends
AbstractComplimentaryConfigurableAction implements Configurable, Disposable {
protected Map files = new HashMap();
1.1.2.22 +2 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- DatabaseAddAction.java 2001/04/11 12:41:12 1.1.2.21
+++ DatabaseAddAction.java 2001/04/17 03:55:09 1.1.2.22
@@ -33,14 +33,14 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.avalon.util.datasource.DataSourceComponent;
+import org.apache.excalibur.datasource.DataSourceComponent;
/**
* Add a record in a database. This Action assumes that there is
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/04/11 12:41:12 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/04/17 03:55:09 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction {
protected static final Map addStatements = new HashMap();
1.1.2.2 +4 -4
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAuthenticatorAction.java
Index: DatabaseAuthenticatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAuthenticatorAction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DatabaseAuthenticatorAction.java 2001/04/16 19:30:42 1.1.2.1
+++ DatabaseAuthenticatorAction.java 2001/04/17 03:55:09 1.1.2.2
@@ -1,4 +1,4 @@
-// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.1 2001/04/16 19:30:42 dims
Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.2 2001/04/17 03:55:09
donaldp Exp $
package org.apache.cocoon.acting;
import java.util.Map;
@@ -11,7 +11,7 @@
import org.apache.avalon.configuration.Parameters;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.util.datasource.DataSourceComponent;
+import org.apache.excalibur.datasource.DataSourceComponent;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -54,7 +54,7 @@
* expression.
*
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/04/16 19:30:42 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/17 03:55:09 $
*/
public class DatabaseAuthenticatorAction extends AbstractDatabaseAction
{
@@ -206,5 +206,5 @@
}
}
-// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.1 2001/04/16 19:30:42 dims
Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.1.2.2 2001/04/17 03:55:09
donaldp Exp $
// vim: set et ts=4 sw=4:
1.1.2.13 +2 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- DatabaseDeleteAction.java 2001/04/11 12:41:13 1.1.2.12
+++ DatabaseDeleteAction.java 2001/04/17 03:55:10 1.1.2.13
@@ -33,7 +33,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.avalon.util.datasource.DataSourceComponent;
+import org.apache.excalibur.datasource.DataSourceComponent;
/**
* Delete a record from a database. This Action assumes that all
@@ -43,7 +43,7 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/04/11 12:41:13 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/17 03:55:10 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction {
private static final Map deleteStatements = new HashMap();
1.1.2.18 +2 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- DatabaseUpdateAction.java 2001/04/11 12:41:14 1.1.2.17
+++ DatabaseUpdateAction.java 2001/04/17 03:55:10 1.1.2.18
@@ -33,14 +33,14 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.generation.ImageDirectoryGenerator;
-import org.apache.avalon.util.datasource.DataSourceComponent;
+import org.apache.excalibur.datasource.DataSourceComponent;
/**
* Update a record in a database. This Action assumes that there is
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/04/11 12:41:14 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/04/17 03:55:10 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction {
private static final Map updateStatements = new HashMap();
No revision
No revision
1.1.2.11 +1 -1
xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- DatabaseReader.java 2001/04/13 16:02:24 1.1.2.10
+++ DatabaseReader.java 2001/04/17 03:55:16 1.1.2.11
@@ -13,7 +13,7 @@
import org.apache.avalon.ComponentManager;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.Disposable;
-import org.apache.avalon.util.datasource.DataSourceComponent;
+import org.apache.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
No revision
No revision
1.1.2.23 +2 -2
xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- SQLTransformer.java 2001/04/13 16:02:27 1.1.2.22
+++ SQLTransformer.java 2001/04/17 03:55:17 1.1.2.23
@@ -29,7 +29,7 @@
import org.apache.avalon.Component;
import org.apache.avalon.Poolable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.util.datasource.DataSourceComponent;
+import org.apache.excalibur.datasource.DataSourceComponent;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
@@ -50,7 +50,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/04/13 16:02:27 $ $Author:
dims $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/04/17 03:55:17 $ $Author:
donaldp $
*/
public class SQLTransformer extends AbstractTransformer implements Composer,
Loggable, Poolable, Disposable {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
