Author: reinhard
Date: Mon Oct 4 06:14:40 2004
New Revision: 51894
Modified:
cocoon/whiteboard/block-deployer/mapping/block.xml-mapping.xml
cocoon/whiteboard/block-deployer/mapping/sample-wiring.xml
Log:
- work on XML mappings
Modified: cocoon/whiteboard/block-deployer/mapping/block.xml-mapping.xml
==============================================================================
--- cocoon/whiteboard/block-deployer/mapping/block.xml-mapping.xml
(original)
+++ cocoon/whiteboard/block-deployer/mapping/block.xml-mapping.xml Mon Oct
4 06:14:40 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE databases PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN"
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN"
"http://castor.exolab.org/mapping.dtd";>
<mapping>
- <class name="org.apache.cocoon.blockdeployer.block.RealBlockDescriptor">
+ <class
name="org.apache.cocoon.blockdeployer.block.descriptor.RealBlockDescriptor">
<map-to xml="block" ns-uri="http://apache.org/cocoon/blocks/cob/1.0"/>
<field name="name" type="string" >
<bind-xml name="name" node="element" />
@@ -10,11 +10,14 @@
<field name="blockId" type="string">
<bind-xml name="id" node="attribute"/>
</field>
- <field name="properties"
type="org.apache.cocoon.blockdeployer.block.BlockPropertyImpl"
collection="collection" >
+ <field name="properties"
type="org.apache.cocoon.blockdeployer.block.descriptor.BlockPropertyImpl"
collection="collection" >
<bind-xml name="property" node="element" location="properties"/>
- </field>
+ </field>
+ <field name="requirements"
type="org.apache.cocoon.blockdeployer.block.descriptor.RealBlockRequirement"
collection="collection" >
+ <bind-xml name="requires" node="element" location="requirements"/>
+ </field>
</class>
- <class name="org.apache.cocoon.blockdeployer.block.BlockPropertyImpl">
+ <class
name="org.apache.cocoon.blockdeployer.block.descriptor.BlockPropertyImpl">
<map-to ns-uri="http://apache.org/cocoon/blocks/cob/1.0"/>
<field name="name" type="string">
<bind-xml name="name" node="attribute"/>
@@ -24,6 +27,15 @@
</field>
<field name="defaultValue" type="string" >
<bind-xml name="default" node="element" />
+ </field>
+ </class>
+ <class
name="org.apache.cocoon.blockdeployer.block.descriptor.RealBlockRequirement">
+ <map-to ns-uri="http://apache.org/cocoon/blocks/cob/1.0"/>
+ <field name="name" type="string">
+ <bind-xml name="name" node="attribute"/>
+ </field>
+ <field name="blockId" type="string" >
+ <bind-xml name="block" node="element" />
</field>
</class>
</mapping>
Modified: cocoon/whiteboard/block-deployer/mapping/sample-wiring.xml
==============================================================================
--- cocoon/whiteboard/block-deployer/mapping/sample-wiring.xml (original)
+++ cocoon/whiteboard/block-deployer/mapping/sample-wiring.xml Mon Oct 4
06:14:40 2004
@@ -1,4 +1,5 @@
-<blocks xmlns="http://apache.org/cocoon/blocks/wiring/1.0";>
+<!-- in Stefan's example "blocks" instead of "wiring" is used -->
+<wiring xmlns="http://apache.org/cocoon/blocks/wiring/1.0";>
<block id="http://mycompany.com/webmail/1.3.43";
location="WEB-INF/blocks/384938958499">
@@ -20,7 +21,7 @@
<block id="http://mycompany.com/repositories/email/exchange/3.2.1";
location="WEB-INF/blocks/394781274834">
<properties>
- <property name="host">mail.blah.org</param>
+ <property name="host">mail.blah.org</property>
</properties>
</block>
@@ -30,4 +31,4 @@
<block id="http://mycompany.com/skins/corporate/34.3.345";
location="WEB-INF/blocks/746394782637"/>
-</blocks>
\ No newline at end of file
+</wiring>
\ No newline at end of file
