Author: vgritsenko
Date: Fri Feb 18 06:29:11 2005
New Revision: 154302

URL: http://svn.apache.org/viewcvs?view=rev&rev=154302
Log:
make note about jdo.jar more prominent.
comment out jdo component.

Modified:
    cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf
    
cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
    cocoon/trunk/src/blocks/ojb/samples/welcome.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/xconf/cocoon-ojb.xconf?view=diff&r1=154301&r2=154302
==============================================================================
--- 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 18 
06:29:11 2005
@@ -35,8 +35,10 @@
 
   <!-- OJB PersistenceBroker Interface -->
   <ojb-pb logger="core.ojb.pb"/>
-  <!-- OJB Persistent Manager Factory for JDO -->
+  <!-- OJB Persistent Manager Factory for JDO.
+       Requires javax.jdo package.
   <ojb-jdo class="org.apache.cocoon.ojb.jdo.components.JdoPMFImpl" 
logger="core.ojb.jdo"/>
+  -->
   <!-- OJB ODMG Implementation Interface -->
   <ojb-odmg logger="core.ojb.odmg"/>
 

Modified: 
cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java?view=diff&r1=154301&r2=154302
==============================================================================
--- 
cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
 (original)
+++ 
cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
 Fri Feb 18 06:29:11 2005
