Return-Path: 
 <cvs-return-22079-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 34653 invoked from network); 17 Feb 2005 17:13:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 17 Feb 2005 17:13:59 -0000
Received: (qmail 62275 invoked by uid 500); 17 Feb 2005 17:13:58 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 62138 invoked by uid 500); 17 Feb 2005 17:13:58 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 62125 invoked by uid 99); 17 Feb 2005 17:13:58 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 17 Feb 2005 09:13:57 -0800
Received: (qmail 34640 invoked by uid 65534); 17 Feb 2005 17:13:56 -0000
Message-ID: <20050217171356.34637.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Thu, 17 Feb 2005 17:13:56 -0000
Subject: svn commit: r154170 - in cocoon/trunk: ./ src/blocks/ojb/
 src/blocks/ojb/WEB-INF/xconf/ src/blocks/ojb/conf/
 src/blocks/ojb/java/org/apache/cocoon/ojb/broker/components/
 src/blocks/ojb/java/org/apache/cocoon/ojb/components/
 src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/
 src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/
To: cvs@cocoon.apache.org
From: vgritsenko@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: vgritsenko
Date: Thu Feb 17 09:13:51 2005
New Revision: 154170

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D154170
Log:
merge changes:
separate ojb connection factory config out of ojb access components (pb/jdo=
/odmg).
cleanup code.
integrate ojb logging with cocoon logging.

Added:
    cocoon/trunk/src/blocks/ojb/conf/OJB-logging.properties   (props change=
d)
      - copied unchanged from r154169, cocoon/branches/BRANCH_2_1_X/src/blo=
cks/ojb/conf/OJB-logging.properties
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/Conne=
ctionFactoryImpl.java   (props changed)
      - copied unchanged from r154169, cocoon/branches/BRANCH_2_1_X/src/blo=
cks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/Logge=
rImpl.java   (props changed)
      - copied unchanged from r154169, cocoon/branches/BRANCH_2_1_X/src/blo=
cks/ojb/java/org/apache/cocoon/ojb/components/LoggerImpl.java
Removed:
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/Abstr=
actOjbImpl.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/Conne=
ctionFactoryAvalonDataSource.java
Modified:
    cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf
    cocoon/trunk/src/blocks/ojb/build.xml
    cocoon/trunk/src/blocks/ojb/conf/OJB.properties
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/component=
s/PBFactory.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/component=
s/PBFactoryImpl.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/J=
doPMF.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/J=
doPMFImpl.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/=
OdmgImplementation.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/=
OdmgImplementationImpl.java
    cocoon/trunk/status.xml

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/xcon=
f/cocoon-ojb.xconf?view=3Ddiff&r1=3D154169&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf (original)
+++ cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf Thu Feb 17 0=
9:13:51 2005
@@ -23,14 +23,21 @@
   <!-- Include roles -->
   <include src=3D"resource://org/apache/cocoon/ojb/ojb.roles"/>
=20
-  <!-- ODMG Implementation Interface=20
-  <ojb-odmg logger=3D"core.ojb-odmg"/ -->
-  <!-- PersistenceBroker Interface -->
-  <ojb-pb logger=3D"core.ojb-pb"/>
- =20
-  <!-- Persistent Manager Factory for JDO -->
-  <!-- uncomment in order to set the logger to a category other than core.=
startup
-  <ojb-jdo class=3D"org.apache.cocoon.ojb.jdo.components.JdoPMFImpl" logge=
r=3D"core.ojb-jdo"/>
-  -->
+  <!-- OJB Logger -->
+  <component role=3D"org.apache.cocoon.ojb.components.Logger"
+             class=3D"org.apache.cocoon.ojb.components.LoggerImpl"
+             logger=3D"ojb"/>
+
+  <!-- OJB Connection Factory -->
+  <component role=3D"org.apache.cocoon.ojb.components.ConnectionFactory"
+             class=3D"org.apache.cocoon.ojb.components.ConnectionFactoryIm=
pl"
+             logger=3D"core.ojb"/>
+
+  <!-- OJB PersistenceBroker Interface -->
+  <ojb-pb logger=3D"core.ojb.pb"/>
+  <!-- OJB Persistent Manager Factory for JDO -->
+  <ojb-jdo class=3D"org.apache.cocoon.ojb.jdo.components.JdoPMFImpl" logge=
r=3D"core.ojb.jdo"/>
+  <!-- OJB ODMG Implementation Interface -->
+  <ojb-odmg logger=3D"core.ojb.odmg"/>
=20
 </components>

