cziegeler 2003/12/12 04:37:13
Modified: src/blocks/portal/samples/profiles/copletdata portal.xml
src/blocks/portal/samples/coplets sitemap.xmap
src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl
HistoryAspect.java
Log:
Start making gallery coplet configurable
Revision Changes Path
1.10 +12 -0
cocoon-2.1/src/blocks/portal/samples/profiles/copletdata/portal.xml
Index: portal.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/copletdata/portal.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- portal.xml 12 Dec 2003 08:24:20 -0000 1.9
+++ portal.xml 12 Dec 2003 12:37:13 -0000 1.10
@@ -150,6 +150,18 @@
<name>uri</name>
<value xsi:type="java:java.lang.String"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>cocoon:/news/portal-bottom.html</value>
</attribute>
+ <attribute>
+ <name>image-dir</name>
+ <value xsi:type="java:java.lang.String"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>../../petstore/images</value>
+ </attribute>
+ <attribute>
+ <name>image-include</name>
+ <value xsi:type="java:java.lang.String"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>.jpg</value>
+ </attribute>
+ <attribute>
+ <name>image-uri-prefix</name>
+ <value xsi:type="java:java.lang.String"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>../petstore/images</value>
+ </attribute>
</coplet-data>
<coplet-data id="Gallery" name="standard">
1.3 +3 -3 cocoon-2.1/src/blocks/portal/samples/coplets/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/samples/coplets/sitemap.xmap,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sitemap.xmap 12 Dec 2003 05:13:01 -0000 1.2
+++ sitemap.xmap 12 Dec 2003 12:37:13 -0000 1.3
@@ -8,11 +8,11 @@
<!-- this is a gallery coplet -->
<map:match pattern="gallery">
- <map:generate type="directory" src="../../petstore/images">
- <map:parameter name="include" value=".jpg"/>
+ <map:generate type="directory"
src="{coplet:copletData/attributes/image-dir}">
+ <map:parameter name="include"
value="{coplet:copletData/attributes/image-include}"/>
</map:generate>
<map:transform src="gallery/dir2pic.xsl">
- <map:parameter name="dirprefix" value="../petstore/images"/>
+ <map:parameter name="dirprefix"
value="{coplet:copletData/attributes/image-uri-prefix}"/>
</map:transform>
<map:transform type="xslt" src="gallery/picture.xsl">
<map:parameter name="pic" value="{coplet:attributes/picture}"/>
1.2 +2 -1
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
Index: HistoryAspect.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HistoryAspect.java 12 Dec 2003 10:13:34 -0000 1.1
+++ HistoryAspect.java 12 Dec 2003 12:37:13 -0000 1.2
@@ -122,6 +122,7 @@
}
this.addValues(layout.getId(), state,
layout.getAspectDatas(), "aspectDatas/");
+ this.addValues(layout.getId(), state,
layout.getParameters(), "parameters/");
// are we a coplet layout
if ( layout instanceof CopletLayout ) {
