svn commit: r292140 [1/4] - in /cocoon/whiteboard/example-apps/bricks-cms: ./ lib/commons/ lib/derby/ lib/derby/derby-10.1.1.0/ lib/hivemind/ lib/hivemind/hivemind-1.1-rc-1/ lib/hivemind/javassist-3.0/ lib/ojb/ lib/ojb/db-ojb-1.0.3/ lib/servlet/ src/bu...

[bd...@apache.org]

Author: bdelacretaz
Date: Wed Sep 28 01:08:23 2005
New Revision: 292140

URL: http://svn.apache.org/viewcvs?rev=292140&view=rev
Log:
Work in progress: BricksDocuments can be created and edited, with a simplistic interface

Added:
    cocoon/whiteboard/example-apps/bricks-cms/lib/commons/
    cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-LICENSE.txt   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-dbcp-1.2.1.jar   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-pool-1.2.jar   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/derby/
    cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/
    cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby-LICENSE.txt   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby.jar   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derbytools.jar   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/
    cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/
    cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-1.1-rc-1.jar   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-LICENSE.txt   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-lib-1.1-rc-1.jar   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/
    cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/javassist-3.0.jar   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/javassist-LICENSE.html
    cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/
    cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/
    cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-1.0.3.jar   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-LICENSE.txt   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/derby-build-targets.xml   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/log4-config.properties   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/document-editor.js   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-binding.xml   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-model.xml   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml   (with props)
    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/
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/document.jx.xml   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/component-manager.js   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/forms/
    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/test/
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/db-connect.js   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/get-document.js   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/ping.js   (with props)
    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   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/test/user-message.jx.xml   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/xconf/log4j-logger.xweb   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ApplicationComponentManager.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ComponentManagerPing.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/impl/
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/impl/ComponentManagerPingImpl.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/data/
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/data/BricksDocument.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/ObjectStore.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/impl/
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/impl/OjbObjectStore.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/DbConnectionProvider.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbConnectionFactory.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/OjbTransactionHelper.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/impl/
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/ojb/impl/OjbAdaptor.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/util/
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/util/NullAttributeException.java   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/derby/
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/derby/derby-db-schema.txt   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/derby/derby.properties   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/hivemind/
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/hivemind/hivemodule.xml   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/bricks-ojb-repository.xml   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/ojb-bricks-cms.properties   (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/repository.dtd
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/ojb/repository_internal.xml   (with props)
Modified:
    cocoon/whiteboard/example-apps/bricks-cms/   (props changed)
    cocoon/whiteboard/example-apps/bricks-cms/README.TXT
    cocoon/whiteboard/example-apps/bricks-cms/STATUS.TXT   (contents, props changed)
    cocoon/whiteboard/example-apps/bricks-cms/build.xml   (contents, props changed)
    cocoon/whiteboard/example-apps/bricks-cms/lib/servlet/servlet-LICENSE.txt   (props changed)
    cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/build-cocoon-targets.xml   (contents, props changed)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/cocoon.build.properties   (contents, props changed)
    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   (contents, props changed)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css   (contents, props changed)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/xslt/page-to-html.xsl
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/sitemap.xmap
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/welcome.xml   (contents, props changed)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/xconf/ComponentManagerInitializer.xweb   (props changed)
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/componentmanager/ComponentManagerInitializer.java   (contents, props changed)
    cocoon/whiteboard/example-apps/bricks-cms/user.properties   (contents, props changed)

Propchange: cocoon/whiteboard/example-apps/bricks-cms/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 28 01:08:23 2005
@@ -1,4 +1,4 @@
 build
 .classpath
 .project
-local-user.properties
+local.user.properties

Modified: cocoon/whiteboard/example-apps/bricks-cms/README.TXT
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/README.TXT?rev=292140&r1=292139&r2=292140&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/README.TXT (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/README.TXT Wed Sep 28 01:08:23 2005
@@ -6,7 +6,8 @@
 This directory contains the source code of the bricks-cms application,
 that will be presented at the GetTogether 2005.
 
-See the STATUS.TXT for information about what to expect from the app.
+See the STATUS.TXT for information about what to expect from the app, and
+http://wiki.apache.org/cocoon/BricksCms page for up-to-date information.
 
 
 POOR WINDOWS USERS
@@ -17,19 +18,33 @@
 this file or send patches, it'd be great! 
 
 The instructions below have been tested under macosx 10.3.8, and should
-work under Linux as well.
+work under Linux as well. Adapting them for Windows shouldn't be hard!
+
+
+SOME ASSEMBLY REQUIRED
+The target audience for this example app is Java and/or XSLT developers
+who want to create their own applications with Cocoon.
+
+If you know nothing about Java and XSLT and have never used the command
+line of your system, this example application is probably not for you,
+don't waste your time!
+
+There are other Cocoon tutorials (the Supersonic Tour for example) which
+will be much easier to grasp for non-programmers.
 
 
 REQUIREMENTS
 You'll need:
  - JDK 1.4.x (tested with 1.4.2_05 on macosx).
  - ant 1.6.1, see below.
- - The bricks-cms code, obviously
+ - The bricks-cms code, obviously, which currently resides at
+    https://svn.apache.org/repos/asf/cocoon/whiteboard/example-apps/bricks-cms/
 
 
 CONFIGURING
 Read user.properties and adjust settings by creating a local.user.properties 
-if needed. All configurable properties are explained there.
+if needed. All configurable properties are explained there, you'll need at
+least to set the cocoon.distro.home property.
 
 If you modify the application and need to activate more Cocoon blocks, see
 the src/cocoon/config/cocoon.build.properties file, which has a slightly 
@@ -42,13 +57,13 @@
 to understand how environment variables work before going further, to
 avoid frustration.
 
-To use the version of ant which is included in the Cocoon repository,
-the example below should work if you have checked out Cocoon and the 
-bricks-cms example app with the same directory layout as in the SVN
-repository:
+For some reason the version of ant which is included in the Cocoon 
+repository does not work for the bricks-cms app (it gives a 
+java.lang.ExceptionInInitializerError when attempting to start the 
+app), for now you'll need to install your own version of ant 
+(http://ant.apache.org/).
 
-  export ANT_HOME=../../../branches/BRANCH_2_1_X/tools/
-  export PATH=$ANT_HOME/bin:$PATH
+The JAVA_HOME environment variable must also be set correctly.
 
 If you have the correct version of ant in your environment, typing "ant"
 in the bricks-cms directory should say:
@@ -60,7 +75,8 @@
 
   BUILD SUCCESSFUL
   
-If this works, type "ant run" and follow the on-screen instructions.
+If this works, type "ant run" and follow the on-screen instructions
+(INCLUDING the one about ant derby:create ;-)
 
 
 RUNNING
@@ -70,6 +86,9 @@
 This requires the cocoon.distro.home property to be set correctly
 in the (local.)user.properties file.
 
+Also, the database must be created with "ant derby:clean derby:create",
+which erases all the data in case the database was already present.
+
 Then, "ant run" should start the application, which will be made
 available at http://localhost:8888.
 
@@ -84,4 +103,8 @@
 
 This allows you to activate any changes made to non-java code 
 (sitemaps, XSLT, etc) in the src tree, by copying the changed files 
-to the running webapp.
\ No newline at end of file
+to the running webapp.
+
+The "clean-classes" build target deletes all compiled classes from
+the bricks-cms project, but keeps the contents of the build/cocoon
+directory.
\ No newline at end of file

Modified: cocoon/whiteboard/example-apps/bricks-cms/STATUS.TXT
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/STATUS.TXT?rev=292140&r1=292139&r2=292140&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/STATUS.TXT (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/STATUS.TXT Wed Sep 28 01:08:23 2005
@@ -3,5 +3,16 @@
 $Id$
 ===========================================================================
 
-The current revision does nothing useful, only the build system and app
-skeleton are in place, stay tuned...
\ No newline at end of file
+The current revision allows BricksDocuments to be edited and displayed
+in a very simple way.
+
+It has been tested with the Cocoon 2.1.7 release on macosx, JDK 1.4.2.
+
+Documents are stored in an embedded Derby relational database.
+
+See README.TXT for how to start and test the application.
+
+
+HOW TO TEST
+-Start the application as described in README.TXT
+-TODO add more info...

Propchange: cocoon/whiteboard/example-apps/bricks-cms/STATUS.TXT
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/whiteboard/example-apps/bricks-cms/build.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/build.xml?rev=292140&r1=292139&r2=292140&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/build.xml (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/build.xml Wed Sep 28 01:08:23 2005
@@ -23,116 +23,141 @@
 
 <project name="bricks-cms" default="explain">
 
-  <!--
+	<!--
       Override default settings provided by user.properties, which is stored in SVN),
       with settings from local_user.properties, which is not in SVN and can be used
       to set local values.
 
       And yes, this is the correct order of <property> elements to do this.
   -->
-  <property file="local.user.properties"/>
-  <property file="user.properties"/>
+	<property file="local.user.properties"/>
+	<property file="user.properties"/>
 
-  <!-- setup paths -->
-  <property name="src" value="${basedir}/src"/>
-  <property name="src.java" value="${src}/java"/>
-  <property name="src.cocoon" value="${src}/cocoon"/>
-  <property name="src.webapp" value="${src.cocoon}/webapp"/>
-  <property name="src.config" value="${src.cocoon}/config"/>
-  <property name="build" value="${basedir}/build"/>
-  <property name="build.classes" value="${build}/classes"/>
-  <property name="warfile" value="${build}/${ant.project.name}.war"/>
+	<!-- setup paths -->
+	<property name="src" value="${basedir}/src"/>
+	<property name="src.java" value="${src}/java"/>
+	<property name="src.cocoon" value="${src}/cocoon"/>
+	<property name="src.webapp" value="${src.cocoon}/webapp"/>
+	<property name="src.config" value="${src.cocoon}/config"/>
+	<property name="src.build-targets" value="${src}/build-targets"/>
+	<property name="src.misc" value="${src}/misc"/>
+	<property name="build" value="${basedir}/build"/>
+	<property name="build.classes" value="${build}/classes"/>
+	<property name="build.meta-inf" value="${build}/classes/META-INF"/>
+	<property name="warfile" value="${build}/${ant.project.name}.war"/>
 
-  <!-- ${basedir}/ ensures that the absolute path is part of the properties;
+	<!-- ${basedir}/ ensures that the absolute path is part of the properties;
        this is needed for property 'cocoon.webapp' in the 'cocoon:run' target -->
-  <property name="lib" value="${basedir}/lib"/>
-  <property name="utilities" value="${basedir}/utilities"/>
+	<property name="lib" value="${basedir}/lib"/>
+	<property name="utilities" value="${basedir}/utilities"/>
 
-  <property name="cocoon-build.properties" value="${src.cocoon}/local.build.properties"/>
-  <property name="cocoon.xconf.dir" value="${src.cocoon}/xconf"/>
-  <property name="cocoon.tool.dir" value="${build}/cocoon"/>
-  <property name="cocoon.webapp" value="${cocoon.tool.dir}/webapp"/>
-  <property name="cocoon.lib" value="${cocoon.webapp}/WEB-INF/lib"/>
-  <property name="cocoon.classes" value="${cocoon.webapp}/WEB-INF/classes"/>
-  <property name="jetty.workdir" value="${cocoon.webapp}/WEB-INF/work"/>
-
-  <!-- build targets for Cocoon distro processing -->
-  <property name="build-cocoon-targets" value="${src}/build-targets/build-cocoon-targets.xml"/>
-  <import file="${build-cocoon-targets}"/>
-
-  <!-- Common paths -->
-  <path id="all.cp">
-    <pathelement location="${build.classes}"/>
-    <fileset dir="${cocoon.lib}">
-      <include name="*.jar"/>
-    </fileset>
-    <fileset dir="${lib}">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
-
-  <!-- Main targets -->
-
-  <target name="explain">
-    <echo>See README.TXT for how to setup and use this module</echo>
-  </target>
-
-  <target name="init">
-    <mkdir dir="${build.classes}"/>
-  </target>
-
-  <target name="compile" depends="init,-cocoon:check">
-    <javac srcdir="${src.java}" destdir="${build.classes}" debug="true">
-      <classpath refid="all.cp"/>
-      <include name="**/*.java"/>
-    </javac>
-  </target>
-
-  <!-- Compile and configure -->
-  <target name="copy-configs" depends="init"
-          description="copy required configuration files for webapp">
-
-    <!-- add any configuration files copies here -->
-
-  </target>
-
-  <target name="webapp" depends="compile, cocoon:xconf, copy-configs" description="build and configure the webapp">
-    <copy todir="${cocoon.lib}" flatten="true">
-      <fileset dir="${lib}">
-        <include name="**/*.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${cocoon.classes}">
-      <fileset dir="${build.classes}"/>
-    </copy>
-    <copy todir="${cocoon.webapp}">
-      <fileset dir="${src.webapp}"/>
-    </copy>
-
-    <!-- make sure to overwrite the welcome.xml generated by cocoon:get -->
-    <copy todir="${cocoon.webapp}" overwrite="true">
-      <fileset dir="${src.webapp}">
-        <include name="welcome.xml"/>
-      </fileset>
-    </copy>
-
-    <!-- Jetty uses WEB-INF/work as a work dir if it exists, clean it up -->
-    <delete dir="${jetty.workdir}"/>
-    <mkdir dir="${jetty.workdir}"/>
-  </target>
-
-  <target name="clean" depends="init" description="cleanup all generated files, including the cocoon:get build">
-    <delete dir="${build}"/>
-  </target>
-
-  <target name="run-message">
-    <echo>${build.run.message}</echo>
-  </target>
-
-  <target name="run" depends="webapp,run-message,cocoon:run" description="build and start with built-in Jetty"/>
-
-  <target name="war" depends="webapp" description="create a war file for deployment">
-    <jar destfile="${warfile}" basedir="${cocoon.webapp}"/>
-  </target>
+	<property name="cocoon-build.properties" value="${src.cocoon}/local.build.properties"/>
+	<property name="cocoon.xconf.dir" value="${src.cocoon}/xconf"/>
+	<property name="cocoon.tool.dir" value="${build}/cocoon"/>
+	<property name="cocoon.webapp" value="${cocoon.tool.dir}/webapp"/>
+	<property name="cocoon.lib" value="${cocoon.webapp}/WEB-INF/lib"/>
+	<property name="cocoon.classes" value="${cocoon.webapp}/WEB-INF/classes"/>
+	<property name="jetty.workdir" value="${cocoon.webapp}/WEB-INF/work"/>
+
+	<!-- import additional build files -->
+	<import file="${src.build-targets}/build-cocoon-targets.xml"/>
+	<import file="${src.build-targets}/derby-build-targets.xml"/>
+
+	<!-- Common paths -->
+	<path id="all.cp">
+		<pathelement location="${build.classes}"/>
+		<fileset dir="${cocoon.lib}">
+			<include name="*.jar"/>
+		</fileset>
+		<fileset dir="${lib}">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
+
+	<!-- Main targets -->
+
+	<target name="explain">
+		<echo>See README.TXT for how to setup and use this module</echo>
+	</target>
+
+	<target name="init">
+		<mkdir dir="${build.classes}"/>
+	</target>
+
+	<target name="compile" depends="init,-cocoon:check">
+		<javac srcdir="${src.java}" destdir="${build.classes}" debug="true">
+			<classpath refid="all.cp"/>
+			<include name="**/*.java"/>
+		</javac>
+	</target>
+
+	<!-- Compile and configure -->
+	<target name="copy-configs" depends="init" description="copy required configuration files for the webapp">
+
+    <!-- log4j: delete first to make sure it is updated if the log4j.user.properties name has changed -->
+    <property name="log4j.cocoon.config" value="${cocoon.classes}/log4j.properties"/>
+    <delete file="${log4j.cocoon.config}"/>
+    <copy file="${log4j.user.properties}" tofile="${log4j.cocoon.config}" />
+
+    <!-- copy hivemodule.xml -->
+		<copy todir="${build.meta-inf}">
+			<fileset dir="${src.misc}/hivemind/">
+				<include name="**"/>
+			</fileset>
+		</copy>
+
+    <!-- copy OJB properties and XML files -->
+		<copy todir="${build.classes}">
+			<fileset dir="${src.misc}/ojb">
+				<include name="*.*"/>
+			</fileset>
+		</copy>
+
+	</target>
+
+	<target name="webapp" depends="compile, cocoon:xconf, copy-configs, derby:setup" description="build and configure the webapp">
+		<copy todir="${cocoon.lib}" flatten="true">
+			<fileset dir="${lib}">
+				<include name="**/*.jar"/>
+			</fileset>
+		</copy>
+		<copy todir="${cocoon.classes}">
+			<fileset dir="${build.classes}"/>
+		</copy>
+		<copy todir="${cocoon.webapp}">
+			<fileset dir="${src.webapp}"/>
+		</copy>
+
+		<!-- make sure to overwrite the welcome.xml generated by cocoon:get -->
+		<copy todir="${cocoon.webapp}" overwrite="true">
+			<fileset dir="${src.webapp}">
+				<include name="welcome.xml"/>
+			</fileset>
+		</copy>
+
+		<!-- Jetty uses WEB-INF/work as a work dir if it exists, clean it up -->
+		<delete dir="${jetty.workdir}"/>
+		<mkdir dir="${jetty.workdir}"/>
+	</target>
+
+	<target name="clean" depends="init" description="cleanup all generated files, including the cocoon:get build">
+		<echo>To delete the database, use "ant derby:clean" - it is not deleted by this build target</echo>
+		<delete dir="${build}"/>
+	</target>
+
+  <target name="clean-classes" depends="init" description="cleanup our classes only, not the cocoon:get build">
+    <echo>To delete the database, use the derby:clean target</echo>
+    <delete dir="${build.classes}"/>
+  </target>
+
+	<target name="run-message">
+		<echo>WARNING: the database must be initialized by doing "ant derby:clean derby:create", this is not automated for now</echo>
+	</target>
+
+	<target name="run" depends="webapp,run-message,cocoon:run" description="build and start with built-in Jetty"/>
+
+	<target name="war" depends="webapp" description="create a war file for deployment">
+		<jar destfile="${warfile}" basedir="${cocoon.webapp}"/>
+	</target>
 
 </project>

Propchange: cocoon/whiteboard/example-apps/bricks-cms/build.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-LICENSE.txt
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-LICENSE.txt?rev=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-LICENSE.txt (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-LICENSE.txt Wed Sep 28 01:08:23 2005
@@ -0,0 +1,2 @@
+The jakarta commons project (http://jakarta.apache.org/commons/) is an Apache Software
+Foundation project and  as such uses the ASL license, see http://www.apache.org/licenses/

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-dbcp-1.2.1.jar
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-dbcp-1.2.1.jar?rev=292140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-dbcp-1.2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-pool-1.2.jar
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-pool-1.2.jar?rev=292140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/commons/commons-pool-1.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby-LICENSE.txt
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby-LICENSE.txt?rev=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby-LICENSE.txt (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby-LICENSE.txt Wed Sep 28 01:08:23 2005
@@ -0,0 +1,2 @@
+The derby project is an Apache Software Foundation project and as such uses the ASL license,
+see http://www.apache.org/licenses/

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby-LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby.jar
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby.jar?rev=292140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derby.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derbytools.jar
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derbytools.jar?rev=292140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/derby/derby-10.1.1.0/derbytools.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-1.1-rc-1.jar
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-1.1-rc-1.jar?rev=292140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-1.1-rc-1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-LICENSE.txt
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-LICENSE.txt?rev=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-LICENSE.txt (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-LICENSE.txt Wed Sep 28 01:08:23 2005
@@ -0,0 +1,2 @@
+The hivemind project is an Apache Software Foundation project and as such uses the ASL license,
+see http://www.apache.org/licenses/

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-lib-1.1-rc-1.jar
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-lib-1.1-rc-1.jar?rev=292140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/hivemind-1.1-rc-1/hivemind-lib-1.1-rc-1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/javassist-3.0.jar
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/javassist-3.0.jar?rev=292140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/javassist-3.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/javassist-LICENSE.html
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/javassist-LICENSE.html?rev=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/javassist-LICENSE.html (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/lib/hivemind/javassist-3.0/javassist-LICENSE.html Wed Sep 28 01:08:23 2005
@@ -0,0 +1,372 @@
+<HTML>
+<HEAD>
+<TITLE>Javassist License</TITLE>
+<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<META content="MSHTML 5.50.4916.2300" name=GENERATOR></HEAD>
+
+<BODY text=#000000 vLink=#551a8b aLink=#ff0000 link=#0000ee bgColor=#ffffff>
+<CENTER><B><FONT size=+2>MOZILLA PUBLIC LICENSE</FONT></B> <BR><B>Version 
+1.1</B> 
+<P>
+<HR width="20%">
+</CENTER>
+<P><B>1. Definitions.</B> 
+<UL><B>1.0.1. "Commercial Use" </B>means distribution or otherwise making the 
+  Covered Code available to a third party. 
+  <P><B>1.1. ''Contributor''</B> means each entity that creates or contributes 
+  to the creation of Modifications. 
+  <P><B>1.2. ''Contributor Version''</B> means the combination of the Original 
+  Code, prior Modifications used by a Contributor, and the Modifications made by 
+  that particular Contributor. 
+  <P><B>1.3. ''Covered Code''</B> means the Original Code or Modifications or 
+  the combination of the Original Code and Modifications, in each case including 
+  portions thereof<B>.</B> 
+  <P><B>1.4. ''Electronic Distribution Mechanism''</B> means a mechanism 
+  generally accepted in the software development community for the electronic 
+  transfer of data. 
+  <P><B>1.5. ''Executable''</B> means Covered Code in any form other than Source 
+  Code. 
+  <P><B>1.6. ''Initial Developer''</B> means the individual or entity identified 
+  as the Initial Developer in the Source Code notice required by <B>Exhibit 
+  A</B>. 
+  <P><B>1.7. ''Larger Work''</B> means a work which combines Covered Code or 
+  portions thereof with code not governed by the terms of this License. 
+  <P><B>1.8. ''License''</B> means this document. 
+  <P><B>1.8.1. "Licensable"</B> means having the right to grant, to the maximum 
+  extent possible, whether at the time of the initial grant or subsequently 
+  acquired, any and all of the rights conveyed herein. 
+  <P><B>1.9. ''Modifications''</B> means any addition to or deletion from the 
+  substance or structure of either the Original Code or any previous 
+  Modifications. When Covered Code is released as a series of files, a 
+  Modification is: 
+  <UL><B>A.</B> Any addition to or deletion from the contents of a file 
+    containing Original Code or previous Modifications. 
+    <P><B>B.</B> Any new file that contains any part of the Original Code or 
+    previous Modifications. <BR>&nbsp;</P></UL><B>1.10. ''Original Code''</B> 
+  means Source Code of computer software code which is described in the Source 
+  Code notice required by <B>Exhibit A</B> as Original Code, and which, at the 
+  time of its release under this License is not already Covered Code governed by 
+  this License. 
+  <P><B>1.10.1. "Patent Claims"</B> means any patent claim(s), now owned or 
+  hereafter acquired, including without limitation,&nbsp; method, process, and 
+  apparatus claims, in any patent Licensable by grantor. 
+  <P><B>1.11. ''Source Code''</B> means the preferred form of the Covered Code 
+  for making modifications to it, including all modules it contains, plus any 
+  associated interface definition files, scripts used to control compilation and 
+  installation of an Executable, or source code differential comparisons against 
+  either the Original Code or another well known, available Covered Code of the 
+  Contributor's choice. The Source Code can be in a compressed or archival form, 
+  provided the appropriate decompression or de-archiving software is widely 
+  available for no charge. 
+  <P><B>1.12. "You'' (or "Your")&nbsp;</B> means an individual or a legal entity 
+  exercising rights under, and complying with all of the terms of, this License 
+  or a future version of this License issued under Section 6.1. For legal 
+  entities, "You'' includes any entity which controls, is controlled by, or is 
+  under common control with You. For purposes of this definition, "control'' 
+  means (a) the power, direct or indirect, to cause the direction or management 
+  of such entity, whether by contract or otherwise, or (b) ownership of more 
+  than fifty percent (50%) of the outstanding shares or beneficial ownership of 
+  such entity.</P></UL><B>2. Source Code License.</B> 
+<UL><B>2.1. The Initial Developer Grant.</B> <BR>The Initial Developer hereby 
+  grants You a world-wide, royalty-free, non-exclusive license, subject to third 
+  party intellectual property claims: 
+  <UL><B>(a)</B>&nbsp;<B> </B>under intellectual property rights (other than 
+    patent or trademark) Licensable by Initial Developer to use, reproduce, 
+    modify, display, perform, sublicense and distribute the Original Code (or 
+    portions thereof) with or without Modifications, and/or as part of a Larger 
+    Work; and 
+    <P><B>(b)</B> under Patents Claims infringed by the making, using or selling 
+    of Original Code, to make, have made, use, practice, sell, and offer for 
+    sale, and/or otherwise dispose of the Original Code (or portions thereof). 
+    <UL>
+      <UL></UL></UL><B>(c) </B>the licenses granted in this Section 2.1(a) and (b) 
+    are effective on the date Initial Developer first distributes Original Code 
+    under the terms of this License. 
+    <P><B>(d) </B>Notwithstanding Section 2.1(b) above, no patent license is 
+    granted: 1) for code that You delete from the Original Code; 2) separate 
+    from the Original Code;&nbsp; or 3) for infringements caused by: i) the 
+    modification of the Original Code or ii) the combination of the Original 
+    Code with other software or devices. <BR>&nbsp;</P></UL><B>2.2. Contributor 
+  Grant.</B> <BR>Subject to third party intellectual property claims, each 
+  Contributor hereby grants You a world-wide, royalty-free, non-exclusive 
+  license 
+  <UL> <BR><B>(a)</B>&nbsp;<B> </B>under intellectual property rights (other 
+    than patent or trademark) Licensable by Contributor, to use, reproduce, 
+    modify, display, perform, sublicense and distribute the Modifications 
+    created by such Contributor (or portions thereof) either on an unmodified 
+    basis, with other Modifications, as Covered Code and/or as part of a Larger 
+    Work; and 
+    <P><B>(b)</B> under Patent Claims infringed by the making, using, or selling 
+    of&nbsp; Modifications made by that Contributor either alone and/or in<FONT 
+    color=#000000> combination with its Contributor Version (or portions of such 
+    combination), to make, use, sell, offer for sale, have made, and/or 
+    otherwise dispose of: 1) Modifications made by that Contributor (or portions 
+    thereof); and 2) the combination of&nbsp; Modifications made by that 
+    Contributor with its Contributor Version (or portions of such 
+    combination).</FONT> 
+    <P><B>(c) </B>the licenses granted in Sections 2.2(a) and 2.2(b) are 
+    effective on the date Contributor first makes Commercial Use of the Covered 
+    Code. 
+    <P><B>(d)&nbsp;</B>&nbsp;&nbsp; Notwithstanding Section 2.2(b) above, no 
+    patent license is granted: 1) for any code that Contributor has deleted from 
+    the Contributor Version; 2)&nbsp; separate from the Contributor 
+    Version;&nbsp; 3)&nbsp; for infringements caused by: i) third party 
+    modifications of Contributor Version or ii)&nbsp; the combination of 
+    Modifications made by that Contributor with other software&nbsp; (except as 
+    part of the Contributor Version) or other devices; or 4) under Patent Claims 
+    infringed by Covered Code in the absence of Modifications made by that 
+    Contributor.</P></UL></UL>
+<P><BR><B>3. Distribution Obligations.</B> 
+<UL><B>3.1. Application of License.</B> <BR>The Modifications which You create 
+  or to which You contribute are governed by the terms of this License, 
+  including without limitation Section <B>2.2</B>. The Source Code version of 
+  Covered Code may be distributed only under the terms of this License or a 
+  future version of this License released under Section <B>6.1</B>, and You must 
+  include a copy of this License with every copy of the Source Code You 
+  distribute. You may not offer or impose any terms on any Source Code version 
+  that alters or restricts the applicable version of this License or the 
+  recipients' rights hereunder. However, You may include an additional document 
+  offering the additional rights described in Section <B>3.5</B>. 
+  <P><B>3.2. Availability of Source Code.</B> <BR>Any Modification which You 
+  create or to which You contribute must be made available in Source Code form 
+  under the terms of this License either on the same media as an Executable 
+  version or via an accepted Electronic Distribution Mechanism to anyone to whom 
+  you made an Executable version available; and if made available via Electronic 
+  Distribution Mechanism, must remain available for at least twelve (12) months 
+  after the date it initially became available, or at least six (6) months after 
+  a subsequent version of that particular Modification has been made available 
+  to such recipients. You are responsible for ensuring that the Source Code 
+  version remains available even if the Electronic Distribution Mechanism is 
+  maintained by a third party. 
+  <P><B>3.3. Description of Modifications.</B> <BR>You must cause all Covered 
+  Code to which You contribute to contain a file documenting the changes You 
+  made to create that Covered Code and the date of any change. You must include 
+  a prominent statement that the Modification is derived, directly or 
+  indirectly, from Original Code provided by the Initial Developer and including 
+  the name of the Initial Developer in (a) the Source Code, and (b) in any 
+  notice in an Executable version or related documentation in which You describe 
+  the origin or ownership of the Covered Code. 
+  <P><B>3.4. Intellectual Property Matters</B> 
+  <UL><B>(a) Third Party Claims</B>. <BR>If Contributor has knowledge that a 
+    license under a third party's intellectual property rights is required to 
+    exercise the rights granted by such Contributor under Sections 2.1 or 2.2, 
+    Contributor must include a text file with the Source Code distribution 
+    titled "LEGAL'' which describes the claim and the party making the claim in 
+    sufficient detail that a recipient will know whom to contact. If Contributor 
+    obtains such knowledge after the Modification is made available as described 
+    in Section 3.2, Contributor shall promptly modify the LEGAL file in all 
+    copies Contributor makes available thereafter and shall take other steps 
+    (such as notifying appropriate mailing lists or newsgroups) reasonably 
+    calculated to inform those who received the Covered Code that new knowledge 
+    has been obtained. 
+    <P><B>(b) Contributor APIs</B>. <BR>If Contributor's Modifications include 
+    an application programming interface and Contributor has knowledge of patent 
+    licenses which are reasonably necessary to implement that API, Contributor 
+    must also include this information in the LEGAL file. 
+  <BR>&nbsp;</P></UL>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
+  <B>(c)&nbsp;&nbsp;&nbsp; Representations.</B> 
+  <UL>Contributor represents that, except as disclosed pursuant to Section 
+    3.4(a) above, Contributor believes that Contributor's Modifications are 
+    Contributor's original creation(s) and/or Contributor has sufficient rights 
+    to grant the rights conveyed by this License.</UL>
+  <P><BR><B>3.5. Required Notices.</B> <BR>You must duplicate the notice in 
+  <B>Exhibit A</B> in each file of the Source Code.&nbsp; If it is not possible 
+  to put such notice in a particular Source Code file due to its structure, then 
+  You must include such notice in a location (such as a relevant directory) 
+  where a user would be likely to look for such a notice.&nbsp; If You created 
+  one or more Modification(s) You may add your name as a Contributor to the 
+  notice described in <B>Exhibit A</B>.&nbsp; You must also duplicate this 
+  License in any documentation for the Source Code where You describe 
+  recipients' rights or ownership rights relating to Covered Code.&nbsp; You may 
+  choose to offer, and to charge a fee for, warranty, support, indemnity or 
+  liability obligations to one or more recipients of Covered Code. However, You 
+  may do so only on Your own behalf, and not on behalf of the Initial Developer 
+  or any Contributor. You must make it absolutely clear than any such warranty, 
+  support, indemnity or liability obligation is offered by You alone, and You 
+  hereby agree to indemnify the Initial Developer and every Contributor for any 
+  liability incurred by the Initial Developer or such Contributor as a result of 
+  warranty, support, indemnity or liability terms You offer. 
+  <P><B>3.6. Distribution of Executable Versions.</B> <BR>You may distribute 
+  Covered Code in Executable form only if the requirements of Section 
+  <B>3.1-3.5</B> have been met for that Covered Code, and if You include a 
+  notice stating that the Source Code version of the Covered Code is available 
+  under the terms of this License, including a description of how and where You 
+  have fulfilled the obligations of Section <B>3.2</B>. The notice must be 
+  conspicuously included in any notice in an Executable version, related 
+  documentation or collateral in which You describe recipients' rights relating 
+  to the Covered Code. You may distribute the Executable version of Covered Code 
+  or ownership rights under a license of Your choice, which may contain terms 
+  different from this License, provided that You are in compliance with the 
+  terms of this License and that the license for the Executable version does not 
+  attempt to limit or alter the recipient's rights in the Source Code version 
+  from the rights set forth in this License. If You distribute the Executable 
+  version under a different license You must make it absolutely clear that any 
+  terms which differ from this License are offered by You alone, not by the 
+  Initial Developer or any Contributor. You hereby agree to indemnify the 
+  Initial Developer and every Contributor for any liability incurred by the 
+  Initial Developer or such Contributor as a result of any such terms You offer. 
+
+  <P><B>3.7. Larger Works.</B> <BR>You may create a Larger Work by combining 
+  Covered Code with other code not governed by the terms of this License and 
+  distribute the Larger Work as a single product. In such a case, You must make 
+  sure the requirements of this License are fulfilled for the Covered 
+Code.</P></UL><B>4. Inability to Comply Due to Statute or Regulation.</B> 
+<UL>If it is impossible for You to comply with any of the terms of this 
+  License with respect to some or all of the Covered Code due to statute, 
+  judicial order, or regulation then You must: (a) comply with the terms of this 
+  License to the maximum extent possible; and (b) describe the limitations and 
+  the code they affect. Such description must be included in the LEGAL file 
+  described in Section <B>3.4</B> and must be included with all distributions of 
+  the Source Code. Except to the extent prohibited by statute or regulation, 
+  such description must be sufficiently detailed for a recipient of ordinary 
+  skill to be able to understand it.</UL><B>5. Application of this License.</B> 
+<UL>This License applies to code to which the Initial Developer has attached 
+  the notice in <B>Exhibit A</B> and to related Covered Code.</UL><B>6. Versions 
+of the License.</B> 
+<UL><B>6.1. New Versions</B>. <BR>Netscape Communications Corporation 
+  (''Netscape'') may publish revised and/or new versions of the License from 
+  time to time. Each version will be given a distinguishing version number. 
+  <P><B>6.2. Effect of New Versions</B>. <BR>Once Covered Code has been 
+  published under a particular version of the License, You may always continue 
+  to use it under the terms of that version. You may also choose to use such 
+  Covered Code under the terms of any subsequent version of the License 
+  published by Netscape. No one other than Netscape has the right to modify the 
+  terms applicable to Covered Code created under this License. 
+  <P><B>6.3. Derivative Works</B>. <BR>If You create or use a modified version 
+  of this License (which you may only do in order to apply it to code which is 
+  not already Covered Code governed by this License), You must (a) rename Your 
+  license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', 
+  ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear 
+  in your license (except to note that your license differs from this License) 
+  and (b) otherwise make it clear that Your version of the license contains 
+  terms which differ from the Mozilla Public License and Netscape Public 
+  License. (Filling in the name of the Initial Developer, Original Code or 
+  Contributor in the notice described in <B>Exhibit A</B> shall not of 
+  themselves be deemed to be modifications of this License.)</P></UL><B>7. 
+DISCLAIMER OF WARRANTY.</B> 
+<UL>COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT 
+  WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT 
+  LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, 
+  FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE 
+  QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED 
+  CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY 
+  OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR 
+  CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS 
+  LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS 
+  DISCLAIMER.</UL><B>8. TERMINATION.</B> 
+<UL><B>8.1.&nbsp; </B>This License and the rights granted hereunder will 
+  terminate automatically if You fail to comply with terms herein and fail to 
+  cure such breach within 30 days of becoming aware of the breach. All 
+  sublicenses to the Covered Code which are properly granted shall survive any 
+  termination of this License. Provisions which, by their nature, must remain in 
+  effect beyond the termination of this License shall survive. 
+  <P><B>8.2.&nbsp; </B>If You initiate litigation by asserting a patent 
+  infringement claim (excluding declatory judgment actions) against Initial 
+  Developer or a Contributor (the Initial Developer or Contributor against whom 
+  You file such action is referred to as "Participant")&nbsp; alleging that: 
+  <P><B>(a)&nbsp; </B>such Participant's Contributor Version directly or 
+  indirectly infringes any patent, then any and all rights granted by such 
+  Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 
+  60 days notice from Participant terminate prospectively, unless if within 60 
+  days after receipt of notice You either: (i)&nbsp; agree in writing to pay 
+  Participant a mutually agreeable reasonable royalty for Your past and future 
+  use of Modifications made by such Participant, or (ii) withdraw Your 
+  litigation claim with respect to the Contributor Version against such 
+  Participant.&nbsp; If within 60 days of notice, a reasonable royalty and 
+  payment arrangement are not mutually agreed upon in writing by the parties or 
+  the litigation claim is not withdrawn, the rights granted by Participant to 
+  You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of 
+  the 60 day notice period specified above. 
+  <P><B>(b)</B>&nbsp; any software, hardware, or device, other than such 
+  Participant's Contributor Version, directly or indirectly infringes any 
+  patent, then any rights granted to You by such Participant under Sections 
+  2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, 
+  sold, distributed, or had made, Modifications made by that Participant. 
+  <P><B>8.3.&nbsp; </B>If You assert a patent infringement claim against 
+  Participant alleging that such Participant's Contributor Version directly or 
+  indirectly infringes any patent where such claim is resolved (such as by 
+  license or settlement) prior to the initiation of patent infringement 
+  litigation, then the reasonable value of the licenses granted by such 
+  Participant under Sections 2.1 or 2.2 shall be taken into account in 
+  determining the amount or value of any payment or license. 
+  <P><B>8.4.</B>&nbsp; In the event of termination under Sections 8.1 or 8.2 
+  above,&nbsp; all end user license agreements (excluding distributors and 
+  resellers) which have been validly granted by You or any distributor hereunder 
+  prior to termination shall survive termination.</P></UL><B>9. LIMITATION OF 
+LIABILITY.</B> 
+<UL>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING 
+  NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY 
+  OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY 
+  OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, 
+  INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT 
+  LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR 
+  MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH 
+  PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS 
+  LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL 
+  INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW 
+  PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR 
+  LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND 
+  LIMITATION MAY NOT APPLY TO YOU.</UL><B>10. U.S. GOVERNMENT END USERS.</B> 
+<UL>The Covered Code is a ''commercial item,'' as that term is defined in 48 
+  C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and 
+  ''commercial computer software documentation,'' as such terms are used in 48 
+  C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 
+  227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users 
+  acquire Covered Code with only those rights set forth herein.</UL><B>11. 
+MISCELLANEOUS.</B> 
+<UL>This License represents the complete agreement concerning subject matter 
+  hereof. If any provision of this License is held to be unenforceable, such 
+  provision shall be reformed only to the extent necessary to make it 
+  enforceable. This License shall be governed by California law provisions 
+  (except to the extent applicable law, if any, provides otherwise), excluding 
+  its conflict-of-law provisions. With respect to disputes in which at least one 
+  party is a citizen of, or an entity chartered or registered to do business in 
+  the United States of America, any litigation relating to this License shall be 
+  subject to the jurisdiction of the Federal Courts of the Northern District of 
+  California, with venue lying in Santa Clara County, California, with the 
+  losing party responsible for costs, including without limitation, court costs 
+  and reasonable attorneys' fees and expenses. The application of the United 
+  Nations Convention on Contracts for the International Sale of Goods is 
+  expressly excluded. Any law or regulation which provides that the language of 
+  a contract shall be construed against the drafter shall not apply to this 
+  License.</UL><B>12. RESPONSIBILITY FOR CLAIMS.</B> 
+<UL>As between Initial Developer and the Contributors, each party is 
+  responsible for claims and damages arising, directly or indirectly, out of its 
+  utilization of rights under this License and You agree to work with Initial 
+  Developer and Contributors to distribute such responsibility on an equitable 
+  basis. Nothing herein is intended or shall be deemed to constitute any 
+  admission of liability.</UL><B>13. MULTIPLE-LICENSED CODE.</B> 
+<UL>Initial Developer may designate portions of the Covered Code as 
+  “Multiple-Licensed”.&nbsp; “Multiple-Licensed” means that the Initial 
+  Developer permits you to utilize portions of the Covered Code under Your 
+  choice of the MPL or the alternative licenses, if any, specified by the 
+  Initial Developer in the file described in Exhibit A.</UL>
+<P><BR><B>EXHIBIT A -Mozilla Public License.</B> 
+<UL>The contents of this file are subject to the Mozilla Public License 
+  Version 1.1 (the "License"); you may not use this file except in compliance 
+  with the License. You may obtain a copy of the License at 
+  <BR>http://www.mozilla.org/MPL/ 
+  <P>Software distributed under the License is distributed on an "AS IS" basis, 
+  WITHOUT WARRANTY OF <BR>ANY KIND, either express or implied. See the License 
+  for the specific language governing rights and <BR>limitations under the 
+  License. 
+  <P>The Original Code is Javassist. 
+  <P>The Initial Developer of the Original Code is Shigeru Chiba. 
+  Portions created by the Initial Developer are<BR>&nbsp;
+  Copyright (C) 1999-2005 Shigeru Chiba. All Rights Reserved. 
+  <P>Contributor(s): ______________________________________. 
+
+  <P>Alternatively, the contents of this file may be used under the terms of
+  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+  in which case the provisions of the LGPL are applicable instead
+  of those above. If you wish to allow use of your version of this file only
+  under the terms of the LGPL, and not to allow others to
+  use your version of this file under the terms of the MPL, indicate your
+  decision by deleting the provisions above and replace them with the notice
+  and other provisions required by the LGPL. If you do not delete
+  the provisions above, a recipient may use your version of this file under
+  the terms of either the MPL or the LGPL.
+
+  <P></P></UL>
+</BODY>
+</HTML>

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-1.0.3.jar
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-1.0.3.jar?rev=292140&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-1.0.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-LICENSE.txt
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-LICENSE.txt?rev=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-LICENSE.txt (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-LICENSE.txt Wed Sep 28 01:08:23 2005
@@ -0,0 +1,2 @@
+The OJB project (http://db.apache.org/ojb/) is an Apache Software Foundation project and 
+as such uses the ASL license, see http://www.apache.org/licenses/

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/ojb/db-ojb-1.0.3/db-ojb-LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/whiteboard/example-apps/bricks-cms/lib/servlet/servlet-LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Id

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=292140&r1=292139&r2=292140&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 Wed Sep 28 01:08:23 2005
@@ -28,7 +28,7 @@
 
   See the top-level README.TXT for how to use this.
 
-  $Id: build-cocoon-targets.xml,v 1.1.1.1 2005/07/25 13:30:57 bdelacretaz Exp $
+  $Id$
 -->
 
 <project name="cocoon-main-targets" default="seed">
@@ -241,7 +241,7 @@
     <exec executable="${cocoon.tool.dir}/runc2.${shbat}">
       <!-- Added project.webapp.dir system property for JUnit tests; the path ${cocoon.webapp}
 must be full expanded, with absolute path (define it with the ${basedir} Ant property) -->
-      <env key="JAVA_OPTIONS" value="${jvm.options} -Dproject.webapp.dir=${cocoon.webapp}"/>
+      <env key="JAVA_OPTIONS" value="${jvm.options} -Dproject.webapp.dir=${cocoon.webapp} ${derby.jvm.options}"/>
       <env key="JAVA_DEBUG_ARGS" value="${jvm.debug.options}"/>
       <env key="COCOON_HOME" file="${cocoon.distro.home}"/>
       <env key="PROJECT_WEBAPP" file="${cocoon.webapp}"/>

Propchange: cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/build-cocoon-targets.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: 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=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/derby-build-targets.xml (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/derby-build-targets.xml Wed Sep 28 01:08:23 2005
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Copyright 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.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+  Derby build targets, start some derby tools used for debugging and setup
+  $Id$
+-->
+
+<project name="derby-utilities" default="derby:sysinfo">
+
+	<!-- 
+    This build file is meant to be included in the main build.xml, where common
+  	things  like classpaths are defined.
+  -->
+
+  <!-- set derby options, used by the cocoon:run target -->
+  <property name="derby.jvm.options" value="-Dderby.system.home=${basedir}/${derby.home}"/>
+
+  <!-- copy required files to the derby home directory -->
+	<target name="derby:setup">
+		<copy todir="${derby.home}">
+			<fileset dir="${src.misc}/derby">
+				<include name="**"/>
+			</fileset>
+		</copy>
+	</target>
+	
+	<target name="derby:clean" description="Cleanup the derby database directory (DELETES the database)">
+    <input
+      validargs="delete"
+      message="Enter 'delete' to DELETE the derby database in ${derby.home}:"
+    />
+    <echo>Deleting directory ${derby.home}...</echo>
+    <delete dir="${derby.home}"/>
+	</target>
+	
+	<!-- run the derby sysinfo utility -->
+	<target name="derby:sysinfo" depends="webapp" description="run the Derby sysinfo utility">
+		<java fork="yes" classname="org.apache.derby.tools.sysinfo">
+			<classpath refid="all.cp" />
+			<jvmarg value="-Dderby.system.home=${derby.home}"/>
+		</java>
+	</target>
+
+	<!-- run the derby ij utility interactively -->
+	<target name="derby:ij" depends="webapp" description="run the Derby ij interactive database tool">
+		<echo>The derby ij documentation is available at http://db.apache.org/derby/manuals/</echo>
+		<echo>WARNING: you won't see the ij prompt when running this from ant, but ij can still be used in this way.</echo>
+		<echo>To connect to the bricks-cms database, use: connect 'jdbc:derby:${derby.database};create=true';</echo>
+		<java fork="yes" classname="org.apache.derby.tools.ij">
+			<classpath refid="all.cp" />
+			<jvmarg value="-Dderby.system.home=${derby.home}"/>
+		</java>
+	</target>
+
+	<target name="derby:create" depends="webapp" description="create the Derby database">
+		<echo>Calling the derby ij utility to create our database '${derby.database}' in ${derby.home}...</echo>
+		<java fork="yes" classname="org.apache.derby.tools.ij">
+			<classpath refid="all.cp" />
+			<jvmarg value="-Dderby.system.home=${derby.home}"/>
+			<jvmarg value="-Dij.protocol=jdbc:derby:"/>
+			<jvmarg value="-Dij.database=${derby.database};create=true"/>
+			<arg value="${derby.home}/derby-db-schema.txt"/>
+		</java>
+		<echo>Done running derby ij.</echo>
+		<echo>If the above output does not show error messages from derby, database should have been created.</echo>
+	</target>
+
+</project>
+

Propchange: cocoon/whiteboard/example-apps/bricks-cms/src/build-targets/derby-build-targets.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/cocoon.build.properties
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/cocoon.build.properties?rev=292140&r1=292139&r2=292140&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/cocoon.build.properties (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/cocoon.build.properties Wed Sep 28 01:08:23 2005
@@ -1,4 +1,18 @@
-#------------------------------------------------------------------------------
+##------------------------------------------------------------------------------
+#  Copyright 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.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+##------------------------------------------------------------------------------
 # Set Cocoon build options.
 #
 # Contains a combination of settings corresponding to the Cocoon
@@ -11,11 +25,7 @@
 #   http://wiki.cocoondev.org/Wiki.jsp?page=YourCocoonBasedProjectAnt16
 # for more info.
 #------------------------------------------------------------------------------
-# $Id: cocoon.build.properties,v 1.4 2005/09/20 13:48:51 bdelacretaz Exp $
-#------------------------------------------------------------------------------
-
-#------------------------------------------------------------------------------
-#  Cocoon Build Options
+# $Id$
 #------------------------------------------------------------------------------
 
 # ---- Webapp ------------------------------------------------------------------

Propchange: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/cocoon.build.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/log4-config.properties
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/log4-config.properties?rev=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/log4-config.properties (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/log4-config.properties Wed Sep 28 01:08:23 2005
@@ -0,0 +1,57 @@
+##------------------------------------------------------------------------------
+#  Copyright 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.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# --------------------------------------------------------------------------
+# log4J Logging configuration properties for bricks-cms
+# --------------------------------------------------------------------------
+# For test environments, the path to this file can be overridden
+# in (local.)user.properties
+# --------------------------------------------------------------------------
+# $Id$
+# --------------------------------------------------------------------------
+
+# activate this to see when the log4j config is reloaded
+log4j.debug = false
+
+# this sets a global minimal logging threshold, default=ALL
+log4j.threshold=ALL
+
+# default logging level
+log4j.rootCategory=WARN,console,file
+
+# logging patterns
+pattern.standard = %d{yyyy-MM-dd HH:mm:ss,SSS} [%-15.15t] %-5p %-60.60c %x - %m\n
+pattern.short = %d{HH:mm:ss,SSS}  [%-15.15t] %-5p %-40.40c{3} %x - %m\n
+pattern.essentials = %-6p %-80c %x - %m\n
+
+# console logging
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.conversionPattern=${pattern.essentials}
+
+# file logging - rollover each day, keep one month
+log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.conversionPattern = ${pattern.standard}
+log4j.appender.file.File = build/bricks-cms.log
+log4j.appender.file.DatePattern = '.'dd
+
+# activate this to debug the hivemind configurations
+# log4j.category.org.apache.hivemind=DEBUG
+
+# activate this to debug OJB configurations or usage
+# log4j.category.org.apache.ojb = DEBUG
+
+# this is the root category of our hivemind-managed objects
+log4j.category.brickscms = DEBUG
\ No newline at end of file

Propchange: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/config/log4-config.properties
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml?rev=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml Wed Sep 28 01:08:23 2005
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Copyright 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.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+  homepage of the document editor
+  $Id$
+-->
+
+<page>
+  <metadata>
+    <title>bricks-cms document-editor homepage</title>
+  </metadata>
+
+  <content>
+    <p>
+      To create a document use
+      the <a href="create">create</a> link.
+    </p>
+    <p>
+      To edit an existing document use
+      the <a href="edit/1">edit/1</a>, where 1 is
+      the document ID.
+    </p>
+    <p>
+      To view an existing document use
+      the <a href="view/1">view/1</a>, where 1 is
+      the document ID.
+    </p>
+    <p>
+      In real life we'd add a search page to select the
+      document to edit...maybe later;-)
+    </p>
+  </content>
+</page>
\ No newline at end of file

Propchange: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/document-editor.js
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/document-editor.js?rev=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/document-editor.js (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/document-editor.js Wed Sep 28 01:08:23 2005
@@ -0,0 +1,92 @@
+/*
+    Copyright 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.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+// document editor flowscript
+
+cocoon.load("context://bricks-cms/common/component-manager.js");
+cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+
+var DOC_CLASS = Packages.org.apache.cocoon.apps.bricks.cms.data.BricksDocument;
+
+// called by the handleForm to run the document editor form
+function form_editDocument(form) {
+
+    var docId = cocoon.parameters.docId;
+    var formDisplayPipeline = cocoon.parameters.formDisplayURI;
+    var nextURI = cocoon.parameters.nextURI;
+    var objectStore = get_objectStore();
+    var document = null;
+    var createDocument = (docId=="NEW_DOCUMENT");
+
+    if(createDocument) {
+        // create new document
+        document = objectStore.createNew(DOC_CLASS);
+        document.title = "(new document)";
+        document.content = "(no content yet)";
+
+    } else {
+        // retrieve document for editing, fail it not found
+        var forEditing = true;
+        document = getDocument(objectStore,docId,forEditing);
+    }
+
+    if(document == null) {
+        throw new java.lang.Exception("BricksDocument having id '" + docId + "' not found");
+    }
+
+    // create form
+    form.createBinding("forms/document-binding.xml");
+    form.load(document);
+
+    // edit form and save data to document object
+    form.showForm(formDisplayPipeline);
+    form.save(document);
+
+    // save document to database
+    objectStore.store(document);
+
+    // if creating, add ID of new document at the end of the URI
+    if(createDocument) {
+        nextURI += document.id;
+    }
+
+    // display modified document, with an external redirect to show its URL
+    cocoon.redirectTo(nextURI,true);
+}
+
+// display document
+function viewDocument() {
+    var docId = cocoon.parameters.docId;
+    var displayURI = cocoon.parameters.displayURI;
+
+    var forEditing = false;
+    var document = getDocument(get_objectStore(),docId,false);
+
+    if(document == null) {
+        throw new java.lang.Exception("BricksDocument having id '" + docId + "' not found");
+    }
+
+    cocoon.sendPage(
+        displayURI,
+        { "document":document }
+    );
+}
+
+// retrieve document by ID
+function getDocument(objectStore,docId,forEditing) {
+    var key = objectStore.getTemplateObject(DOC_CLASS,docId);
+    return objectStore.queryByKey(key,forEditing);
+}
\ No newline at end of file

Propchange: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/document-editor.js
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-binding.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-binding.xml?rev=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-binding.xml (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-binding.xml Wed Sep 28 01:08:23 2005
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<!--
+  Copyright 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.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+  CForms binding used to edit a BricksDocument
+  $Id$
+-->
+
+<fb:context
+    id="form"
+    xmlns:fb="http://apache.org/cocoon/forms/1.0#binding"
+    xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
+    path="/">
+
+    <!-- map Form widgets to the corresponding fields in the java beans -->
+    <fb:value id="id" path="id" direction="load"/>
+    <fb:value id="title" path="title"/>
+    <fb:value id="content" path="content"/>
+    <fb:value id="created" path="created" direction="load"/>
+    <fb:value id="lastModified" path="lastModified" direction="load"/>
+ </fb:context>

Propchange: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-binding.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: 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=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-model.xml (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-model.xml Wed Sep 28 01:08:23 2005
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+
+<!--
+  Copyright 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.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+  CForms model used to edit a BricksDocument
+  $Id$
+-->
+
+<fd:form
+  id="form"
+  xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  >
+
+  <fd:widgets>
+
+    <fd:output id="id" readonly="true" required="true">
+      <fd:label>
+        <i18n:text>document-id-label</i18n:text>
+      </fd:label>
+      <fd:datatype base="integer"/>
+    </fd:output>
+
+    <fd:field id="title" required="true">
+      <fd:label>
+        <i18n:text>document-title-label</i18n:text>
+      </fd:label>
+      <fd:datatype base="string"/>
+    </fd:field>
+
+    <fd:field id="content" required="true">
+      <fd:label>
+        <i18n:text>document-content-label</i18n:text>
+      </fd:label>
+      <fd:datatype base="string"/>
+    </fd:field>
+
+    <fd:output id="created">
+      <fd:label>
+        <i18n:text>document-created-label</i18n:text>
+      </fd:label>
+      <fd:datatype base="date"/>
+    </fd:output>
+
+    <fd:output id="lastModified">
+      <fd:label>
+        <i18n:text>document-created-label</i18n:text>
+      </fd:label>
+      <fd:datatype base="date"/>
+    </fd:output>
+
+  </fd:widgets>
+
+</fd:form>

Propchange: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-model.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: 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=292140&view=auto
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml (added)
+++ cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml Wed Sep 28 01:08:23 2005
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!--
+  Copyright 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.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+  CForms template used to edit BricksDocument objects
+  $Id$
+-->
+
+<page
+  xmlns:ft="http://apache.org/cocoon/forms/1.0#template"
+  xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+  >
+
+  <jx:import uri="resource://org/apache/cocoon/forms/generation/jx-macros.xml"/>
+
+  <metadata>
+    <title>
+      <i18n:text>document-editor-form-title</i18n:text>
+    </title>
+    <menu>
+      <item>
+        <a href="../">cancel</a>
+      </item>
+    </menu>
+  </metadata>
+
+  <content>
+
+    <ft:form-template action="#{$continuation/id}.continue" method="POST">
+
+      <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>
+              :
+            </td>
+            <td>
+              <ft:widget id="id"/>
+            </td>
+          </tr>
+
+          <tr>
+            <td>
+              <i18n:text>document-title-label</i18n:text>
+              :
+            </td>
+            <td>
+              <ft:widget id="title">
+                <fi:styling size="40" style="width:100%;"/>
+              </ft:widget>
+            </td>
+          </tr>
+
+          <tr>
+            <td>
+              <i18n:text>document-content-label</i18n:text>
+              :
+            </td>
+            <td>
+              <ft:widget id="content">
+                <fi:styling type="textarea" rows="10" 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>
+
+        </table>
+      </div>
+    </ft:form-template>
+  </content>
+
+</page>

Propchange: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml
------------------------------------------------------------------------------
    svn:keywords = Id