Author: vgritsenko
Date: Fri Feb 18 06:20:35 2005
New Revision: 154295
URL: http://svn.apache.org/viewcvs?view=rev&rev=154295
Log:
make jdo.jar note more prominent.
fix conditions in the patch files.
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-connection.xconf
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-jdo.xconf
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-logger.xconf
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/samples/welcome.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-connection.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-connection.xconf?view=diff&r1=154294&r2=154295
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-connection.xconf
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-connection.xconf Fri
Feb 18 06:20:35 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<xconf xpath="/cocoon"
unless="component[class='org.apache.cocoon.ojb.components.ConnectionFactoryImpl']">
+<xconf xpath="/cocoon" unless="[EMAIL
PROTECTED]'org.apache.cocoon.ojb.components.ConnectionFactoryImpl']">
<!-- OJB Connection Factory -->
<component role="org.apache.cocoon.ojb.components.ConnectionFactory"
class="org.apache.cocoon.ojb.components.ConnectionFactoryImpl"
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-jdo.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-jdo.xconf?view=diff&r1=154294&r2=154295
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-jdo.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-jdo.xconf Fri Feb 18
06:20:35 2005
@@ -15,7 +15,9 @@
limitations under the License.
-->
-<xconf xpath="/cocoon" unless="ojb-jdo">
- <!-- Persistent Manager Factory for JDO -->
- <!-- <ojb-jdo logger="core.ojb.jdo"/> -->
+<xconf xpath="/cocoon" unless="comment()[contains(.,'ojb-jdo')]">
+ <!-- Persistent Manager Factory for JDO.
+ Requires javax.jdo package.
+ <ojb-jdo logger="core.ojb.jdo"/>
+ -->
</xconf>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-logger.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-logger.xconf?view=diff&r1=154294&r2=154295
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-logger.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/conf/ojb-logger.xconf Fri Feb
18 06:20:35 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<xconf xpath="/cocoon"
unless="component[class='org.apache.cocoon.ojb.components.LoggerImpl']">
+<xconf xpath="/cocoon" unless="[EMAIL
PROTECTED]'org.apache.cocoon.ojb.components.LoggerImpl']">
<!-- OJB Logger -->
<component role="org.apache.cocoon.ojb.components.Logger"
class="org.apache.cocoon.ojb.components.LoggerImpl"
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java?view=diff&r1=154294&r2=154295
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMFImpl.java
Fri Feb 18 06:20:35 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/branches/BRANCH_2_1_X/src/blocks/ojb/samples/welcome.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/samples/welcome.xml?view=diff&r1=154294&r2=154295
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/samples/welcome.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/samples/welcome.xml Fri Feb 18
06:20:35 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>
