cziegeler 2003/07/28 23:52:15
Modified: src/blocks/portal/conf portal.xconf Added: src/blocks/portal/java/org/apache/cocoon/portal/layout layout.xml src/blocks/portal/java/org/apache/cocoon/portal/coplet copletinstancedata.xml copletbasedata.xml copletdata.xml Removed: src/blocks/portal/samples/profiles/mapping layout.xml copletdata.xml copletbasedata.xml copletinstancedata.xml Log: Moving bindings into jar Revision Changes Path 1.1 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/layout.xml Index: layout.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <mapping> <description>Portalprofile mapping file</description> <class name="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable"> <field name="persistentAspectData" type="org.apache.cocoon.portal.util.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler"> <bind-xml name="aspect"/> </field> </class> <class name="org.apache.cocoon.portal.factory.impl.AbstractProducible" extends="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable"> <field name="name" type="java.lang.String"> <bind-xml name="name" node="attribute" /> </field> <field name="id" type="java.lang.String" > <bind-xml name="id" node="attribute" /> </field> </class> <class name="org.apache.cocoon.portal.layout.AbstractParameters"> <field name="parameters" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.ParameterFieldHandler"> <bind-xml name="parameter" /> </field> </class> <class name="org.apache.cocoon.portal.layout.AbstractLayout" extends="org.apache.cocoon.portal.factory.impl.AbstractProducible"> <field name="layoutRendererName" type="java.lang.String"> <bind-xml name="layout-renderer-name" node="attribute" /> </field> <field name="parameters" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.ParameterFieldHandler"> <bind-xml name="parameter" /> </field> <field name="static" type="boolean"> <bind-xml name="static" node="attribute" /> </field> </class> <class name="org.apache.cocoon.portal.layout.impl.LinkLayout" extends="org.apache.cocoon.portal.layout.AbstractLayout"> <map-to xml="link-layout" /> <field name="layoutKey" type="java.lang.String"> <bind-xml name="layout-key" node="attribute" /> </field> <field name="layoutId" type="java.lang.String"> <bind-xml name="layout-id" node="attribute" /> </field> </class> <class name="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl" extends="org.apache.cocoon.portal.layout.AbstractLayout"> <map-to xml="composite-layout"/> <field name="items" type="org.apache.cocoon.portal.layout.Item" collection="collection" set-method="addItem" get-method="getItems"> <bind-xml auto-naming="deriveByClass" /> </field> </class> <class name="org.apache.cocoon.portal.layout.impl.FrameLayout" extends="org.apache.cocoon.portal.layout.AbstractLayout"> <map-to xml="frame-layout" /> <field name="source" type="java.lang.String" /> </class> <class name="org.apache.cocoon.portal.layout.Item" extends="org.apache.cocoon.portal.layout.AbstractParameters"> <field name="layout" type="org.apache.cocoon.portal.layout.Layout"> <bind-xml auto-naming="deriveByClass" /> </field> </class> <class name="org.apache.cocoon.portal.layout.NamedItem" extends="org.apache.cocoon.portal.layout.Item"> <map-to xml="named-item" /> <field name="name" type="java.lang.String"> <bind-xml name="name" node="attribute" /> </field> </class> <class name="org.exolab.castor.mapping.MapItem"> <field name="key" type="java.lang.String"> <bind-xml name="name" node="attribute"/> </field> <field name="value" type="java.lang.String"> <bind-xml name="value" node="attribute"/> </field> </class> <class name="org.apache.cocoon.portal.util.MapItem"> <field name="key" type="java.lang.String"> <bind-xml name="name"/> </field> <field name="value"> <bind-xml name="value"/> </field> </class> <class name="org.apache.cocoon.portal.layout.impl.CopletLayout" auto-complete="false" extends="org.apache.cocoon.portal.layout.AbstractLayout"> <map-to xml="coplet-layout" /> <field name="copletInstanceData" type="java.lang.String" handler="org.apache.cocoon.portal.util.CopletInstanceDataReferenceFieldHandler"/> </class> </mapping> 1.22 +4 -4 cocoon-2.1/src/blocks/portal/conf/portal.xconf Index: portal.xconf =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/conf/portal.xconf,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- portal.xconf 29 Jul 2003 06:30:06 -0000 1.21 +++ portal.xconf 29 Jul 2003 06:52:15 -0000 1.22 @@ -74,10 +74,10 @@ </component> <component class="org.apache.cocoon.components.persistance.CastorSourceConverter" role="org.apache.cocoon.components.persistance.CastorSourceConverter"> - <mapping-source source="layout">context://samples/portal/profiles/mapping/layout.xml</mapping-source> - <mapping-source source="copletbasedata">context://samples/portal/profiles/mapping/copletbasedata.xml</mapping-source> - <mapping-source source="copletdata">context://samples/portal/profiles/mapping/copletdata.xml</mapping-source> - <mapping-source source="copletinstancedata">context://samples/portal/profiles/mapping/copletinstancedata.xml</mapping-source> + <mapping-source source="layout">resource://org/apache/cocoon/portal/layout/layout.xml</mapping-source> + <mapping-source source="copletbasedata">resource://org/apache/cocoon/portal/coplet/copletbasedata.xml</mapping-source> + <mapping-source source="copletdata">resource://org/apache/cocoon/portal/coplet/copletdata.xml</mapping-source> + <mapping-source source="copletinstancedata">resource://org/apache/cocoon/portal/coplet/copletinstancedata.xml</mapping-source> </component> <component class="org.apache.cocoon.portal.profile.impl.MapProfileLS" role="org.apache.cocoon.portal.profile.ProfileLS" /> 1.1 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/copletinstancedata.xml Index: copletinstancedata.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <mapping> <description>Coplet instance data mapping file</description> <class name="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable"> <field name="persistentAspectDatas" type="org.apache.cocoon.portal.util.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AspectDataFieldHandler"> <bind-xml name="aspect"/> </field> </class> <class name="org.apache.cocoon.portal.factory.impl.AbstractProducible" extends="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable"> <field name="name" type="java.lang.String"> <bind-xml name="name" node="attribute" /> </field> <field name="id" type="java.lang.String" > <bind-xml name="id" node="attribute" /> </field> </class> <class name="org.apache.cocoon.portal.profile.impl.CopletInstanceDataManager"> <map-to xml="coplets" /> <field name="copletInstanceData" type="org.apache.cocoon.portal.coplet.CopletInstanceData" collection="vector" handler="org.apache.cocoon.portal.util.CopletInstanceDataFieldHandler"> <bind-xml auto-naming="deriveByClass"/> </field> </class> <class name="org.apache.cocoon.portal.coplet.CopletInstanceData" extends="org.apache.cocoon.portal.factory.impl.AbstractProducible"> <map-to xml="coplet-instance-data" /> <field name="copletData" type="java.lang.String" handler="org.apache.cocoon.portal.util.CopletDataReferenceFieldHandler"/> <field name="attributes" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AttributesFieldHandler"> <bind-xml name="attribute"/> </field> </class> <class name="org.apache.cocoon.portal.util.MapItem"> <field name="key" type="java.lang.String"> <bind-xml name="name"/> </field> <field name="value"> <bind-xml name="value"/> </field> </class> </mapping> 1.1 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/copletbasedata.xml Index: copletbasedata.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <mapping> <description>Coplet base data mapping file</description> <class name="org.apache.cocoon.portal.profile.impl.CopletBaseDataManager"> <map-to xml="coplets" /> <field name="copletBaseData" type="org.apache.cocoon.portal.coplet.CopletBaseData" collection="vector" handler="org.apache.cocoon.portal.util.CopletBaseDataFieldHandler"> <bind-xml auto-naming="deriveByClass" /> </field> </class> <class name="org.apache.cocoon.portal.coplet.CopletBaseData"> <map-to xml="coplet-base-data" /> <field name="id" type="java.lang.String"> <bind-xml name="id" node="attribute" /> </field> <field name="copletAdapterName" type="java.lang.String"> <bind-xml name="coplet-adapter" /> </field> <field name="copletConfig" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.ConfigurationFieldHandler"> <bind-xml name="configuration"/> </field> </class> <class name="org.exolab.castor.mapping.MapItem"> <field name="key" type="java.lang.String"> <bind-xml name="name"/> </field> <field name="value"> <bind-xml name="value"/> </field> </class> </mapping> 1.1 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/copletdata.xml Index: copletdata.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <mapping> <description>Coplet data mapping file</description> <class name="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable"> </class> <class name="org.apache.cocoon.portal.factory.impl.AbstractProducible" extends="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable"> <field name="name" type="java.lang.String"> <bind-xml name="name" node="attribute" /> </field> <field name="id" type="java.lang.String" > <bind-xml name="id" node="attribute" /> </field> </class> <class name="org.apache.cocoon.portal.profile.impl.CopletDataManager"> <map-to xml="coplets" /> <field name="copletData" type="org.apache.cocoon.portal.coplet.CopletData" collection="vector" handler="org.apache.cocoon.portal.util.CopletDataFieldHandler"> <bind-xml auto-naming="deriveByClass"/> </field> </class> <class name="org.apache.cocoon.portal.coplet.CopletData" extends="org.apache.cocoon.portal.factory.impl.AbstractProducible"> <map-to xml="coplet-data" /> <field name="title" type="java.lang.String"> <bind-xml name="title"/> </field> <field name="maxpageable" type="java.lang.Boolean"> <bind-xml name="maxpageable" /> </field> <field name="attributes" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AttributesFieldHandler"> <bind-xml name="attribute"/> </field> <field name="copletBaseData" type="java.lang.String" handler="org.apache.cocoon.portal.util.CopletBaseDataReferenceFieldHandler"/> </class> <class name="org.exolab.castor.mapping.MapItem"> <field name="key" type="java.lang.String"> <bind-xml name="name"/> </field> <field name="value"> <bind-xml name="value"/> </field> </class> </mapping>