Modified: cocoon/trunk/src/blocks/ojb/build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/build.xml?vi=
ew=3Ddiff&r1=3D154169&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/blocks/ojb/build.xml (original)
+++ cocoon/trunk/src/blocks/ojb/build.xml Thu Feb 17 09:13:51 2005
@@ -42,6 +42,7 @@
     <copy file=3D"${block.dir}/conf/repository_internal.xml" tofile=3D"${b=
uild.webapp.classes}/repository_internal.xml"/>
     <copy file=3D"${block.dir}/conf/repository_user.xml" tofile=3D"${build=
.webapp.classes}/repository_user.xml"/>
     <copy file=3D"${block.dir}/conf/OJB.properties" tofile=3D"${build.weba=
pp.classes}/OJB.properties"/>
+    <copy file=3D"${block.dir}/conf/OJB-logging.properties" tofile=3D"${bu=
ild.webapp.classes}/OJB-logging.properties"/>
   </target>
=20
   <!-- unfortunately this build.xml is called before the samples are compi=
led,

Copied: cocoon/trunk/src/blocks/ojb/conf/OJB-logging.properties (from r1541=
69, cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/OJB-logging.properties)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/conf/OJB-log=
ging.properties?view=3Ddiff&rev=3D154170&p1=3Dcocoon/branches/BRANCH_2_1_X/=
src/blocks/ojb/conf/OJB-logging.properties&r1=3D154169&p2=3Dcocoon/trunk/sr=
c/blocks/ojb/conf/OJB-logging.properties&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
    (empty)

Propchange: cocoon/trunk/src/blocks/ojb/conf/OJB-logging.properties
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/trunk/src/blocks/ojb/conf/OJB-logging.properties
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id

Modified: cocoon/trunk/src/blocks/ojb/conf/OJB.properties
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/conf/OJB.pro=
perties?view=3Ddiff&r1=3D154169&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/blocks/ojb/conf/OJB.properties (original)
+++ cocoon/trunk/src/blocks/ojb/conf/OJB.properties Thu Feb 17 09:13:51 2005
@@ -109,7 +109,7 @@
 # JDBC Connections. Current version ships four implementations:
 #
 # 1. ConnectionFactoryAvalonDatasource
-#    Uses a Cocoon configured DataSource specified with the jcd-alias attr=
ibute value in=20
+#    Uses a Cocoon configured DataSource specified with the jcd-alias attr=
ibute value in
 #    a jdbc-connection-descriptor element in the repository.xml file.
 # 2. ConnectionFactoryNotPooledImpl
 #    No pooling, no playing around.
@@ -133,7 +133,7 @@
 # take a look at the repository.dtd, there was a possibility to override
 # this default connection factory entry in each JDBCConnectionDescriptor.
 #
-ConnectionFactoryClass=3Dorg.apache.cocoon.ojb.components.ConnectionFactor=
yAvalonDataSource
+ConnectionFactoryClass=3Dorg.apache.cocoon.ojb.components.ConnectionFactor=
yImpl
 #ConnectionFactoryClass=3Dorg.apache.ojb.broker.accesslayer.ConnectionFact=
oryPooledImpl
 #ConnectionFactoryClass=3Dorg.apache.ojb.broker.accesslayer.ConnectionFact=
oryNotPooledImpl
 #ConnectionFactoryClass=3Dorg.apache.ojb.broker.accesslayer.ConnectionFact=
oryManagedImpl