@@ -25,7 +25,7 @@
 import javax.jdo.PersistenceManagerFactory;
 
 /**
-* Implementation of the JdoPMF. Create one PMF and store it for future use
+ * Implementation of the JdoPMF. Create one PMF and store it for future use
  *
  * @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
  * @version CVS $Id$

Modified: cocoon/trunk/src/blocks/ojb/samples/welcome.xml
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/samples/welcome.xml?view=diff&r1=154301&r2=154302
==============================================================================
--- cocoon/trunk/src/blocks/ojb/samples/welcome.xml (original)
+++ cocoon/trunk/src/blocks/ojb/samples/welcome.xml Fri Feb 18 06:29:11 2005
@@ -14,7 +14,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- $Id$-->
+
+<!--
+  - OJB Samples
+  - $Id$
+  -->
 <samples name="OJB Block Samples" xmlns:xlink="http://www.w3.org/1999/xlink";>
   <group name="Back">
     <sample name="Back" href="../..">to Cocoon Samples main page</sample>
@@ -22,51 +26,57 @@
   </group>
 
   <group name="Using JDO 1.01">
-  <p>To use the demo you need to download JDO from Sun's website.</p>
-  <note>
-    The Java Data Objects (JDO) API is a standard interface-based Java model
-    abstraction of persistence, developed as Java Specification Request 12.
-    Application programmers use JDO to directly store their Java domain model
-    instances into the persistent store (database). Uses Java Data Object 
Query Language (JDOQL).
-  </note>
-  <sample name="XSP" href="jdo/xspdemo">Sample using JDO in a XSP 
page.</sample>
-  <sample name="Cocoon Forms" href="jdo/forms/employee">Sample using JDO with 
Cocoon Forms Binding.</sample>
- </group>
-
- <group name="Using ODMG 3.0 (To be done)">
-   <note>
-     Object Data Management Group (ODMG) 3 standard for binding databases.
-     Uses Object Query Language (OQL). ODMG has been superceded by JDO.
-  </note>
-  <sample name="XSP" href="odmg/xspdemo">Sample using JDO in a XSP 
page.</sample>
-  <sample name="Cocoon Forms" href="">Sample using Cocoon Forms Binding. To be 
done.</sample>
- </group>
-
- <group name="Using Persistence Broker (To be done)">
-  <note>Low-level API that can be used directly by applications that don't 
need full fledged object level transactions.</note>
-  <sample name="XSP" href="">Sample using JDO in a XSP page. To be 
done.</sample>
-  <sample name="Cocoon Forms" href="">Sample using Cocoon Forms Binding. To be 
done.</sample>
-  <sample name="JXForm" href="">Sample using JXForms. To be done.</sample>
- </group>
-
- <group name="OJB Documentation">
-  <note>
-    OJB block allows the use of the Apache OJB project into Cocoon.
-    OJB block is still alpha software and under active development.
-    Your feedback is very much welcome on the Cocoon mailing lists.
-  </note>
-  <sample name="Apache OJB website" href="http://db.apache.org/ojb/";>Apache 
OJB project</sample>
-  <sample name="Using JDO Tutorial" 
href="http://db.apache.org/ojb/docu/tutorials/jdo-tutorial.html";>How to use OJB 
with JDO</sample>
-  <sample name="Using ODMG Tutorial" 
href="http://db.apache.org/ojb/docu/tutorials/odmg-tutorial.html";>How to use 
ODMG with OJB</sample>
-  <sample name="Using Persistence Broker Tutorial" 
href="http://db.apache.org/ojb/docu/tutorials/pb-tutorial.html";>How to use the 
OJB's Persitence Broker</sample>
- </group>
-
- <group name="Other Links">
-   <note>Additional link to database access technologies</note>
-   <sample name="JDO Website" href="http://java.sun.com/products/jdo/";>JDO 
website</sample>
-   <sample name="JDO Central" href="http://www.jdocentral.com/";>JDO community 
website</sample>
-   <sample name="ODMG Website" href="http://www.odmg.org/";>ODMG 
website</sample>
-   <sample name="JDO Cocoon Wiki Documentation" 
href="http://wiki.apache.org/cocoon/OJBWithJDO";>
-    Notes of a first experiment using OJB with Cocoon.</sample>
- </group>
+    <note>
+      WARNING: To use JDO demo you have to download jdo.jar from Sun's website!
+    </note>
+    <note>
+      The Java Data Objects (JDO) API is a standard interface-based Java model
+      abstraction of persistence, developed as Java Specification Request 12.
+      Application programmers use JDO to directly store their Java domain model
+      instances into the persistent store (database). Uses Java Data Object 
Query Language (JDOQL).
+    </note>
+    <sample name="XSP" href="jdo/xspdemo">Sample using JDO in a XSP 
page.</sample>
+    <sample name="Cocoon Forms" href="jdo/forms/employee">Sample using JDO 
with Cocoon Forms Binding.</sample>
+  </group>
+
+  <group name="Using ODMG 3.0 (To be done)">
+    <note>
+      Object Data Management Group (ODMG) 3 standard for binding databases.
+      Uses Object Query Language (OQL). ODMG has been superceded by JDO.
+    </note>
+    <sample name="XSP" href="odmg/xspdemo">Sample using JDO in a XSP 
page.</sample>
+    <sample name="Cocoon Forms" href="">Sample using Cocoon Forms Binding. To 
be done.</sample>
+  </group>
+
+  <group name="Using Persistence Broker (To be done)">
+    <note>
+      Low-level API that can be used directly by applications that don't need
+      full fledged object level transactions.
+    </note>
+    <sample name="XSP" href="">Sample using JDO in a XSP page. To be 
done.</sample>
+    <sample name="Cocoon Forms" href="">Sample using Cocoon Forms Binding. To 
be done.</sample>
+    <sample name="JXForm" href="">Sample using JXForms. To be done.</sample>
+  </group>
+
+  <group name="OJB Documentation">
+    <note>
+      OJB block allows the use of the Apache OJB project into Cocoon.
+      OJB block is still alpha software and under active development.
+      Your feedback is very much welcome on the Cocoon mailing lists.
+    </note>
+    <sample name="Apache OJB website" href="http://db.apache.org/ojb/";>Apache 
OJB project</sample>
+    <sample name="Using JDO Tutorial" 
href="http://db.apache.org/ojb/docu/tutorials/jdo-tutorial.html";>How to use OJB 
with JDO</sample>
+    <sample name="Using ODMG Tutorial" 
href="http://db.apache.org/ojb/docu/tutorials/odmg-tutorial.html";>How to use 
ODMG with OJB</sample>
+    <sample name="Using Persistence Broker Tutorial" 
href="http://db.apache.org/ojb/docu/tutorials/pb-tutorial.html";>How to use the 
OJB's Persitence Broker</sample>
+  </group>
+
+  <group name="Other Links">
+    <note>Additional link to database access technologies</note>
+    <sample name="JDO Website" href="http://java.sun.com/products/jdo/";>JDO 
website</sample>
+    <sample name="JDO Central" href="http://www.jdocentral.com/";>JDO community 
website</sample>
+    <sample name="ODMG Website" href="http://www.odmg.org/";>ODMG 
website</sample>
+    <sample name="JDO Cocoon Wiki Documentation" 
href="http://wiki.apache.org/cocoon/OJBWithJDO";>
+      Notes of a first experiment using OJB with Cocoon.
+    </sample>
+  </group>
 </samples>


Reply via email to