Author: cziegeler
Date: Mon Feb 7 00:53:10 2005
New Revision: 151717
URL: http://svn.apache.org/viewcvs?view=rev&rev=151717
Log:
Make cocoon runable again
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-odmg.xconf
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-odmg.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-odmg.xconf?view=diff&r1=151716&r2=151717
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-odmg.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-odmg.xconf Mon Feb 7
00:53:10 2005
@@ -16,6 +16,6 @@
-->
<xconf xpath="/cocoon" unless="ojb-odmg">
- <!-- ODMG Implementation Interface -->
- <ojb-odmg logger="core.ojb-odmg"/>
+ <!-- ODMG Implementation Interface
+ <ojb-odmg logger="core.ojb-odmg"/> -->
</xconf>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java?view=diff&r1=151716&r2=151717
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/AbstractOjbImpl.java
Mon Feb 7 00:53:10 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 {