Modified: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/com=
ponents/PBFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/broker/components/PBFactory.java?view=3Ddiff&r1=3D154169&r2=
=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/component=
s/PBFactory.java (original)
+++ cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/component=
s/PBFactory.java Thu Feb 17 09:13:51 2005
@@ -15,6 +15,7 @@
  */
 package org.apache.cocoon.ojb.broker.components;
=20
+
 import org.apache.ojb.broker.PBFactoryException;
 import org.apache.ojb.broker.PBKey;
 import org.apache.ojb.broker.PersistenceBroker;

Modified: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/com=
ponents/PBFactoryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/broker/components/PBFactoryImpl.java?view=3Ddiff&r1=3D154169=
&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/component=
s/PBFactoryImpl.java (original)
+++ cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/component=
s/PBFactoryImpl.java Thu Feb 17 09:13:51 2005
@@ -15,8 +15,9 @@
  */
 package org.apache.cocoon.ojb.broker.components;
=20
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.ojb.components.AbstractOjbImpl;
+
 import org.apache.ojb.broker.PBFactoryException;
 import org.apache.ojb.broker.PBKey;
 import org.apache.ojb.broker.PersistenceBroker;
@@ -28,25 +29,8 @@
  * @author <a href=3D"mailto:antonio@apache.org">Antonio Gallardo</a>
  * @version CVS $Id$
 */
