Author: cziegeler
Date: Sat Feb 5 09:12:19 2005
New Revision: 151511
URL: http://svn.apache.org/viewcvs?view=rev&rev=151511
Log:
Fix problems with ojb block: as the avalon data source uses static methods, we
can only use one ojb implementation at a time.
Modified:
cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf
cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
Modified: cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf?view=diff&r1=151510&r2=151511
==============================================================================
--- cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf (original)
+++ cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf Sat Feb 5
09:12:19 2005
@@ -28,8 +28,8 @@
<!-- Include roles -->
<include src="resource://org/apache/cocoon/ojb/ojb.roles"/>
- <!-- ODMG Implementation Interface -->
- <ojb-odmg logger="core.ojb-odmg"/>
+ <!-- ODMG Implementation Interface
+ <ojb-odmg logger="core.ojb-odmg"/ -->
<!-- PersistenceBroker Interface -->
<ojb-pb logger="core.ojb-pb"/>
Modified:
cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java?view=diff&r1=151510&r2=151511
==============================================================================
---
cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
(original)
+++
cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
Sat Feb 5 09:12:19 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
* @author giacomo
* @version $Id$
*/
-public class AbstractOjbImpl
+public abstract class AbstractOjbImpl
extends AbstractLogEnabled
implements Initializable, Disposable, Serviceable {
