You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bd...@apache.org on 2005/10/04 18:52:38 UTC
svn commit: r294825 - in /cocoon/whiteboard/example-apps/bricks-cms/src:
build-targets/ cocoon/webapp/bricks-cms/ cocoon/webapp/bricks-cms/admin/
cocoon/webapp/bricks-cms/admin/document-editor/
cocoon/webapp/bricks-cms/admin/document-editor/forms/ coco...
Author: bdelacretaz
Date: Tue Oct 4 09:52:06 2005
New Revision: 294825
URL: http://svn.apache.org/viewcvs?rev=294825&view=rev
Log:
V0.6: code cleanup, i18n transformer added, nicer document editor form
Modified:
cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/build-cocoon-targets.xml
cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/derby-build-targets.xml
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-model.xml
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/sitemap.xmap
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/document.jx.xml
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/search-results.jx.xml
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/sitemap.xmap
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/pages/admin-homepage.xml
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/form-styling.xsl
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-field-styling.xsl
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-page-styling.xsl
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/sitemap.xmap
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/sitemap.xmap
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/test-homepage.xml
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ApplicationComponentManager.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ComponentManagerPing.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/impl/ComponentManagerPingImpl.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/data/BricksDocument.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/ObjectStore.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/impl/OjbObjectStore.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/DbConnectionProvider.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbConnectionFactory.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbTransactionHelper.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/impl/OjbAdaptor.java
cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/util/NullAttributeException.java
cocoon/whiteboard/example-apps/bricks-cms/src/misc/derby/derby-db-schema.txt
cocoon/whiteboard/example-apps/bricks-cms/src/misc/hivemind/hivemodule.xml
cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/bricks-ojb-repository.xml
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/build-cocoon-targets.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/build-cocoon-targets.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/build-cocoon-targets.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/build-cocoon-targets.xml Tue Oct 4 09:52:06 2005
@@ -18,13 +18,16 @@
<!--
build-cocoon-targets.xml, copied and adapted from the Cocoon wiki site
- (YourCocoonBasedProjectAnt16 page).
+ (YourCocoonBasedProjectAnt16 page). Originally created by Marc Portier,
+ everybody please say "hi Marc, and thanks"!
- This Apache Ant build.xml snippet contains targets for helping out
- managing the Cocoon dependencies of your project.
+ "Imports" what we need from a Cocoon source tree, and builds it in
+ a subdirectory under uild/.
It assumes that you have Ant version 1.6.x or later that supports the
<import> task.
+
+ TODO: some build targets are not used by bricks-cms, delete them.
See the top-level README.TXT for how to use this.
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/derby-build-targets.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/derby-build-targets.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/derby-build-targets.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/derby-build-targets.xml Tue Oct 4 09:52:06 2005
@@ -17,7 +17,9 @@
-->
<!--
- Derby build targets, start some derby tools used for debugging and setup
+ Derby build targets, start some derby tools used for debugging and setup,
+ and create the Derby database.
+
$Id$
-->
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-model.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-model.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-model.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-model.xml Tue Oct 4 09:52:06 2005
@@ -59,7 +59,7 @@
<fd:output id="lastModified">
<fd:label>
- <i18n:text>document-created-label</i18n:text>
+ <i18n:text>document-last-modified-label</i18n:text>
</fd:label>
<fd:datatype base="date"/>
</fd:output>
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml Tue Oct 4 09:52:06 2005
@@ -47,24 +47,25 @@
<div id="documentEntryForm">
- <p><em>Yes...this form could be made much nicer ;-)</em></p>
-
- <input type="submit" i18n:attr="value" name="save-button" value="save-button-label"/>
-
<table width="100%">
<tr>
<td>
- <i18n:text>document-id-label</i18n:text>
+ <span class="fieldName"><i18n:text>document-id-label</i18n:text></span>
:
+ <ft:widget id="id"/>
+ <br/>
+ <input type="submit" i18n:attr="value" name="save-button" value="save-button-label"/>
</td>
<td>
- <ft:widget id="id"/>
+ <span class="fieldName"><ft:widget-label id="created"/></span>: <ft:widget id="created"/>
+ <br/>
+ <span class="fieldName"><ft:widget-label id="lastModified"/></span>: <ft:widget id="lastModified"/>
</td>
</tr>
<tr>
<td>
- <i18n:text>document-title-label</i18n:text>
+ <span class="fieldName"><ft:widget-label id="title"/></span>
:
</td>
<td>
@@ -76,33 +77,13 @@
<tr>
<td>
- <i18n:text>document-content-label</i18n:text>
+ <span class="fieldName"><ft:widget-label id="content"/></span>
:
</td>
<td>
<ft:widget id="content">
- <fi:styling type="textarea" rows="10" cols="60" style="width:100%;"/>
+ <fi:styling type="textarea" rows="25" cols="60" style="width:100%;"/>
</ft:widget>
- </td>
- </tr>
-
- <tr>
- <td>
- <i18n:text>document-created-label</i18n:text>
- :
- </td>
- <td>
- <ft:widget id="created"/>
- </td>
- </tr>
-
- <tr>
- <td>
- <i18n:text>document-lastModified-label</i18n:text>
- :
- </td>
- <td>
- <ft:widget id="lastModified"/>
</td>
</tr>
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/sitemap.xmap?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/sitemap.xmap (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/sitemap.xmap Tue Oct 4 09:52:06 2005
@@ -37,8 +37,10 @@
</map:flow>
<map:resources>
+ <!-- reusable pipeline part, for our layout -->
<map:resource name="layout">
<map:transform src="../xslt/page-to-html.xsl"/>
+ <map:transform type="i18n"/>
<map:serialize type="html"/>
</map:resource>
</map:resources>
@@ -54,11 +56,13 @@
<map:call continuation="{2}"/>
</map:match>
+ <!-- page for / -->
<map:match pattern="">
<map:generate src="document-editor-homepage.xml"/>
<map:call resource="layout"/>
</map:match>
+ <!-- create a document -->
<map:match pattern="create">
<map:call function="handleForm">
<map:parameter name="function" value="form_editDocument"/>
@@ -73,6 +77,7 @@
</map:call>
</map:match>
+ <!-- edit a document -->
<map:match pattern="edit/*">
<map:call function="handleForm">
<map:parameter name="function" value="form_editDocument"/>
@@ -87,6 +92,7 @@
</map:call>
</map:match>
+ <!-- view a document -->
<map:match pattern="view/*">
<map:call function="viewDocument">
<map:parameter name="docId" value="{1}"/>
@@ -94,6 +100,7 @@
</map:call>
</map:match>
+ <!-- search for documents -->
<map:match pattern="search">
<map:call function="searchDocuments">
<map:parameter name="displayURI" value="search-results-display"/>
@@ -101,13 +108,16 @@
</map:match>
</map:pipeline>
+ <!-- internal pipelines, for forms and data display -->
<map:pipeline internal-only="true">
<map:match pattern="*-form-display">
<map:generate type="jx" src="forms/{1}-template.xml"/>
+ <map:transform type="i18n"/>
<map:transform src="../xslt/page-to-html.xsl"/>
<map:transform src="context://bricks-cms/common/forms/form-styling.xsl">
<map:parameter name="resources-uri" value="admin-resources"/>
</map:transform>
+ <map:transform type="i18n"/>
<map:serialize type="html"/>
</map:match>
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/document.jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/document.jx.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/document.jx.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/document.jx.xml Tue Oct 4 09:52:06 2005
@@ -17,7 +17,7 @@
-->
<!--
- JXTemplate used to display a BricksDocument
+ JXTemplate used to display a BricksDocument, converts directly to a <page>
$Id$
-->
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/search-results.jx.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/search-results.jx.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/search-results.jx.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/search-results.jx.xml Tue Oct 4 09:52:06 2005
@@ -17,7 +17,7 @@
-->
<!--
- JXTemplate used to dump the results of a query on BricksDocuments
+ JXTemplate used to dump the results of a query on BricksDocuments in XML
$Id: document.jx.xml 292989 2005-10-01 16:39:33 +0200 (sam., 01 oct. 2005) bdelacretaz $
-->
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/sitemap.xmap?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/sitemap.xmap (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/sitemap.xmap Tue Oct 4 09:52:06 2005
@@ -28,6 +28,7 @@
<map:resources>
<map:resource name="layout">
<map:transform src="xslt/page-to-html.xsl"/>
+ <map:transform type="i18n"/>
<map:serialize type="html"/>
</map:resource>
</map:resources>
@@ -39,6 +40,7 @@
<map:redirect-to uri="homepage"/>
</map:match>
+ <!-- publish our local homepage -->
<map:match pattern="homepage">
<map:generate src="static-content/pages/admin-homepage.xml"/>
<map:call resource="layout"/>
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/pages/admin-homepage.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/pages/admin-homepage.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/pages/admin-homepage.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/pages/admin-homepage.xml Tue Oct 4 09:52:06 2005
@@ -22,7 +22,7 @@
-->
<page>
<metadata>
- <title>bricks-cms V0.5 admin homepage</title>
+ <title>bricks-cms V0.6 admin homepage</title>
</metadata>
<content>
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css Tue Oct 4 09:52:06 2005
@@ -74,6 +74,10 @@
padding: 2px;
}
+.fieldName {
+ font-style: italic;
+}
+
.evenRow
{
background-color: #FFFFCC;
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/form-styling.xsl
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/form-styling.xsl?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/form-styling.xsl (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/form-styling.xsl Tue Oct 4 09:52:06 2005
@@ -14,6 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- CForms styling, copied from the Cocoon source tree -->
+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!--+ Include styling stylesheets, one for the widgets, the other one for the
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-field-styling.xsl
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-field-styling.xsl?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-field-styling.xsl (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-field-styling.xsl Tue Oct 4 09:52:06 2005
@@ -14,6 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- CForms styling, copied from the Cocoon source tree -->
+
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-page-styling.xsl
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-page-styling.xsl?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-page-styling.xsl (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/forms-page-styling.xsl Tue Oct 4 09:52:06 2005
@@ -14,6 +14,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- CForms styling, copied from the Cocoon source tree -->
+
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/sitemap.xmap?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/sitemap.xmap (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/sitemap.xmap Tue Oct 4 09:52:06 2005
@@ -25,6 +25,30 @@
xmlns:map="http://apache.org/cocoon/sitemap/1.0"
>
+ <map:components>
+ <map:transformers default="xalan">
+
+ <!-- configure the i18n transformer -->
+ <map:transformer
+ name="i18n"
+ src="org.apache.cocoon.transformation.I18nTransformer"
+ logger="bricks-cms.i18n"
+ >
+ <!-- messages are in i18n-messages/exstor-messages.xml -->
+ <catalogues default="bricks-messages">
+ <catalogue
+ id="bricks-messages"
+ name="bricks-messages"
+ location="context://bricks-cms/i18n-messages"
+ />
+ </catalogues>
+
+ <!-- don't cache, to be able to change messages without stopping cocoon -->
+ <cache-at-startup>false</cache-at-startup>
+ </map:transformer>
+ </map:transformers>
+ </map:components>
+
<map:pipelines>
<map:pipeline>
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/sitemap.xmap?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/sitemap.xmap (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/sitemap.xmap Tue Oct 4 09:52:06 2005
@@ -35,6 +35,7 @@
<!-- use admin layout for tests -->
<map:resource name="layout">
<map:transform src="../admin/xslt/page-to-html.xsl"/>
+ <map:transform type="i18n"/>
<map:serialize type="html"/>
</map:resource>
</map:resources>
@@ -74,6 +75,7 @@
<map:read src="../admin/static-content/resources/{2}"/>
</map:match>
+ <!-- generate all other pages in the same way -->
<map:match pattern="*">
<map:generate type="jx" src="{1}.xml"/>
<map:call resource="layout"/>
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/test-homepage.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/test-homepage.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/test-homepage.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/test-homepage.xml Tue Oct 4 09:52:06 2005
@@ -16,7 +16,9 @@
limitations under the License.
-->
-<page>
+<page
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+>
<metadata>
<title>bricks-cms test homepage</title>
</metadata>
@@ -40,5 +42,10 @@
</p>
</li>
</ul>
+ <p>
+ If the i18n transformer is configured correctly you should see "i18n test successful" in bold below:
+ <br/>
+ <b><i18n:text>i18n-transformer-test</i18n:text></b>
+ </p>
</content>
</page>
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ApplicationComponentManager.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ApplicationComponentManager.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ApplicationComponentManager.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ApplicationComponentManager.java Tue Oct 4 09:52:06 2005
@@ -19,8 +19,8 @@
import java.util.Date;
import org.apache.hivemind.Registry;
-/** Facade to our actual component manager (resources), created for strict
- * control of what we use from the resources Registry. Would make it easier to
+/** Facade to our actual component manager, created for strict
+ * control of what we use from the HiveMind Registry. Would make it easier to
* switch to another component manager, assuming all application components
* are created via this class.
*/
@@ -38,7 +38,7 @@
registry = reg;
}
- /** singleton-like access, use this instead of using the resources Registry directly */
+ /** singleton-like access, use this instead of using the HiveMind Registry directly */
public static ApplicationComponentManager getInstance() {
return singleInstance;
}
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ComponentManagerPing.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ComponentManagerPing.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ComponentManagerPing.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ComponentManagerPing.java Tue Oct 4 09:52:06 2005
@@ -16,6 +16,7 @@
package org.apache.cocoon.apps.bricks.cms.componentmanager;
+/** Do-nothing service used to test access to HiveMind-managed compoents */
public interface ComponentManagerPing {
String ping();
}
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/impl/ComponentManagerPingImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/impl/ComponentManagerPingImpl.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/impl/ComponentManagerPingImpl.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/impl/ComponentManagerPingImpl.java Tue Oct 4 09:52:06 2005
@@ -20,6 +20,9 @@
import java.util.Date;
+/** "Ping" the component manager, used to test access to objects managed
+ * by HiveMind.
+ */
public class ComponentManagerPingImpl implements ComponentManagerPing {
private String message = "ComponentManagerPingImpl: MESSAGE NOT SET??";
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/data/BricksDocument.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/data/BricksDocument.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/data/BricksDocument.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/data/BricksDocument.java Tue Oct 4 09:52:06 2005
@@ -21,7 +21,15 @@
import java.util.Date;
import java.sql.Timestamp;
+/** The documents that are managed by our toy CMS
+ * Objects of this class are stored in the database by OJB, based
+ * on the mappings defined in the OBJ repository file.
+ */
public class BricksDocument implements ObjectStore.TemplateObjectProvider {
+
+ /** Nothing special needed to store our fields in the database, OJB is clever
+ * enough to persist private fields there.
+ */
private int id;
private int persistentStorageVersion;
private String title = "";
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/ObjectStore.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/ObjectStore.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/ObjectStore.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/ObjectStore.java Tue Oct 4 09:52:06 2005
@@ -34,13 +34,13 @@
/** generic object retrieval */
Object queryByKey(Object exampleHavingSpecifiedKey,boolean forWriting) throws Exception;
- /** create a template object, for retrieval by key */
+ /** create a template object, as needed for queryByKey */
Object getTemplateObject(Class clazz,int key) throws Exception;
/** create an empty object of the given class */
Object createNew(Class clazz) throws Exception;
- /** query parameters */
+ /** query parameters, not implemented yet */
public static interface QueryParameters extends Map {
}
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/impl/OjbObjectStore.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/impl/OjbObjectStore.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/impl/OjbObjectStore.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/impl/OjbObjectStore.java Tue Oct 4 09:52:06 2005
@@ -29,6 +29,7 @@
import org.apache.cocoon.apps.bricks.cms.ojb.OjbTransactionHelper;
import org.apache.cocoon.apps.bricks.cms.objectstore.ObjectStore;
+/** ObjectStore implementation using OJB to persist objects */
public class OjbObjectStore implements ObjectStore {
private Log log;
@@ -36,6 +37,7 @@
static class QueryParametersImpl extends HashMap implements QueryParameters {
}
+ /** This is called by HiveMind when this object is created */
public void setLog(Log log) {
this.log = log;
}
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/DbConnectionProvider.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/DbConnectionProvider.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/DbConnectionProvider.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/DbConnectionProvider.java Tue Oct 4 09:52:06 2005
@@ -19,6 +19,7 @@
import java.sql.Connection;
import java.sql.SQLException;
+/** Simple source of database connections */
public interface DbConnectionProvider {
/** get a Connection given its alias */
Connection lookupConnection(String alias) throws SQLException;
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbConnectionFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbConnectionFactory.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbConnectionFactory.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbConnectionFactory.java Tue Oct 4 09:52:06 2005
@@ -23,8 +23,7 @@
import java.sql.Connection;
-/** ConnectionFactory for the OJB library. */
-
+/** ConnectionFactory for OJB, gets a DbConnectionProvider from our ApplicationComponentManager. */
public class OjbConnectionFactory implements ConnectionFactory {
/** OJB ConnectionFactory requirement */
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbTransactionHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbTransactionHelper.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbTransactionHelper.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbTransactionHelper.java Tue Oct 4 09:52:06 2005
@@ -19,6 +19,7 @@
import org.apache.ojb.broker.PersistenceBrokerFactory;
import org.apache.ojb.broker.PersistenceBroker;
+/** Helper for executing database operations using the OJB PersistenceBroker */
public abstract class OjbTransactionHelper {
/**
* store a result provided by runTransaction
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/impl/OjbAdaptor.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/impl/OjbAdaptor.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/impl/OjbAdaptor.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/impl/OjbAdaptor.java Tue Oct 4 09:52:06 2005
@@ -25,6 +25,7 @@
import org.apache.cocoon.apps.bricks.cms.util.NullAttributeException;
import org.apache.cocoon.apps.bricks.cms.ojb.DbConnectionProvider;
+/** Provider of database connections for OJB */
public class OjbAdaptor implements DbConnectionProvider {
private final BasicDataSource ds = new BasicDataSource();
private Log log;
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/util/NullAttributeException.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/util/NullAttributeException.java?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/util/NullAttributeException.java (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/util/NullAttributeException.java Tue Oct 4 09:52:06 2005
@@ -16,6 +16,7 @@
package org.apache.cocoon.apps.bricks.cms.util;
+/** Check against null or empty values */
public class NullAttributeException extends Exception {
public static final String IS_NULL = " is null";
public static final String IS_NULL_OR_EMPTY = " is null or empty";
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/misc/derby/derby-db-schema.txt
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/misc/derby/derby-db-schema.txt?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/misc/derby/derby-db-schema.txt (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/misc/derby/derby-db-schema.txt Tue Oct 4 09:52:06 2005
@@ -12,8 +12,9 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
--- bricks-cms database schema, for the derby embedded database server
--- might need some changes to work with other databases
+-- bricks-cms database schema, for the derby embedded database server.
+-- Might need some changes to work with other databases.
+-- Used by the "derby:create" build target to create the database.
-- This is needed to store the OJB HighLowSequence object state
CREATE TABLE OJB_HL_SEQ
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/misc/hivemind/hivemodule.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/misc/hivemind/hivemodule.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/misc/hivemind/hivemodule.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/misc/hivemind/hivemodule.xml Tue Oct 4 09:52:06 2005
@@ -21,6 +21,7 @@
<module id="brickscms" version="1.0.0">
<contribution configuration-id="hivemind.EagerLoad">
+ <!-- load the OjbAdaptor at startup to initialize OJB -->
<load service-id="OjbAdaptor"/>
</contribution>
Modified: cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/bricks-ojb-repository.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/bricks-ojb-repository.xml?rev=294825&r1=294824&r2=294825&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/bricks-ojb-repository.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/bricks-ojb-repository.xml Tue Oct 4 09:52:06 2005
@@ -17,7 +17,9 @@
-->
<!--
- OJB repository definition for bricks-cms, based on the OJB template repository.xml
+ OJB repository definition for bricks-cms, based on the OJB template repository.xml.
+ Defines the mappings between our Java objects and our database.
+
$Id$
-->