Return-Path: 
 <cvs-return-22212-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 15230 invoked from network); 25 Feb 2005 20:22:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 25 Feb 2005 20:22:20 -0000
Received: (qmail 67711 invoked by uid 500); 25 Feb 2005 20:22:20 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 67670 invoked by uid 500); 25 Feb 2005 20:22:19 -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 67656 invoked by uid 99); 25 Feb 2005 20:22:19 -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; Fri, 25 Feb 2005 12:22:18 -0800
Received: (qmail 15185 invoked by uid 65534); 25 Feb 2005 20:22:17 -0000
Message-ID: <20050225202217.15182.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: Fri, 25 Feb 2005 20:22:17 -0000
Subject: svn commit: r155367 - in cocoon/trunk/src/blocks/ojb: WEB-INF/xconf/
 java/org/apache/cocoon/ojb/ java/org/apache/cocoon/ojb/broker/
 java/org/apache/cocoon/ojb/jdo/components/
 java/org/apache/cocoon/ojb/odmg/components/
 java/org/apache/cocoon/ojb/samples/ samples/forms/ samples/jdo/xsp/
 samples/odmg/xsp/
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: Fri Feb 25 12:22:13 2005
New Revision: 155367

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D155367
Log:
stabilizing ojb

Added:
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/J=
DO.java   (props changed)
      - copied unchanged from r155366, cocoon/branches/BRANCH_2_1_X/src/blo=
cks/ojb/java/org/apache/cocoon/ojb/jdo/components/JDO.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/J=
DOImpl.java   (props changed)
      - copied unchanged from r155366, cocoon/branches/BRANCH_2_1_X/src/blo=
cks/ojb/java/org/apache/cocoon/ojb/jdo/components/JDOImpl.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/=
ODMG.java   (props changed)
      - copied unchanged from r155366, cocoon/branches/BRANCH_2_1_X/src/blo=
cks/ojb/java/org/apache/cocoon/ojb/odmg/components/ODMG.java
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/components/=
ODMGImpl.java   (props changed)
      - copied unchanged from r155366, cocoon/branches/BRANCH_2_1_X/src/blo=
cks/ojb/java/org/apache/cocoon/ojb/odmg/components/ODMGImpl.java
Removed:
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/
    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
Modified:
    cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/ojb.roles
    cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/samples/Employee=
DAO.java
    cocoon/trunk/src/blocks/ojb/samples/forms/employee.js
    cocoon/trunk/src/blocks/ojb/samples/forms/success.xsp
    cocoon/trunk/src/blocks/ojb/samples/jdo/xsp/demo1.xsp
    cocoon/trunk/src/blocks/ojb/samples/odmg/xsp/demo1.xsp

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=3D155366&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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 Fri Feb 25 1=
2:22:13 2005
@@ -33,12 +33,11 @@
              class=3D"org.apache.cocoon.ojb.components.ConnectionFactoryIm=
pl"
              logger=3D"core.ojb"/>
=20
-  <!-- OJB PersistenceBroker Interface -->
-  <ojb-pb logger=3D"core.ojb.pb"/>
   <!-- OJB Persistent Manager Factory for JDO.
        Requires javax.jdo package.
-  <ojb-jdo class=3D"org.apache.cocoon.ojb.jdo.components.JdoPMFImpl" logge=
r=3D"core.ojb.jdo"/>
+  <ojb-jdo logger=3D"core.ojb.jdo"/>
   -->
+
   <!-- OJB ODMG Implementation Interface -->
   <ojb-odmg logger=3D"core.ojb.odmg"/>
=20

