cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r156649 - in cocoon/branches/BRANCH_2_1_X: blocks.properties gump.xml src/blocks/ojb/build.xml src/blocks/ojb/samples/welcome.xml status.xml
Date Wed, 09 Mar 2005 15:06:02 GMT
Author: vgritsenko
Date: Wed Mar  9 07:05:57 2005
New Revision: 156649

URL: http://svn.apache.org/viewcvs?view=rev&rev=156649
Log:
mark ojb block as stable

Modified:
    cocoon/branches/BRANCH_2_1_X/blocks.properties
    cocoon/branches/BRANCH_2_1_X/gump.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/samples/welcome.xml
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/blocks.properties?view=diff&r1=156648&r2=156649
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/blocks.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/blocks.properties Wed Mar  9 07:05:57 2005
@@ -68,6 +68,9 @@
 #include.block.linkrewriter=false
 #include.block.lucene=false
 #include.block.naming=false
+#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for samples), "hsqldb"
(for samples).
+#-----[dependency]: "ojb" is needed by "javaflow".
+#include.block.ojb=false
 #include.block.paranoid=false
 #include.block.poi=false
 #-----[dependency]: "portal" depends on "authentication-fw", "cron", "forms", "session-fw".
@@ -136,9 +139,6 @@
 #-----[dependency]: "mail" depends on "asciiart".
 #include.block.mail=false
 #include.block.midi=false
-#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for samples), "hsqldb"
(for samples).
-#-----[dependency]: "ojb" is needed by "javaflow".
-#include.block.ojb=false
 #-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb", "velocity".
 #include.block.petstore=false
 #include.block.proxy=false

Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/gump.xml?view=diff&r1=156648&r2=156649
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml Wed Mar  9 07:05:57 2005
@@ -1104,7 +1104,7 @@
     <nag from="Gump &lt;general@gump.apache.org&gt;" to="dev@cocoon.apache.org"/>
   </project>
 
-  <project name="cocoon-block-ojb" status="unstable" dir="src/blocks/ojb">
+  <project name="cocoon-block-ojb" status="stable" dir="src/blocks/ojb">
     <package>org.apache.cocoon</package>
 
     <ant target="gump-block">

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml?view=diff&r1=156648&r2=156649
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml Wed Mar  9 07:05:57 2005
@@ -38,6 +38,9 @@
     <copy file="${block.dir}/conf/package.jdo" tofile="${build.blocks.ojb.samples}/package.jdo"/>
     <copy file="${block.dir}/conf/repository.dtd" tofile="${build.webapp.classes}/repository.dtd"/>
     <copy file="${block.dir}/conf/repository.xml" tofile="${build.webapp.classes}/repository.xml"/>
+    <copy file="${block.dir}/conf/repository_database.xml" tofile="${build.webapp.classes}/repository_database.xml"/>
+    <copy file="${block.dir}/conf/repository_internal.xml" tofile="${build.webapp.classes}/repository_internal.xml"/>
+    <copy file="${block.dir}/conf/repository_user.xml" tofile="${build.webapp.classes}/repository_user.xml"/>
     <copy file="${block.dir}/conf/OJB.properties" tofile="${build.webapp.classes}/OJB.properties"/>
     <copy file="${block.dir}/conf/OJB-logging.properties" tofile="${build.webapp.classes}/OJB-logging.properties"/>
   </target>

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=156648&r2=156649
==============================================================================
--- 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 Wed Mar  9 07:05:57 2005
@@ -25,6 +25,15 @@
     <sample name="Back" href="..">to Cocoon Blocks Samples main page</sample>
   </group>
 
+  <group name="Using Persistence Broker">
+    <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="pb/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 JDO 1.01">
     <note>
       WARNING: To use JDO demo you have to download jdo.jar from Sun's website!
@@ -45,17 +54,7 @@
       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="pb/xspdemo">Sample using JDO in a XSP page.</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>
+    <sample name="Cocoon Forms" href="">Sample using Cocoon Forms Binding. To be done!</sample>
   </group>
 
   <group name="OJB Documentation">

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&r1=156648&r2=156649
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Wed Mar  9 07:05:57 2005
@@ -202,6 +202,9 @@
 
   <changes>
   <release version="@version@" date="@date@">
+   <action dev="VG" type="update">
+     OJB Block: Marked as stable.
+   </action>
    <action dev="all" type="update">
     Make Cocoon compilable and buildable using JDK 5.0.
    </action>



Mime
View raw message