bloritsch 01/01/06 08:32:24
Modified: src/org/apache/cocoon/components/datasource Tag: xml-cocoon2
JdbcDataSource.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
webapp/WEB-INF Tag: xml-cocoon2 web.xml
Log:
Change init parameter force-load to driver
Revision Changes Path
No revision
No revision
1.1.2.2 +1 -10
xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/JdbcDataSource.java
Index: JdbcDataSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/datasource/Attic/JdbcDataSource.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JdbcDataSource.java 2001/01/05 23:08:34 1.1.2.1
+++ JdbcDataSource.java 2001/01/06 16:32:17 1.1.2.2
@@ -19,10 +19,9 @@
* The Default implementation for DataSources in Cocoon.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/01/05 23:08:34 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/01/06 16:32:17 $
*/
public class JdbcDataSource implements DataSourceComponent {
- String driver;
String dburl;
String user;
String passwd;
@@ -32,17 +31,9 @@
/** Configure and set up DB connection */
public void configure(Configuration conf)
throws ConfigurationException {
- this.driver = conf.getChild("driver").getValue();
this.dburl = conf.getChild("dburl").getValue();
this.user = conf.getChild("user").getValue();
this.passwd = conf.getChild("password").getValue();
-
- try {
- ClassUtils.newInstance(driver);
- } catch (Exception e) {
- log.error("Could not load Database Driver", e);
- throw new ConfigurationException("Could not load Database
Driver",e);
- }
try {
if (user.equals("")) {
No revision
No revision
1.1.4.42 +2 -2
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.41
retrieving revision 1.1.4.42
diff -u -r1.1.4.41 -r1.1.4.42
--- CocoonServlet.java 2000/12/29 16:55:19 1.1.4.41
+++ CocoonServlet.java 2001/01/06 16:32:20 1.1.4.42
@@ -53,7 +53,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.4.41 $ $Date: 2000/12/29 16:55:19 $
+ * @version CVS $Revision: 1.1.4.42 $ $Date: 2001/01/06 16:32:20 $
*/
public class CocoonServlet extends HttpServlet {
@@ -96,7 +96,7 @@
this.setClassPath(conf.getInitParameter("classpath-attribute"),
this.context);
- this.forceLoad(conf.getInitParameter("force-load"));
+ this.forceLoad(conf.getInitParameter("driver"));
this.workDir = (File)
this.context.getAttribute("javax.servlet.context.tempdir");
No revision
No revision
1.1.2.9 +10 -3 xml-cocoon/webapp/WEB-INF/Attic/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/WEB-INF/Attic/web.xml,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- web.xml 2000/12/29 16:55:20 1.1.2.8
+++ web.xml 2001/01/06 16:32:23 1.1.2.9
@@ -42,10 +42,17 @@
<param-value>DEBUG</param-value>
</init-param>
<init-param>
- <param-name>force-load</param-name>
+ <param-name>driver</param-name>
+ <param-value>
+ <!-- For IBM WebSphere: -->
+ com.ibm.servlet.classloader.Handler
- <!-- For IBM WebSphere: -->
- <param-value>com.ibm.servlet.classloader.Handler</param-value>
+ <!-- For PostgeSQL Database: -->
+ postgresql.Driver
+
+ <!-- For Oracle Database: -->
+ oracle.jdbc.driver.OracleDriver
+ </param-value>
</init-param>
</servlet>
<servlet-mapping>