Copied: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/componen=
ts/JDO.java (from r155366, cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java=
/org/apache/cocoon/ojb/jdo/components/JDO.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/jdo/components/JDO.java?view=3Ddiff&rev=3D155367&p1=3Dcocoon=
/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/compon=
ents/JDO.java&r1=3D155366&p2=3Dcocoon/trunk/src/blocks/ojb/java/org/apache/=
cocoon/ojb/jdo/components/JDO.java&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/jdo/comp=
onents/JDO.java
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/comp=
onents/JDO.java
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id

Copied: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/componen=
ts/JDOImpl.java (from r155366, cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/=
java/org/apache/cocoon/ojb/jdo/components/JDOImpl.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/jdo/components/JDOImpl.java?view=3Ddiff&rev=3D155367&p1=3Dco=
coon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/co=
mponents/JDOImpl.java&r1=3D155366&p2=3Dcocoon/trunk/src/blocks/ojb/java/org=
/apache/cocoon/ojb/jdo/components/JDOImpl.java&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/jdo/comp=
onents/JDOImpl.java
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/comp=
onents/JDOImpl.java
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id

Copied: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/compone=
nts/ODMG.java (from r155366, cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/ja=
va/org/apache/cocoon/ojb/odmg/components/ODMG.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/odmg/components/ODMG.java?view=3Ddiff&rev=3D155367&p1=3Dcoco=
on/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/com=
ponents/ODMG.java&r1=3D155366&p2=3Dcocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/odmg/components/ODMG.java&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/odmg/com=
ponents/ODMG.java
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/com=
ponents/ODMG.java
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id

Copied: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/compone=
nts/ODMGImpl.java (from r155366, cocoon/branches/BRANCH_2_1_X/src/blocks/oj=
b/java/org/apache/cocoon/ojb/odmg/components/ODMGImpl.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/odmg/components/ODMGImpl.java?view=3Ddiff&rev=3D155367&p1=3D=
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg=
/components/ODMGImpl.java&r1=3D155366&p2=3Dcocoon/trunk/src/blocks/ojb/java=
/org/apache/cocoon/ojb/odmg/components/ODMGImpl.java&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/odmg/com=
ponents/ODMGImpl.java
---------------------------------------------------------------------------=
---
    svn:eol-style =3D native

Propchange: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/odmg/com=
ponents/ODMGImpl.java
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id

Modified: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/ojb.roles
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/ojb.roles?view=3Ddiff&r1=3D155366&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/ojb.roles (origi=
nal)
+++ cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/ojb.roles Fri Fe=
b 25 12:22:13 2005
@@ -14,17 +14,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <!-- $Id$ -->
 <role-list>
-  <role name=3D"org.apache.cocoon.ojb.broker.components.PBFactory"
-        shorthand=3D"ojb-pb"
-        default-class=3D"org.apache.cocoon.ojb.broker.components.PBFactory=
Impl"/>
-
-  <role name=3D"org.apache.cocoon.ojb.odmg.components.OdmgImplementation"
+  <role name=3D"org.apache.cocoon.ojb.odmg.components.ODMG"
         shorthand=3D"ojb-odmg"
-        default-class=3D"org.apache.cocoon.ojb.odmg.components.OdmgImpleme=
ntationImpl"/>
+        default-class=3D"org.apache.cocoon.ojb.odmg.components.ODMGImpl"/>
=20
-  <role name=3D"org.apache.cocoon.ojb.jdo.components.JdoPMF"
+  <role name=3D"org.apache.cocoon.ojb.jdo.components.JDO"
         shorthand=3D"ojb-jdo"
-        default-class=3D"org.apache.cocoon.ojb.jdo.components.JdoPMFImpl"/>
-</role-list>
\ No newline at end of file
+        default-class=3D"org.apache.cocoon.ojb.jdo.components.JDOImpl"/>
+</role-list>

Modified: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/samples/Em=
ployeeDAO.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apa=
che/cocoon/ojb/samples/EmployeeDAO.java?view=3Ddiff&r1=3D155366&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/samples/Employee=
DAO.java (original)
+++ cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/samples/Employee=
DAO.java Fri Feb 25 12:22:13 2005
@@ -18,24 +18,25 @@
 import javax.jdo.PersistenceManager;
 import javax.jdo.Transaction;
=20
-import org.apache.cocoon.ojb.jdo.components.JdoPMF;
+import org.apache.cocoon.ojb.jdo.components.JDO;
 import org.apache.cocoon.ojb.samples.bean.Employee;
 import org.apache.ojb.broker.Identity;
 import org.apache.ojb.broker.PersistenceBroker;
 import org.apache.ojb.broker.PersistenceBrokerFactory;
+
 /**
  *  Employee's Impl
  *
  * @author <a href=3D"mailto:antonio@apache.org">Antonio Gallardo</a>
- * @version CVS $Id: EmployeeDAO.java,v 1.3 2004/03/05 13:02:02 bdelacreta=
z Exp $
+ * @version CVS $Id$
 */
 public class EmployeeDAO {
=20
     public EmployeeDAO(){}
=20
-    public void retrieve(Employee bean, JdoPMF pmf) {
-        /* 1. Get the PersistenceManager */
-        PersistenceManager persistenceManager =3D pmf.getPersistenceManage=
r();
+    public void retrieve(Employee bean, JDO jdo) {
+        // 1. Get the PersistenceManager
+        PersistenceManager persistenceManager =3D jdo.getPersistenceManage=
r();
        =20
         Employee e =3D new Employee();
         e.setId(bean.getId());
@@ -43,7 +44,7 @@
         Identity oid =3D new Identity(e, broker);
        =20
         Employee b =3D new Employee();
-        //	2. start transaction
+        // 2. start transaction
         persistenceManager.currentTransaction().begin();
         // 3. Get the Object based on the primary key
         b =3D (Employee) persistenceManager.getObjectById(oid, false);
@@ -53,9 +54,9 @@
         persistenceManager.currentTransaction().commit();
     }
=20
-    public void insert(Employee e, JdoPMF pmf) {
-        /* 1. Get the PersistenceManager */
-        PersistenceManager persistenceManager =3D pmf.getPersistenceManage=
r();
+    public void insert(Employee e, JDO jdo) {
+        // 1. Get the PersistenceManager
+        PersistenceManager persistenceManager =3D jdo.getPersistenceManage=
r();
         // 2. Get current transaction
         Transaction tx =3D persistenceManager.currentTransaction();
         // 3. Start a Transaction
@@ -66,9 +67,9 @@
         tx.commit();
     }
=20
-    public void update(Employee bean, JdoPMF pmf) {
-        /* 1. Get the PersistenceManager */
-        PersistenceManager persistenceManager =3D pmf.getPersistenceManage=
r();
+    public void update(Employee bean, JDO jdo) {
+        // 1. Get the PersistenceManager
+        PersistenceManager persistenceManager =3D jdo.getPersistenceManage=
r();
        =20
         Employee e =3D new Employee();
         e.setId(bean.getId());
@@ -76,7 +77,7 @@
         Identity oid =3D new Identity(e, broker);
        =20
         Employee b =3D new Employee();
-        //	2. start transaction
+        // 2. start transaction
         persistenceManager.currentTransaction().begin();
         // 3. Get the Object based on the primary key
         b =3D (Employee) persistenceManager.getObjectById(oid, false);
@@ -88,9 +89,9 @@
         persistenceManager.currentTransaction().commit();
     }
=20
-    public void remove(Employee bean, JdoPMF pmf) {
-        /* 1. Get the PersistenceManager */
-        PersistenceManager persistenceManager =3D pmf.getPersistenceManage=
r();
+    public void remove(Employee bean, JDO jdo) {
+        // 1. Get the PersistenceManager
+        PersistenceManager persistenceManager =3D jdo.getPersistenceManage=
r();
        =20
         Employee e =3D new Employee();
         e.setId(bean.getId());
@@ -98,7 +99,7 @@
         Identity oid =3D new Identity(e, broker);
        =20
         Employee b =3D new Employee();
-        //	2. start transaction
+        // 2. start transaction
         persistenceManager.currentTransaction().begin();
         // 3. Get the Object based on the primary key
         b =3D (Employee) persistenceManager.getObjectById(oid, false);

Modified: cocoon/trunk/src/blocks/ojb/samples/forms/employee.js
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/samples/form=
s/employee.js?view=3Ddiff&r1=3D155366&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/samples/forms/employee.js (original)
+++ cocoon/trunk/src/blocks/ojb/samples/forms/employee.js Fri Feb 25 12:22:=
13 2005
@@ -17,7 +17,7 @@
=20
 function employeeform_jdo(form) {
     // Get OJB factory
-    var factory =3D cocoon.getComponent(Packages.org.apache.cocoon.ojb.jdo=
.components.JdoPMF.ROLE);
+    var factory =3D cocoon.getComponent(Packages.org.apache.cocoon.ojb.jdo=
.components.JDO.ROLE);
=20
     // Create a empty Bean
     var bean =3D new Packages.org.apache.cocoon.ojb.samples.bean.Employee(=
);

Modified: cocoon/trunk/src/blocks/ojb/samples/forms/success.xsp
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/samples/form=
s/success.xsp?view=3Ddiff&r1=3D155366&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/samples/forms/success.xsp (original)
+++ cocoon/trunk/src/blocks/ojb/samples/forms/success.xsp Fri Feb 25 12:22:=
13 2005
@@ -17,7 +17,7 @@
 <xsp:page language=3D"java" xmlns:xsp=3D"http://apache.org/xsp">
=20
   <xsp:structure>
-    <xsp:include>org.apache.cocoon.ojb.jdo.components.JdoPMF</xsp:include>
+    <xsp:include>org.apache.cocoon.ojb.jdo.components.JDO</xsp:include>
     <xsp:include>org.apache.cocoon.ojb.samples.EmployeeDAO</xsp:include>
     <xsp:include>org.apache.cocoon.ojb.samples.bean.Employee</xsp:include>
     <xsp:include>org.apache.cocoon.forms.formmodel.*</xsp:include>
@@ -27,10 +27,10 @@
     <title>Storing employee in database succeeded.</title>
     <content>
       <xsp:logic>
-        Form form =3D (Form)request.getAttribute("employeeform");
-        Field fid =3D (Field)form.lookupWidget("id");
-        Field fname =3D (Field)form.lookupWidget("name");
-        Field fdepartment_id =3D (Field)form.lookupWidget("department_id");
+        Form form =3D (Form) request.getAttribute("employeeform");
+        Field fid =3D (Field) form.lookupWidget("id");
+        Field fname =3D (Field) form.lookupWidget("name");
+        Field fdepartment_id =3D (Field) form.lookupWidget("department_id"=
);
       </xsp:logic>
       <p>The values of the form:</p>
       ID: <xsp:expr>fid.getValue()</xsp:expr>
@@ -43,10 +43,10 @@
=20
       <p>The values retrieved from the database:</p>
       <xsp:logic>
-        JdoPMF factory =3D null;
+        JDO factory =3D null;
         Employee bean =3D null;
         try {
-            factory =3D (JdoPMF)manager.lookup(JdoPMF.ROLE);
+            factory =3D (JDO) manager.lookup(JDO.ROLE);
=20
             bean =3D new Employee();
             EmployeeDAO dao =3D new EmployeeDAO();

Modified: cocoon/trunk/src/blocks/ojb/samples/jdo/xsp/demo1.xsp
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/samples/jdo/=
xsp/demo1.xsp?view=3Ddiff&r1=3D155366&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/samples/jdo/xsp/demo1.xsp (original)
+++ cocoon/trunk/src/blocks/ojb/samples/jdo/xsp/demo1.xsp Fri Feb 25 12:22:=
13 2005
@@ -24,54 +24,51 @@
=20
 <xsp:page language=3D"java" xmlns:xsp=3D"http://apache.org/xsp">
=20
-	<xsp:structure>
-		<xsp:include>javax.jdo.PersistenceManager</xsp:include>
-		<xsp:include>javax.jdo.Transaction</xsp:include>
-		<xsp:include>org.apache.cocoon.ojb.jdo.components.JdoPMF</xsp:include>
-		<xsp:include>javax.jdo.Transaction</xsp:include>
-		<xsp:include>org.apache.cocoon.ojb.samples.bean.Department</xsp:include>
-	</xsp:structure>
+  <xsp:structure>
+    <xsp:include>javax.jdo.PersistenceManager</xsp:include>
+    <xsp:include>javax.jdo.Transaction</xsp:include>
+    <xsp:include>org.apache.cocoon.ojb.jdo.components.JDO</xsp:include>
+    <xsp:include>javax.jdo.Transaction</xsp:include>
+    <xsp:include>org.apache.cocoon.ojb.samples.bean.Department</xsp:includ=
e>
+  </xsp:structure>
=20
-	<xsp:init-page>
-		JdoPMF pmf =3D null;
-		PersistenceManager persistenceManager =3D null;
-		Department bean =3D new Department();
-		String s;
-	</xsp:init-page>
+  <page>
+    <content>
+      <title>Hello</title>
+      <para>This is my first Cocoon page with OJB!</para>
+      <xsp:logic>
+        JDO jdo =3D null;
+        try {
+          /* Get the PersistenceManager */
+          PersistenceManager persistenceManager =3D null;
+          try {
+            jdo =3D (JDO) manager.lookup(JDO.ROLE);
+            persistenceManager =3D jdo.getPersistenceManager();
+          } catch (ComponentException cme) {
+            getLogger().error("Could not look up the PersistenceManager", =
cme);
+          }
=20
-	<page>
-		<content>
-			<title>Hello</title>
-			<para>This is my first Cocoon page with OJB!</para>
-			<xsp:logic>
-			try {
-				/* Get the PersistenceManager */
-				try {
-					pmf =3D (JdoPMF) manager.lookup(JdoPMF.ROLE);
-					persistenceManager =3D pmf.getPersistenceManager();
-				} catch (ServiceException cme) {
-					getLogger().error("Could not look up the PersistenceManager", cme);
-				}
-				<!-- Setting up the Bean -->
-				bean.setId(5);
-				bean.setName("JDO Development");
-				<!-- 2. Get current transaction -->
-				Transaction tx =3D persistenceManager.currentTransaction();
-				<!-- 3. Start a Transaction -->
-				tx.begin();
-				<!-- 4. now perform persistence operations. Store the new user -->
-				persistenceManager.makePersistent(bean);
-				<!-- 5. Commit the transaction  -->
-				tx.commit();
-                s =3D bean.getId() + " : " + bean.getName();
-			</xsp:logic>
-			<p> Inserted data: <xsp:expr>s</xsp:expr> </p>
-			<xsp:logic>
-			}
-			finally {
-				manager.release((Component)pmf);
-			}
-		</xsp:logic>
-		</content>
-	</page>
+          <!-- Setting up the Bean -->
+          Department bean =3D new Department();
+          bean.setId(5);
+          bean.setName("JDO Development");
+          <!-- 2. Get current transaction -->
+          Transaction tx =3D persistenceManager.currentTransaction();
+          <!-- 3. Start a Transaction -->
+          tx.begin();
+          <!-- 4. now perform persistence operations. Store the new user -=
->
+          persistenceManager.makePersistent(bean);
+          <!-- 5. Commit the transaction  -->
+          tx.commit();
+
+          <p>
+            Inserted data: <xsp:expr>bean.getId() + " : " + bean.getName()=
</xsp:expr>
+          </p>
+
+        } finally {
+          manager.release(jdo);
+        }
+      </xsp:logic>
+    </content>
+  </page>
 </xsp:page>

Modified: cocoon/trunk/src/blocks/ojb/samples/odmg/xsp/demo1.xsp
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/samples/odmg=
/xsp/demo1.xsp?view=3Ddiff&r1=3D155366&r2=3D155367
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/samples/odmg/xsp/demo1.xsp (original)
+++ cocoon/trunk/src/blocks/ojb/samples/odmg/xsp/demo1.xsp Fri Feb 25 12:22=
:13 2005
@@ -16,7 +16,7 @@
 -->
=20
 <!--
- * Simple demo that insert a row into hsqldb using OJB with JDO
+ * Simple demo that insert a row into hsqldb using OJB with ODMG
  *
  * @author <a href=3D"mailto:antonio@apache.org>Antonio Gallardo</a>
  * @version CVS $Revision: 1.3 $ $Date: 2004/03/17 11:28:20 $
@@ -24,56 +24,53 @@
=20
 <xsp:page language=3D"java" xmlns:xsp=3D"http://apache.org/xsp">
=20
-	<xsp:structure>
-		<xsp:include>org.apache.cocoon.ojb.odmg.components.OdmgImplementation</x=
sp:include>
-		<xsp:include>org.apache.cocoon.ojb.samples.bean.Department</xsp:include>
-		<xsp:include>org.odmg.Implementation</xsp:include>
-		<xsp:include>org.odmg.Transaction</xsp:include>
-		<xsp:include>org.odmg.ODMGException</xsp:include>
-	</xsp:structure>
-
-	<xsp:init-page>
-		OdmgImplementation odmgImpl =3D null;
-		Implementation impl =3D null;
-		Department bean =3D new Department();
-		String s;
-	</xsp:init-page>
-
-	<page>
-		<content>
-			<title>Hello</title>
-			<para>This is my first Cocoon page with OJB!</para>
-			<xsp:logic>
-			try {
-				/* Get the PersistenceManager */
-				try {
-          odmgImpl =3D (OdmgImplementation)manager.lookup( OdmgImplementat=
ion.ROLE );
-          impl =3D odmgImpl.getInstance( "personnel" );
-				} catch (ServiceException cme) {
-					getLogger().error("Could not look up the ODMG Implementation", cme);
-				} catch (ODMGException oe) {
-					getLogger().error("Failed to instantiate ODMG Implementation", oe);
-				}
-				<!-- Setting up the Bean -->
-				bean.setId(6);
-				bean.setName("ODMG Development");
-				<!-- 2. Get current transaction -->
-				Transaction tx =3D impl.newTransaction();
-				<!-- 3. Start a Transaction -->
-				tx.begin();
-				<!-- 4. now perform persistence operations. Store the new Department -=
->
-				tx.lock(bean, Transaction.WRITE);;
-				<!-- 5. Commit the transaction  -->
-				tx.commit();
-        s =3D bean.getId() + " : " + bean.getName();
-			</xsp:logic>
-			<p> Inserted data: <xsp:expr>s</xsp:expr> </p>
-			<xsp:logic>
-			}
-			finally {
-				manager.release(odmgImpl);
-			}
-		</xsp:logic>
-		</content>
-	</page>
+  <xsp:structure>
+    <xsp:include>org.apache.cocoon.ojb.odmg.components.ODMG</xsp:include>
+    <xsp:include>org.apache.cocoon.ojb.samples.bean.Department</xsp:includ=
e>
+    <xsp:include>org.odmg.Implementation</xsp:include>
+    <xsp:include>org.odmg.Transaction</xsp:include>
+    <xsp:include>org.odmg.ODMGException</xsp:include>
+  </xsp:structure>
+
+  <page>
+    <content>
+      <title>Hello</title>
+      <para>This is my first Cocoon page with OJB!</para>
+      <xsp:logic>
+        ODMG odmg =3D null;
+        try {
+          /* Get the implementation */
+          Implementation impl =3D null;
+          try {
+            odmg =3D (ODMG) manager.lookup(ODMG.ROLE);
+            impl =3D odmg.getInstance("personnel");
+          } catch (ComponentException cme) {
+            getLogger().error("Could not look up the ODMG Implementation",=
 cme);
+          } catch (ODMGException oe) {
+            getLogger().error("Failed to instantiate ODMG Implementation",=
 oe);
+          }
+
+          <!-- Setting up the Bean -->
+          Department bean =3D new Department();
+          bean.setId(6);
+          bean.setName("ODMG Development");
+          <!-- 2. Get current transaction -->
+          Transaction tx =3D impl.newTransaction();
+          <!-- 3. Start a Transaction -->
+          tx.begin();
+          <!-- 4. now perform persistence operations. Store the new Depart=
ment -->
+          tx.lock(bean, Transaction.WRITE);;
+          <!-- 5. Commit the transaction  -->
+          tx.commit();
+
+          <p>
+            Inserted data: <xsp:expr>bean.getId() + " : " + bean.getName()=
</xsp:expr>
+          </p>
+
+        } finally {
+          manager.release(odmg);
+        }
+      </xsp:logic>
+    </content>
+  </page>
 </xsp:page>