-public class PBFactoryImpl
-        extends AbstractOjbImpl
-        implements PBFactory, ThreadSafe {
-
-    /* (non-Javadoc)
-     * @see org.apache.avalon.framework.activity.Disposable#dispose()
-     */
-    public void dispose() {
-        super.dispose();
-        getLogger().debug("Disposed");
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.avalon.framework.activity.Initializable#initialize()
-     */
-    public void initialize() throws Exception {
-        super.initialize();
-        getLogger().debug("Started");
-    }
+public class PBFactoryImpl extends AbstractLogEnabled
+                           implements PBFactory, ThreadSafe {
=20
     /* (non-Javadoc)
      * @see org.apache.cocoon.ojb.broker.components.PBFactory#defaultPersi=
stenceBroker()

Copied: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/C=
onnectionFactoryImpl.java (from r154169, cocoon/branches/BRANCH_2_1_X/src/b=
locks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/components/ConnectionFactoryImpl.java?view=3Ddiff&rev=3D1541=
70&p1=3Dcocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/=
ojb/components/ConnectionFactoryImpl.java&r1=3D154169&p2=3Dcocoon/trunk/src=
/blocks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.jav=
a&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
    (empty)

Propchange: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/componen=
ts/ConnectionFactoryImpl.java
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/componen=
ts/ConnectionFactoryImpl.java
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id

Copied: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/components/L=
oggerImpl.java (from r154169, cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/j=
ava/org/apache/cocoon/ojb/components/LoggerImpl.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/components/LoggerImpl.java?view=3Ddiff&rev=3D154170&p1=3Dcoc=
oon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/compone=
nts/LoggerImpl.java&r1=3D154169&p2=3Dcocoon/trunk/src/blocks/ojb/java/org/a=
pache/cocoon/ojb/components/LoggerImpl.java&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
    (empty)

Propchange: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/componen=
ts/LoggerImpl.java
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/componen=
ts/LoggerImpl.java
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id

Modified: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/compon=
ents/JdoPMF.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/jdo/components/JdoPMF.java?view=3Ddiff&r1=3D154169&r2=3D1541=
70
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/J=
doPMF.java (original)
+++ cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/J=
doPMF.java Thu Feb 17 09:13:51 2005
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- *=20
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *=20
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- *=20
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,21 +15,23 @@
  */
 package org.apache.cocoon.ojb.jdo.components;
=20
+import org.apache.avalon.framework.component.Component;
+
 import javax.jdo.PersistenceManager;
=20
 /**
- *  Interface of the JDO Persistent Manager Factory.
+ * Interface of the JDO Persistent Manager Factory.
  * It is used to get the Persistence Manager to interact with JDO using OJB
  *
  * @author <a href=3D"mailto:antonio@apache.org">Antonio Gallardo</a>
  * @version CVS $Id$
 */
 public interface JdoPMF {
-   =20
+
     String ROLE =3D JdoPMF.class.getName();
-=09
+
     /**
-    * get a Persitence Manager.
-	*/
+     * Get a Persitence Manager.
+     */
     PersistenceManager getPersistenceManager();
 }

Modified: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/compon=
ents/JdoPMFImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/jdo/components/JdoPMFImpl.java?view=3Ddiff&r1=3D154169&r2=3D=
154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/J=
doPMFImpl.java (original)
+++ cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/J=
doPMFImpl.java Thu Feb 17 09:13:51 2005
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2004 The Apache Software Foundation.
- *=20
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *=20
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- *=20
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,57 +15,37 @@
  */
 package org.apache.cocoon.ojb.jdo.components;
=20
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.ojb.components.AbstractOjbImpl;
+
 import org.apache.ojb.jdori.sql.OjbStorePMF;
=20
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+
 /**
 * Implementation of the JdoPMF. Create one PMF and store it for future use
  *
  * @author <a href=3D"mailto:antonio@apache.org">Antonio Gallardo</a>
- * @version CVS $Id: JdoPMFImpl.java,v 1.6 2004/06/25 14:49:56 cziegeler E=
xp $
+ * @version CVS $Id$
 */
-public class JdoPMFImpl=20
-    extends AbstractOjbImpl=20
-    implements JdoPMF, ThreadSafe {
+public class JdoPMFImpl extends AbstractLogEnabled
+                        implements JdoPMF, ThreadSafe, Initializable {
    =20
-	protected PersistenceManagerFactory factory;
+    protected PersistenceManagerFactory factory;
 =09
     /* (non-Javadoc)
-     * @see org.apache.avalon.framework.activity.Disposable#dispose()
+     * @see org.apache.cocoon.ojb.jdori.components.JdoPMF#getPersistenceMa=
nager()
      */
-    public void dispose() {
-        super.dispose();
-		if (this.getLogger().isDebugEnabled()) {
-			this.getLogger().debug("OJB-JDO: Disposed OK!");
-        }
+    public PersistenceManager getPersistenceManager() {
+        return this.factory.getPersistenceManager();
     }
=20
-	/* (non-Javadoc)
-	 * @see org.apache.cocoon.ojb.jdori.components.JdoPMF#getPersistenceManag=
er()
-	 */
-	public PersistenceManager getPersistenceManager() {
-		return factory.getPersistenceManager();
-	}
-   =20
-	/* (non-Javadoc)
-	 * @see org.apache.avalon.framework.activity.Initializable#initialize()
-	 */
-	public void initialize() throws Exception {
-        super.initialize();
-		try	{
-			// Create the factory
-			factory =3D new OjbStorePMF();
-			if (this.getLogger().isDebugEnabled()) {
-                this.getLogger().debug("OJB-JDO: Started OK!");
-            }
-		} catch (Throwable t){
-			if (this.getLogger().isFatalErrorEnabled()) {
-				this.getLogger().fatalError("OJB-JDO: Started failed: Cannot create a =
Persistence Manager Factory.",t);
-			}
-		}
-	}
+    /* (non-Javadoc)
+     * @see org.apache.avalon.framework.activity.Initializable#initialize()
+     */
+    public void initialize() throws Exception {
+        this.factory =3D new OjbStorePMF();
+    }
 }

Modified: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/compo=
nents/OdmgImplementation.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/odmg/components/OdmgImplementation.java?view=3Ddiff&r1=3D154=
169&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/=
OdmgImplementation.java (original)
+++ cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/=
OdmgImplementation.java Thu Feb 17 09:13:51 2005
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2002,2004 The Apache Software Foundation.
- *=20
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *=20
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- *=20
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,10 +15,10 @@
  */
 package org.apache.cocoon.ojb.odmg.components;
=20
+
 import org.odmg.Implementation;
 import org.odmg.ODMGException;
=20
-
 /**
  * Interface of the ODMG Implementation. It is used to get the Implementat=
ion Object to interact with ODMG using OJB
  *
@@ -38,7 +38,7 @@
      * @throws ODMGException DOCUMENT ME!
      */
     Implementation getInstance()
-        throws ODMGException;
+    throws ODMGException;
=20
     /**
      * Get a ODMG Instance with a specific connection definition.
@@ -50,7 +50,7 @@
      * @throws ODMGException DOCUMENT ME!
      */
     Implementation getInstance(String connection)
-        throws ODMGException;
+    throws ODMGException;
=20
     /**
      * Get a ODMG Instance with a specific connection definition and a Dat=
abase operation mode.
@@ -63,7 +63,7 @@
      * @throws ODMGException DOCUMENT ME!
      */
     Implementation getInstance(String connection, int mode)
-        throws ODMGException;
+    throws ODMGException;
=20
     /**
      * Get a ODMG Instance with a default connection definition and a Data=
base operation mode.
@@ -75,5 +75,5 @@
      * @throws ODMGException DOCUMENT ME!
      */
     Implementation getInstance(int mode)
-        throws ODMGException;
+    throws ODMGException;
 }

Modified: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/compo=
nents/OdmgImplementationImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/odmg/components/OdmgImplementationImpl.java?view=3Ddiff&r1=
=3D154169&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/=
OdmgImplementationImpl.java (original)
+++ cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/=
OdmgImplementationImpl.java Thu Feb 17 09:13:51 2005
@@ -1,12 +1,12 @@
 /*
  * Copyright 1999-2002,2004 The Apache Software Foundation.
- *=20
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *=20
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- *=20
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,89 +15,69 @@
  */
 package org.apache.cocoon.ojb.odmg.components;
=20
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Set;
-
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.ojb.components.AbstractOjbImpl;
+
 import org.apache.ojb.odmg.OJB;
 import org.odmg.Database;
 import org.odmg.Implementation;
 import org.odmg.ODMGException;
=20
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Set;
=20
 /**
  * Implementation of the OdmgImplementation. Create a ODMG Implementation =
and store it for future use
  *
  * @author <a href=3D"mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Id: OdmgImplementationImpl.java,v 1.4 2004/06/25 14:49:56=
 cziegeler Exp $
+ * @version CVS $Id$
  */
-public class OdmgImplementationImpl
-    extends AbstractOjbImpl
-    implements OdmgImplementation, ThreadSafe {
+public class OdmgImplementationImpl extends AbstractLogEnabled
+                                    implements OdmgImplementation, ThreadS=
afe, Initializable, Disposable {
=20
     private final static String DEFAULT_CONNECTION =3D"default";
     private final static int DEFAULT_MODE =3D Database.OPEN_READ_WRITE;
     private Implementation odmg;
-   =20
+
     private Hashtable databases =3D new Hashtable();
-   =20
-    /*  (non-Javadoc)
+
+    /* (non-Javadoc)
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {
-        super.dispose();
-        synchronized(this.databases) {
-            final Set keys =3D this.databases.keySet();
-            for( Iterator i =3D keys.iterator(); i.hasNext(); )
-            {
-                final Database db =3D (Database)i.next();
-                try
-                {
-                    db.close();
-                }
-                catch( final ODMGException e) {
-                    getLogger().error( "OJB-ODMG: Cannot close Database", =
e);
-                }
-                i.remove();
+        final Set keys =3D this.databases.keySet();
+        for (Iterator i =3D keys.iterator(); i.hasNext();) {
+            final Database db =3D (Database) i.next();
+            try {
+                db.close();
+            } catch (ODMGException e) {
+                getLogger().error("OJB-ODMG: Cannot close Database", e);
             }
-        }
-        if (this.getLogger().isDebugEnabled()) {
-            this.getLogger().debug("OJB-ODMG: Disposed OK!");
+            i.remove();
         }
     }
=20
     /* (non-Javadoc)
      * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
-    public void initialize()
-        throws Exception {
-        super.initialize();
-        try {
-            // Get the Implementation
-            this.odmg =3D OJB.getInstance();
-           =20
-            if (this.getLogger().isDebugEnabled()) {
-                this.getLogger().debug("OJB-ODMG: Started OK!");
-            }
-        } catch (Throwable t) {
-            if (this.getLogger().isFatalErrorEnabled()) {
-                this.getLogger().fatalError("OJB-ODMG: Started failed: Can=
not get an ODMG Implementation.", t);
-            }
-        }
+    public void initialize() throws Exception {
+        // Get the Implementation
+        this.odmg =3D OJB.getInstance();
     }
=20
     /* (non-Javadoc)
      * @see org.apache.cocoon.ojb.odmg.components.Odmg#getInstance()
      */
     public Implementation getInstance() throws ODMGException {
-        Database db =3D (Database)this.databases.get( DEFAULT_CONNECTION );
-        if (null =3D=3D db ) {
+        Database db =3D (Database) this.databases.get(DEFAULT_CONNECTION);
+        if (null =3D=3D db) {
             db =3D this.odmg.newDatabase();
             db.open(DEFAULT_CONNECTION, DEFAULT_MODE);
             synchronized (this.databases) {
-                this.databases.put( DEFAULT_CONNECTION + DEFAULT_MODE, db =
);
+                this.databases.put(DEFAULT_CONNECTION + DEFAULT_MODE, db);
             }
         }
         return this.odmg;
@@ -107,12 +87,12 @@
      * @see org.apache.cocoon.ojb.odmg.components.Odmg#getInstance(java.la=
ng.String, int)
      */
     public Implementation getInstance(String connection, int mode) throws =
ODMGException {
-        Database db =3D (Database)this.databases.get( connection + mode);
-        if (null =3D=3D db ) {
+        Database db =3D (Database) this.databases.get(connection + mode);
+        if (null =3D=3D db) {
             db =3D this.odmg.newDatabase();
             db.open(connection, mode);
             synchronized (this.databases) {
-                this.databases.put( connection + mode, db );
+                this.databases.put(connection + mode, db);
             }
         }
         return this.odmg;
@@ -122,26 +102,27 @@
      * @see org.apache.cocoon.ojb.odmg.components.Odmg#getInstance(java.la=
ng.String)
      */
     public Implementation getInstance(String connection) throws ODMGExcept=
ion {
-        Database db =3D (Database)this.databases.get( connection + DEFAULT=
_MODE);
-        if (null =3D=3D db ) {
+        Database db =3D (Database) this.databases.get(connection + DEFAULT=
_MODE);
+        if (null =3D=3D db) {
             db =3D this.odmg.newDatabase();
             db.open(connection, DEFAULT_MODE);
             synchronized (this.databases) {
-                this.databases.put( connection + DEFAULT_MODE, db );
+                this.databases.put(connection + DEFAULT_MODE, db);
             }
         }
         return this.odmg;
     }
+
     /* (non-Javadoc)
      * @see org.apache.cocoon.ojb.odmg.components.OdmgImplementation#getIn=
stance(int)
      */
-    public Implementation getInstance( int mode ) throws ODMGException  {
-        Database db =3D (Database)this.databases.get( DEFAULT_CONNECTION+ =
mode);
-        if (null =3D=3D db ) {
+    public Implementation getInstance(int mode) throws ODMGException {
+        Database db =3D (Database) this.databases.get(DEFAULT_CONNECTION +=
 mode);
+        if (null =3D=3D db) {
             db =3D this.odmg.newDatabase();
             db.open(DEFAULT_CONNECTION, mode);
             synchronized (this.databases) {
-                this.databases.put( DEFAULT_CONNECTION+ mode, db );
+                this.databases.put(DEFAULT_CONNECTION + mode, db);
             }
         }
         return this.odmg;

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=3Ddiff&r1=
=3D154169&r2=3D154170
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Thu Feb 17 09:13:51 2005
@@ -479,6 +479,9 @@
    </action>
  </release>
  <release version=3D"2.1.7" date=3D"TBD">
+   <action dev=3D"VG" type=3D"update">
+     OJB Block: Integrated OJB logging with Cocoon logging.
+   </action>
    <action dev=3D"CZ" type=3D"update">
      Add a deprecation logger that gives hint about used deprecated stuff.
    </action>