bloritsch 01/02/06 07:23:42
Modified: lib Tag: xml-cocoon2 avalonapi.jar
src/org/apache/cocoon Tag: xml-cocoon2 Roles.java
src/org/apache/cocoon/acting Tag: xml-cocoon2
AddEmployeeAction.java DelEmployeeAction.java
UpdEmployeeAction.java
src/org/apache/cocoon/components/classloader Tag:
xml-cocoon2 RepositoryClassLoader.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 esql.xsl
src/org/apache/cocoon/generation Tag: xml-cocoon2
HTMLGenerator.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
SQLTransformer.java
webapp Tag: xml-cocoon2 cocoon.xconf
Removed: src/org/apache/cocoon/components/datasource Tag: xml-cocoon2
DataSourceComponent.java J2eeDataSource.java
JdbcConnection.java JdbcConnectionPool.java
JdbcDataSource.java
Log:
Final datasource move to Avalon is finally complete.
Revision Changes Path
No revision
No revision
1.1.2.15 +286 -520 xml-cocoon/lib/Attic/avalonapi.jar
<<Binary file>>
No revision
No revision
1.1.2.4 +3 -3 xml-cocoon/src/org/apache/cocoon/Attic/Roles.java
Index: Roles.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Roles.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Roles.java 2001/01/15 04:22:06 1.1.2.3
+++ Roles.java 2001/02/06 15:23:36 1.1.2.4
@@ -5,14 +5,14 @@
* version 1.1, a copy of which has been included with this distribution in
*
* the LICENSE file.
*
*****************************************************************************/
-
+
package org.apache.cocoon;
/**
* Created this interface to specify the Avalon role names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/01/15 04:22:06 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/02/06 15:23:36 $
*/
public interface Roles {
@@ -28,6 +28,6 @@
String CLASS_LOADER =
"org.apache.cocoon.components.classloader.ClassLoaderManager";
String POOL_CONTROLLER =
"org.apache.avalon.util.pool.PoolController";
String IMAGE_ENCODER =
"org.apache.cocoon.components.image.ImageEncoderSelector";
- String DB_CONNECTION =
"org.apache.cocoon.components.datasource.DataSourceComponentSelector";
+ String DB_CONNECTION =
"org.apache.avalon.util.datasource.DataSourceComponentSelector";
}
No revision
No revision
1.1.2.7 +2 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/AddEmployeeAction.java
Index: AddEmployeeAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AddEmployeeAction.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AddEmployeeAction.java 2001/01/11 21:01:41 1.1.2.6
+++ AddEmployeeAction.java 2001/02/06 15:23:36 1.1.2.7
@@ -25,7 +25,7 @@
import org.apache.avalon.Parameters;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.components.datasource.DataSourceComponent;
+import org.apache.avalon.util.datasource.DataSourceComponent;
import org.xml.sax.SAXException;
import org.xml.sax.EntityResolver;
@@ -34,7 +34,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/01/11 21:01:41 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/06 15:23:36 $
*/
public class AddEmployeeAction extends ComposerAction {
1.1.2.5 +2 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/DelEmployeeAction.java
Index: DelEmployeeAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DelEmployeeAction.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- DelEmployeeAction.java 2001/01/13 16:28:49 1.1.2.4
+++ DelEmployeeAction.java 2001/02/06 15:23:37 1.1.2.5
@@ -24,7 +24,7 @@
import org.apache.avalon.Parameters;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.components.datasource.DataSourceComponent;
+import org.apache.avalon.util.datasource.DataSourceComponent;
import org.xml.sax.SAXException;
import org.xml.sax.EntityResolver;
@@ -33,7 +33,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/01/13 16:28:49 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/02/06 15:23:37 $
*/
public class DelEmployeeAction extends ComposerAction {
1.1.2.6 +2 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/UpdEmployeeAction.java
Index: UpdEmployeeAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/UpdEmployeeAction.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- UpdEmployeeAction.java 2001/01/12 15:25:59 1.1.2.5
+++ UpdEmployeeAction.java 2001/02/06 15:23:37 1.1.2.6
@@ -24,7 +24,7 @@
import org.apache.avalon.Parameters;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.components.datasource.DataSourceComponent;
+import org.apache.avalon.util.datasource.DataSourceComponent;
import org.xml.sax.SAXException;
import org.xml.sax.EntityResolver;
@@ -33,7 +33,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/01/12 15:25:59 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/06 15:23:37 $
*/
public class UpdEmployeeAction extends ComposerAction {
No revision
No revision
1.1.2.19 +4 -1
xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java
Index: RepositoryClassLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/RepositoryClassLoader.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- RepositoryClassLoader.java 2001/01/30 17:25:21 1.1.2.18
+++ RepositoryClassLoader.java 2001/02/06 15:23:38 1.1.2.19
@@ -19,6 +19,7 @@
import java.net.URLClassLoader;
import java.net.MalformedURLException;
+import org.apache.cocoon.util.NetUtils;
import org.apache.cocoon.util.IOUtils;
import org.apache.cocoon.util.ClassUtils;
@@ -33,9 +34,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/01/30 17:25:21 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/02/06 15:23:38 $
*/
class RepositoryClassLoader extends URLClassLoader implements Loggable {
+
/**
* The logger
*/
@@ -67,6 +69,7 @@
this.log = logger;
}
}
+
/**
* Create a class loader from a list of directories
No revision
No revision
1.1.2.43 +2 -2
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/esql.xsl
Index: esql.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/esql.xsl,v
retrieving revision 1.1.2.42
retrieving revision 1.1.2.43
diff -u -r1.1.2.42 -r1.1.2.43
--- esql.xsl 2001/02/06 08:26:22 1.1.2.42
+++ esql.xsl 2001/02/06 15:23:39 1.1.2.43
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.1.2.42 2001/02/06 08:26:22 giacomo Exp $-->
+<!-- $Id: esql.xsl,v 1.1.2.43 2001/02/06 15:23:39 bloritsch Exp $-->
<!--
============================================================================
@@ -181,7 +181,7 @@
<xsp:include>org.apache.turbine.util.db.pool.DBConnection</xsp:include>
</xsl:when>
<xsl:when test="$environment = 'cocoon2'">
-
<xsp:include>org.apache.cocoon.components.datasource.DataSourceComponent</xsp:include>
+
<xsp:include>org.apache.avalon.util.datasource.DataSourceComponent</xsp:include>
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPUtil</xsp:include>
</xsl:when>
</xsl:choose>
No revision
No revision
1.1.2.7 +2 -1
xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- HTMLGenerator.java 2001/02/05 16:23:10 1.1.2.6
+++ HTMLGenerator.java 2001/02/06 15:23:40 1.1.2.7
@@ -10,6 +10,7 @@
import org.apache.avalon.Poolable;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.xml.dom.DOMStreamer;
@@ -27,7 +28,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/05 16:23:10 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/06 15:23:40 $
*/
public class HTMLGenerator extends ComposerGenerator implements Poolable {
/**
No revision
No revision
1.1.2.18 +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.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- SQLTransformer.java 2001/01/22 21:56:51 1.1.2.17
+++ SQLTransformer.java 2001/02/06 15:23:41 1.1.2.18
@@ -26,7 +26,7 @@
import org.apache.avalon.Composer;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.components.datasource.DataSourceComponent;
+import org.apache.avalon.util.datasource.DataSourceComponent;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
import org.apache.cocoon.util.ClassUtils;
@@ -47,7 +47,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.17 $ $Date: 2001/01/22 21:56:51 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/02/06 15:23:41 $ $Author:
bloritsch $
*/
public class SQLTransformer extends AbstractTransformer implements Composer,
Loggable {
No revision
No revision
1.1.2.18 +1 -1 xml-cocoon/webapp/Attic/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- cocoon.xconf 2001/01/17 17:24:16 1.1.2.17
+++ cocoon.xconf 2001/02/06 15:23:41 1.1.2.18
@@ -65,7 +65,7 @@
</program-generator>
<datasources>
- <component-instance name="personnel"
class="org.apache.cocoon.components.datasource.JdbcDataSource">
+ <component-instance name="personnel"
class="org.apache.avalon.util.datasource.JdbcDataSource">
<pool-controller min="5" max="10"/>
<dburl>jdbc:postgresql://localhost/test</dburl>
<user>test</user>
