You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2005/03/09 16:40:36 UTC
svn commit: r156651 - in cocoon/trunk: blocks.properties gump.xml
src/blocks/ojb/samples/pb/ src/blocks/ojb/samples/sitemap.xmap
src/blocks/ojb/samples/welcome.xml status.xml
Author: vgritsenko
Date: Wed Mar 9 07:40:31 2005
New Revision: 156651
URL: http://svn.apache.org/viewcvs?view=rev&rev=156651
Log:
mark ojb block as stable
Added:
cocoon/trunk/src/blocks/ojb/samples/pb/
- copied from r156640, cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/samples/pb/
Modified:
cocoon/trunk/blocks.properties
cocoon/trunk/gump.xml
cocoon/trunk/src/blocks/ojb/samples/sitemap.xmap
cocoon/trunk/src/blocks/ojb/samples/welcome.xml
cocoon/trunk/status.xml
Modified: cocoon/trunk/blocks.properties
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?view=diff&r1=156650&r2=156651
==============================================================================
--- cocoon/trunk/blocks.properties (original)
+++ cocoon/trunk/blocks.properties Wed Mar 9 07:40:31 2005
@@ -67,6 +67,9 @@
#-----[dependency]: "lucene" is needed by "querybean".
#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 "querybean".
+#include.block.ojb=false
#include.block.paranoid=false
#include.block.poi=false
#-----[dependency]: "portal" depends on "authentication-fw", "cron", "forms", "session-fw".
@@ -121,9 +124,6 @@
#-----[dependency]: "mail" depends on "asciiart", "scratchpad".
#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 "querybean".
-#include.block.ojb=false
#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb", "velocity".
#include.block.petstore=false
#include.block.proxy=false
Modified: cocoon/trunk/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?view=diff&r1=156650&r2=156651
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Wed Mar 9 07:40:31 2005
@@ -1051,7 +1051,7 @@
<nag from="Gump <general@gump.apache.org>" 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/trunk/src/blocks/ojb/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/samples/sitemap.xmap?view=diff&r1=156650&r2=156651
==============================================================================
--- cocoon/trunk/src/blocks/ojb/samples/sitemap.xmap (original)
+++ cocoon/trunk/src/blocks/ojb/samples/sitemap.xmap Wed Mar 9 07:40:31 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,123 +17,111 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:components>
+ <map:components>
+ <map:transformers default="xslt">
+ <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+ <catalogues default="other">
+ <catalogue id="other" name="OtherMessages" location="context://samples/blocks/forms/messages"/>
+ <catalogue id="forms" name="FormsMessages" location="context://samples/blocks/forms/messages"/>
+ </catalogues>
+ <cache-at-startup>true</cache-at-startup>
+ </map:transformer>
+ </map:transformers>
+ </map:components>
+
+
+ <map:views>
+ <map:view name="content" from-label="content">
+ <map:serialize type="xml"/>
+ </map:view>
+
+ <map:view from-label="content" name="pretty-content">
+ <map:transform src="context://stylesheets/system/xml2html.xslt"/>
+ <map:serialize type="html"/>
+ </map:view>
+
+ <map:view name="links" from-position="last">
+ <map:serialize type="links"/>
+ </map:view>
+ </map:views>
- <map:transformers default="xslt">
- <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
- <catalogues default="other">
- <catalogue id="other" name="OtherMessages" location="context://samples/blocks/forms/messages"/>
- <catalogue id="forms" name="FormsMessages" location="context://samples/blocks/forms/messages"/>
- </catalogues>
- <cache-at-startup>true</cache-at-startup>
- </map:transformer>
- </map:transformers>
-
- </map:components>
-
- <map:views>
- <map:view name="content" from-label="content">
- <map:serialize type="xml"/>
- </map:view>
-
- <map:view from-label="content" name="pretty-content">
- <map:transform src="context://stylesheets/system/xml2html.xslt"/>
- <map:serialize type="html"/>
- </map:view>
-
- <map:view name="links" from-position="last">
- <map:serialize type="links"/>
- </map:view>
- </map:views>
<!-- indicates what flowscript to attach to this sitemap -->
<map:flow language="javascript">
- <map:script src="forms/employee.js"/>
+ <map:script src="forms/employee.js"/>
</map:flow>
- <map:pipelines>
- <map:pipeline>
- <map:match pattern="">
- <map:generate src="welcome.xml"/>
- <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
+ <map:pipelines>
+ <map:pipeline>
- <map:match pattern="jdo/xspdemo">
- <map:generate src="jdo/xsp/demo1.xsp" type="serverpages"/>
+ <map:match pattern="">
+ <map:generate src="welcome.xml"/>
+ <map:transform src="context://samples/common/style/xsl/html/simple-samples2html.xsl">
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ </map:transform>
+ <map:serialize/>
+ </map:match>
+
+ <map:match pattern="*/xspdemo">
+ <map:generate src="{1}/xsp/demo1.xsp" type="serverpages"/>
<map:transform src="context://samples/stylesheets/dynamic-page2html.xsl">
- <map:parameter name="servletPath" value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- <map:parameter name="file" value="jdo/xsp/xspdemo.xsp"/>
- <map:parameter name="remove" value="{0}"/>
+ <map:parameter name="servletPath" value="{request:servletPath}"/>
+ <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ <map:parameter name="file" value="jdo/xsp/xspdemo.xsp"/>
+ <map:parameter name="remove" value="{0}"/>
</map:transform>
<map:serialize/>
- </map:match>
+ </map:match>
- <!--
- | "Form1" example, demonstrates usage of flow and forms
- -->
+ <!--
+ - "Form1" example, demonstrates usage of flow and forms
+ -->
- <map:match pattern="jdo/forms/employee">
+ <map:match pattern="jdo/forms/employee">
<map:call function="handleForm">
- <map:parameter name="function" value="employeeform_jdo"/>
- <map:parameter name="form-definition" value="forms/employee.xml"/>
- <map:parameter name="bindingURI" value="forms/employee_bind.xml"/>
+ <map:parameter name="function" value="employeeform_jdo"/>
+ <map:parameter name="form-definition" value="forms/employee.xml"/>
+ <map:parameter name="bindingURI" value="forms/employee_bind.xml"/>
</map:call>
- </map:match>
+ </map:match>
- <map:match pattern="jdo/forms/employee-form-display">
+ <map:match pattern="jdo/forms/employee-form-display">
<map:generate src="forms/employee_template.xml"/>
<map:transform type="forms"/>
<map:transform type="i18n">
- <map:parameter name="locale" value="en-US"/>
+ <map:parameter name="locale" value="en-US"/>
</map:transform>
<map:transform src="context://samples/blocks/forms/resources/forms-samples-styling.xsl"/>
<map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- <map:parameter name="servletPath" value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="file" value="forms/employee.xml"/>
- <map:parameter name="remove" value="{0}"/>
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ <map:parameter name="servletPath" value="{request:servletPath}"/>
+ <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+ <map:parameter name="file" value="forms/employee.xml"/>
+ <map:parameter name="remove" value="{0}"/>
</map:transform>
<map:serialize/>
- </map:match>
+ </map:match>
- <map:match pattern="jdo/forms/employee-form-success">
+ <map:match pattern="jdo/forms/employee-form-success">
<map:generate type="serverpages" src="forms/success.xsp"/>
<map:transform src="context://samples/common/style/xsl/html/simple-page2html.xsl">
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- <map:parameter name="servletPath" value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="file" value="forms/success.xsp"/>
- <map:parameter name="remove" value="{0}"/>
+ <map:parameter name="contextPath" value="{request:contextPath}"/>
+ <map:parameter name="servletPath" value="{request:servletPath}"/>
+ <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
+ <map:parameter name="file" value="forms/success.xsp"/>
+ <map:parameter name="remove" value="{0}"/>
</map:transform>
<map:serialize/>
- </map:match>
+ </map:match>
- <!-- Manages continuations -->
- <map:match pattern="jdo/forms/*.continue">
- <map:call continuation="{1}"/>
- </map:match>
-
- <!-- odmg samples -->
- <map:match pattern="odmg/xspdemo">
- <map:generate src="odmg/xsp/demo1.xsp" type="serverpages"/>
- <map:transform src="context://samples/stylesheets/dynamic-page2html.xsl">
- <map:parameter name="servletPath" value="{request:servletPath}"/>
- <map:parameter name="sitemapURI" value="{request:sitemapURI}"/>
- <map:parameter name="contextPath" value="{request:contextPath}"/>
- <map:parameter name="file" value="odmg/xsp/xspdemo.xsp"/>
- <map:parameter name="remove" value="{0}"/>
- </map:transform>
- <map:serialize/>
- </map:match>
+ <!-- Manages continuations -->
+ <map:match pattern="jdo/forms/*.continue">
+ <map:call continuation="{1}"/>
+ </map:match>
- </map:pipeline>
- </map:pipelines>
+ </map:pipeline>
+ </map:pipelines>
</map:sitemap>
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=156650&r2=156651
==============================================================================
--- cocoon/trunk/src/blocks/ojb/samples/welcome.xml (original)
+++ cocoon/trunk/src/blocks/ojb/samples/welcome.xml Wed Mar 9 07:40:31 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="Forms" href="">Sample using Cocoon Forms. 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!
@@ -36,7 +45,7 @@
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>
+ <sample name="Forms" href="jdo/forms/employee">Sample using JDO with Cocoon Forms.</sample>
</group>
<group name="Using ODMG 3.0 (To be done)">
@@ -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="">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>
+ <sample name="Forms" href="">Sample using Cocoon Forms. To be done!</sample>
</group>
<group name="OJB Documentation">
Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diff&r1=156650&r2=156651
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Wed Mar 9 07:40:31 2005
@@ -429,6 +429,9 @@
</action>
</release>
<release version="2.1.7" date="TBD">
+ <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>