You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/07/30 20:41:50 UTC
svn commit: r426912 [5/6] - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/
cocoon-portal-impl/src/main/java/org/apache/c...
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentItem.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentItem.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentItem.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/ContentItem.java Sun Jul 30 11:41:45 2006
@@ -17,7 +17,7 @@
import java.io.Serializable;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
/**
@@ -44,7 +44,7 @@
* @param cid The coplet
* @param content Do we store the content (false: a link)
*/
- public ContentItem(CopletInstanceData cid, boolean content) {
+ public ContentItem(CopletInstance cid, boolean content) {
this.copletId = cid.getId();
this.storesContent = content;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java Sun Jul 30 11:41:45 2006
@@ -21,7 +21,7 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.profile.ProfileManager;
/**
@@ -48,7 +48,7 @@
UserConfiguration uc = (UserConfiguration)session.getAttribute(ATTR_NAME);
if ( uc == null ) {
final ProfileManager pm = service.getProfileManager();
- final CopletInstanceData cid = pm.getCopletInstanceData("basket");
+ final CopletInstance cid = pm.getCopletInstanceData("basket");
if ( cid != null ) {
uc = new UserConfiguration(cid.getAttributes());
session.setAttribute(ATTR_NAME, uc);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf/cocoon-portal-sample.xconf Sun Jul 30 11:41:45 2006
@@ -71,14 +71,14 @@
<!-- This is the profile manager using pipelines to load the various parts. -->
<portal-profile-manager class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager">
- <parameter name="copletbasedata-global-load" value="cocoon:raw:/load-global-profile?profile=copletbasedata"/>
- <parameter name="copletdata-global-load" value="cocoon:raw:/load-global-profile?profile=copletdata"/>
- <parameter name="copletdata-role-load" value="cocoon:raw:/load-role-profile?profile=copletdata"/>
- <parameter name="copletdata-user-load" value="cocoon:raw:/load-user-profile?profile=copletdata"/>
- <parameter name="copletinstancedata-global-load" value="cocoon:raw:/load-global-profile?profile=copletinstancedata"/>
- <parameter name="copletinstancedata-role-load" value="cocoon:raw:/load-role-profile?profile=copletinstancedata"/>
- <parameter name="copletinstancedata-user-load" value="cocoon:raw:/load-user-profile?profile=copletinstancedata"/>
- <parameter name="copletinstancedata-user-save" value="cocoon:raw:/save-user-profile?profile=copletinstancedata"/>
+ <parameter name="coplettype-global-load" value="cocoon:raw:/load-global-profile?profile=coplettype"/>
+ <parameter name="copletdefinition-global-load" value="cocoon:raw:/load-global-profile?profile=copletdefinition"/>
+ <parameter name="copletdefinition-role-load" value="cocoon:raw:/load-role-profile?profile=copletdefinition"/>
+ <parameter name="copletdefinition-user-load" value="cocoon:raw:/load-user-profile?profile=copletdefinition"/>
+ <parameter name="copletinstance-global-load" value="cocoon:raw:/load-global-profile?profile=copletinstance"/>
+ <parameter name="copletinstance-role-load" value="cocoon:raw:/load-role-profile?profile=copletinstance"/>
+ <parameter name="copletinstance-user-load" value="cocoon:raw:/load-user-profile?profile=copletinstance"/>
+ <parameter name="copletinstance-user-save" value="cocoon:raw:/save-user-profile?profile=copletinstance"/>
<parameter name="layout-global-load" value="cocoon:raw:/load-global-profile?profile=layout"/>
<parameter name="layout-role-load" value="cocoon:raw:/load-role-profile?profile=layout"/>
<parameter name="layout-user-load" value="cocoon:raw:/load-user-profile?profile=layout"/>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/gallery.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/gallery.xsl?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/gallery.xsl (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/gallery.xsl Sun Jul 30 11:41:45 2006
@@ -87,13 +87,13 @@
<p>Picture <xsl:value-of select="$showpicindex"/> of <xsl:value-of select="$maxp"/>
<xsl:if test="$showpicindex > 1">
- - <cl:link path="attributes/picture" value="{$picp}" coplet="Gallery-Petstore">« Previous</cl:link>
+ - <cl:link path="attributes/picture" value="{$picp}" coplet="GalleryPetstore_1">« Previous</cl:link>
</xsl:if>
<xsl:if test="$showpicindex < $maxp">
- - <cl:link path="attributes/picture" value="{$picn}" coplet="Gallery-Petstore">Next »</cl:link>
+ - <cl:link path="attributes/picture" value="{$picn}" coplet="GalleryPetstore_1">Next »</cl:link>
</xsl:if>
</p>
- <p><cl:link path="attributes/picture" value="{picture[position()=$showpicindex]}" coplet="GalleryViewer-1">Push to Viewer</cl:link></p>
+ <p><cl:link path="attributes/picture" value="{picture[position()=$showpicindex]}" coplet="GalleryViewer_1">Push to Viewer</cl:link></p>
<img src="{picture[position()=$showpicindex]}"/>
<p>Date: <xsl:value-of select="java:java.util.Date.new()"/></p>
</xsl:otherwise>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/picture.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/picture.xsl?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/picture.xsl (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/picture.xsl Sun Jul 30 11:41:45 2006
@@ -33,7 +33,7 @@
</xsl:when>
<xsl:otherwise>
<img src="{$pic}"/>
- <p><cl:link path="temporaryAttributes/pictitle" value="{$pic}" coplet="GalleryViewer-1">Show file name</cl:link>
+ <p><cl:link path="temporaryAttributes/pictitle" value="{$pic}" coplet="GalleryViewer_1">Show file name</cl:link>
<br/><xsl:value-of select="$tpic"/></p>
<p>Date: <xsl:value-of select="java:java.util.Date.new()"/></p>
</xsl:otherwise>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/sitemap.xmap?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/coplets/gallery/sitemap.xmap Sun Jul 30 11:41:45 2006
@@ -30,17 +30,17 @@
<map:pipeline type="noncaching">
<!-- this is a gallery coplet -->
<map:match pattern="browser">
- <map:generate type="directory" src="{coplet:copletData/attributes/image-dir}">
- <map:parameter name="include" value="{coplet:copletData/attributes/image-include}"/>
+ <map:generate type="directory" src="{coplet:copletDefinition/attributes/image-dir}">
+ <map:parameter name="include" value="{coplet:copletDefinition/attributes/image-include}"/>
</map:generate>
<map:transform src="dir2pic.xsl">
- <map:parameter name="dirprefix" value="{coplet:copletData/attributes/image-uri-prefix}"/>
+ <map:parameter name="dirprefix" value="{coplet:copletDefinition/attributes/image-uri-prefix}"/>
</map:transform>
<map:transform type="xslt" src="gallery.xsl">
<map:parameter name="pic" value="{coplet:attributes/picture}"/>
<map:parameter name="size" value="{coplet:size}"/>
</map:transform>
- <!-- This must be commented out if CachingURICopletAdapter is used in profiles/copletdata
+ <!-- This must be commented out if CachingURICopletAdapter is used in profiles/copletdefinition
due to links that needs to be cached untranslated.
<map:transform type="portal-coplet"/>
-->
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml?rev=426912&r1=426594&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletdefinition/portal.xml Sun Jul 30 11:41:45 2006
@@ -20,86 +20,86 @@
+ Different news coplets
+ Read content from a file - for offline presentation
-->
- <coplet-data id="Newsweek">
+ <coplet-definition id="Newsweek">
<title>Newsweek</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/newsweek.rss</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
- <coplet-data id="NYTBusiness">
+ <coplet-definition id="NYTBusiness">
<title>NYT Business</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/nyt_business.rss</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
- <coplet-data id="BBCNews">
+ <coplet-definition id="BBCNews">
<title>BBC News</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/bbc_news.rss</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
- <coplet-data id="CNETNews">
+ <coplet-definition id="CNETNews">
<title>CNET News</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/cnet_news.rss</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
- <coplet-data id="CNETBusiness">
+ <coplet-definition id="CNETBusiness">
<title>CNET Business News</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/cnet_business.rss</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
- <coplet-data id="CSTNews">
+ <coplet-definition id="CSTNews">
<title>Chicago Sunday Times</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/cst_news.rss</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
- <coplet-data id="CNNEurope">
+ <coplet-definition id="CNNEurope">
<title>CNN Europe</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/cnn_europe.rss</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
- <coplet-data id="Weblog">
+ <coplet-definition id="Weblog">
<title>Another Weblog</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/nn_weblog.weblog-rss</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
<!--
+ Different news coplets
+ Try to read content from the internet.
+ If the net is not available, use static file (for offline presentation)
-->
- <coplet-data id="CZWeblog">
+ <coplet-definition id="CZWeblog">
<title>CZ's Weblog</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/live.weblog-rss?feed=http://www.osoco.org/weblogs/rael/index.xml</value>
@@ -112,14 +112,14 @@
<name>error-uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/news/cz_weblog.weblog-rss</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
<!--
+ The portal introduction coplet
-->
- <coplet-data id="PortalIntro">
+ <coplet-definition id="PortalIntro">
<title>Introduction</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-intro.html</value>
@@ -128,10 +128,10 @@
<name>mandatory</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
- <coplet-data id="PortalDemo">
+ </coplet-definition>
+ <coplet-definition id="PortalDemo">
<title>Introduction</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-demo.html</value>
@@ -144,10 +144,10 @@
<name>mandatory</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
- <coplet-data id="PortalRight">
+ </coplet-definition>
+ <coplet-definition id="PortalRight">
<title>Right</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-right.html</value>
@@ -156,10 +156,10 @@
<name>mandatory</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
- <coplet-data id="PortalLeft">
+ </coplet-definition>
+ <coplet-definition id="PortalLeft">
<title>Left</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-left.html</value>
@@ -168,10 +168,10 @@
<name>mandatory</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
- <coplet-data id="PortalBottom">
+ </coplet-definition>
+ <coplet-definition id="PortalBottom">
<title>Bottom</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-bottom.html</value>
@@ -180,10 +180,10 @@
<name>mandatory</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
- <coplet-data id="static_sample">
+ </coplet-definition>
+ <coplet-definition id="static_sample">
<title>Static Information</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/docs/static-info.html</value>
@@ -196,14 +196,14 @@
<name>sizable</name>
<value xsi:type="java:java.lang.Boolean">false</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
<!--
+ The Gallery coplets
-->
- <coplet-data id="Gallery">
+ <coplet-definition id="Gallery">
<title>Picture Gallery</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>buffer</name>
<value xsi:type="java:java.lang.Boolean">true</value>
@@ -232,10 +232,10 @@
<name>ignore-simple-sizing-events</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
- <coplet-data id="GalleryViewer">
+ </coplet-definition>
+ <coplet-definition id="GalleryViewer">
<title>Gallery Viewer</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>buffer</name>
<value xsi:type="java:java.lang.Boolean">true</value>
@@ -244,14 +244,14 @@
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/gallery/viewer</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
<!--
+ The login coplet
-->
- <coplet-data id="Login">
+ <coplet-definition id="Login">
<title>Login</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/login/coplet</value>
@@ -260,47 +260,47 @@
<name>mandatory</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
<!--
+ The basket coplets
+ The uri's for these coplets have to be absolut, so you have to use cocoon://!
-->
- <coplet-data id="BasketContent">
+ <coplet-definition id="BasketContent">
<title>Basket Item</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/content</value>
</attribute>
- </coplet-data>
- <coplet-data id="BasketAdmin">
+ </coplet-definition>
+ <coplet-definition id="BasketAdmin">
<title>Basket Administration</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/basket-admin</value>
</attribute>
- </coplet-data>
- <coplet-data id="Basket">
+ </coplet-definition>
+ <coplet-definition id="Basket">
<title>Basket</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/basket</value>
</attribute>
- </coplet-data>
- <coplet-data id="Basket_admin">
+ </coplet-definition>
+ <coplet-definition id="Basket_admin">
<title>Basket</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/basket.admin</value>
</attribute>
- </coplet-data>
- <coplet-data id="BasketSampleStaticCoplet">
+ </coplet-definition>
+ <coplet-definition id="BasketSampleStaticCoplet">
<title>Static Coplet</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>group</name>
<value xsi:type="java:java.lang.String">document</value>
@@ -309,10 +309,10 @@
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/staticcoplet.add.preflow</value>
</attribute>
- </coplet-data>
- <coplet-data id="BasketSampleCopletWithAttribute">
+ </coplet-definition>
+ <coplet-definition id="BasketSampleCopletWithAttribute">
<title>Coplet with Attribute</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>group</name>
<value xsi:type="java:java.lang.String">document</value>
@@ -321,10 +321,10 @@
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/copletwithattr.add.preflow</value>
</attribute>
- </coplet-data>
- <coplet-data id="BasketSampleCopletWithInlineProcess">
+ </coplet-definition>
+ <coplet-definition id="BasketSampleCopletWithInlineProcess">
<title>Coplet with Inline Process</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>group</name>
<value xsi:type="java:java.lang.String">document</value>
@@ -333,10 +333,10 @@
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/copletwithinline.add.preflow</value>
</attribute>
- </coplet-data>
- <coplet-data id="BasketSampleCopletWithInputProcess">
+ </coplet-definition>
+ <coplet-definition id="BasketSampleCopletWithInputProcess">
<title>Coplet with Input Processing</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>group</name>
<value xsi:type="java:java.lang.String">notepad</value>
@@ -357,10 +357,10 @@
<name>temporary:application-uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/copletwithinput.add.flow</value>
</attribute>
- </coplet-data>
- <coplet-data id="BasketSampleCopletWithInputProcessShow">
+ </coplet-definition>
+ <coplet-definition id="BasketSampleCopletWithInputProcessShow">
<title>Show Input</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>group</name>
<value xsi:type="java:java.lang.String">notepad</value>
@@ -369,10 +369,10 @@
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/copletwithinputshow.changeTitle.preflow</value>
</attribute>
- </coplet-data>
- <coplet-data id="BasketSampleCopletWithApp">
+ </coplet-definition>
+ <coplet-definition id="BasketSampleCopletWithApp">
<title>Coplet with Application</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>group</name>
<value xsi:type="java:java.lang.String">request</value>
@@ -393,10 +393,10 @@
<name>temporary:application-uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/copletwithapp.add.flow</value>
</attribute>
- </coplet-data>
- <coplet-data id="BasketSampleCopletList">
+ </coplet-definition>
+ <coplet-definition id="BasketSampleCopletList">
<title>Coplet List</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>group</name>
<value xsi:type="java:java.lang.String">request</value>
@@ -417,10 +417,10 @@
<name>temporary:application-uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/copletlist</value>
</attribute>
- </coplet-data>
- <coplet-data id="BasketSampleCopletWithUpload">
+ </coplet-definition>
+ <coplet-definition id="BasketSampleCopletWithUpload">
<title>Coplet with Input Process</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>group</name>
<value xsi:type="java:java.lang.String">folder</value>
@@ -429,7 +429,7 @@
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/copletwithupload.add.preflow</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
<!--+
@@ -438,9 +438,9 @@
| from "webapp.TestPortlet1" to "<CONTEXT_NAME>.TestPortlet1". The same
| change has to be applied to the CocoonPortlet.
-->
- <coplet-data id="TestPortlet1">
+ <coplet-definition id="TestPortlet1">
<title>Portlet-Test</title>
- <coplet-base-data>Portlet</coplet-base-data>
+ <coplet-type>Portlet</coplet-type>
<attribute>
<name>portlet</name>
<value xsi:type="java:java.lang.String">webapp.TestPortlet1</value>
@@ -449,10 +449,10 @@
<name>buffer</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
- <coplet-data id="CocoonPortlet">
+ </coplet-definition>
+ <coplet-definition id="CocoonPortlet">
<title>CocoonPortlet</title>
- <coplet-base-data>Portlet</coplet-base-data>
+ <coplet-type>Portlet</coplet-type>
<attribute>
<name>portlet</name>
<value xsi:type="java:java.lang.String">webapp.CocoonPortlet</value>
@@ -461,16 +461,16 @@
<name>buffer</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
<!--
+ This is an application integration sample:
+ - the flow based calculator
+ - and a forms sample
-->
- <coplet-data id="app_test_one">
+ <coplet-definition id="app_test_one">
<title>Application Test</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>buffer</name>
<value xsi:type="java:java.lang.Boolean">true</value>
@@ -487,10 +487,10 @@
<name>temporary:application-uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/samples/form</value>
</attribute>
- </coplet-data>
- <coplet-data id="app_test_two">
+ </coplet-definition>
+ <coplet-definition id="app_test_two">
<title>Application Test</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>buffer</name>
<value xsi:type="java:java.lang.Boolean">true</value>
@@ -507,12 +507,12 @@
<name>temporary:application-uri</name>
<value xsi:type="java:java.lang.String">cocoon://samples/blocks/core-samples-main/flow/jxcalc/</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
<!-- Example for the application coplet -->
- <coplet-data id="Google">
+ <coplet-definition id="Google">
<title>Application</title>
- <coplet-base-data>URICoplet</coplet-base-data>
+ <coplet-type>URICoplet</coplet-type>
<attribute>
<name>uri</name>
<value xsi:type="java:java.lang.String">cocoon:/coplets/html/app-coplet</value>
@@ -521,12 +521,12 @@
<name>start-uri</name>
<value xsi:type="java:java.lang.String">http://www.google.com/index.html</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
<!-- Example for the wsrp portlet -->
- <coplet-data id="wsrp_calc_portlet">
+ <coplet-definition id="wsrp_calc_portlet">
<title>WSRP-Calc-Portlet</title>
- <coplet-base-data>WSRP</coplet-base-data>
+ <coplet-type>WSRP</coplet-type>
<attribute>
<name>producer-id</name>
<value xsi:type="java:java.lang.String">prod_localhost_8081</value>
@@ -535,11 +535,11 @@
<name>portlet-handle</name>
<value xsi:type="java:java.lang.String">calc_1.1</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
- <coplet-data id="wsrp_test_portlet">
+ <coplet-definition id="wsrp_test_portlet">
<title>WSRP-Test-Portlet</title>
- <coplet-base-data>WSRP</coplet-base-data>
+ <coplet-type>WSRP</coplet-type>
<attribute>
<name>producer-id</name>
<value xsi:type="java:java.lang.String">prod_localhost_8081</value>
@@ -552,6 +552,6 @@
<name>use-pipeline</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
- </coplet-data>
+ </coplet-definition>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-anonymous.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-anonymous.xml?rev=426912&r1=426594&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-anonymous.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-anonymous.xml Sun Jul 30 11:41:45 2006
@@ -16,19 +16,19 @@
-->
<!-- SVN $Id$ -->
<coplets>
- <coplet-instance-data id="PortalIntro_1">
- <coplet-data>PortalIntro</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalRight_1">
- <coplet-data>PortalRight</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalLeft_1">
- <coplet-data>PortalLeft</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalBottom_1">
- <coplet-data>PortalBottom</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="Login_1">
- <coplet-data>Login</coplet-data>
- </coplet-instance-data>
+ <coplet-instance id="PortalIntro_1">
+ <coplet-definition>PortalIntro</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalRight_1">
+ <coplet-definition>PortalRight</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalLeft_1">
+ <coplet-definition>PortalLeft</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalBottom_1">
+ <coplet-definition>PortalBottom</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="Login_1">
+ <coplet-definition>Login</coplet-definition>
+ </coplet-instance>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-cocoon.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-cocoon.xml?rev=426912&r1=426594&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-cocoon.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-cocoon.xml Sun Jul 30 11:41:45 2006
@@ -16,72 +16,72 @@
-->
<!-- SVN $Id$ -->
<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <coplet-instance-data id="PortalIntro_1">
- <coplet-data>PortalIntro</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalRight_1">
- <coplet-data>PortalRight</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalLeft_1">
- <coplet-data>PortalLeft</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalBottom_1">
- <coplet-data>PortalBottom</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalDemo_1">
- <coplet-data>PortalDemo</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="GalleryPetstore">
- <coplet-data>Gallery</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="GalleryViewer_1">
- <coplet-data>GalleryViewer</coplet-data>
- </coplet-instance-data>
+ <coplet-instance id="PortalIntro_1">
+ <coplet-definition>PortalIntro</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalRight_1">
+ <coplet-definition>PortalRight</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalLeft_1">
+ <coplet-definition>PortalLeft</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalBottom_1">
+ <coplet-definition>PortalBottom</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalDemo_1">
+ <coplet-definition>PortalDemo</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="GalleryPetstore_1">
+ <coplet-definition>Gallery</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="GalleryViewer_1">
+ <coplet-definition>GalleryViewer</coplet-definition>
+ </coplet-instance>
<!--
- <coplet-instance-data id="Portlet_1">
- <coplet-data>testsuite_TestPortlet1</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="Portlet_2">
- <coplet-data>testsuite_TestPortlet2</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="TestPortlet_1">
- <coplet-data>TestPortlet1</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="CocoonPortlet">
- <coplet-data>CocoonPortlet</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="Petstore_1">
- <coplet-data>jpetstore_JPetstorePortlet</coplet-data>
- </coplet-instance-data>
+ <coplet-instance id="Portlet_1">
+ <coplet-definition>testsuite_TestPortlet1</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="Portlet_2">
+ <coplet-definition>testsuite_TestPortlet2</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="TestPortlet_1">
+ <coplet-definition>TestPortlet1</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="CocoonPortlet">
+ <coplet-definition>CocoonPortlet</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="Petstore_1">
+ <coplet-definition>jpetstore_JPetstorePortlet</coplet-definition>
+ </coplet-instance>
-->
- <coplet-instance-data id="app_test_1">
- <coplet-data>app_test_one</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="app_test_2">
- <coplet-data>app_test_one</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="app_test_3">
- <coplet-data>app_test_two</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="app_test_4">
- <coplet-data>app_test_two</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="Google_1">
- <coplet-data>Google</coplet-data>
- </coplet-instance-data>
+ <coplet-instance id="app_test_1">
+ <coplet-definition>app_test_one</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="app_test_2">
+ <coplet-definition>app_test_one</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="app_test_3">
+ <coplet-definition>app_test_two</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="app_test_4">
+ <coplet-definition>app_test_two</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="Google_1">
+ <coplet-definition>Google</coplet-definition>
+ </coplet-instance>
<!-- wsrp example
- <coplet-instance-data id="WSRP_Calc_1">
- <coplet-data>wsrp_calc_portlet</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="WSRP_Test_1">
- <coplet-data>wsrp_test_portlet</coplet-data>
- </coplet-instance-data>
+ <coplet-instance id="WSRP_Calc_1">
+ <coplet-definition>wsrp_calc_portlet</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="WSRP_Test_1">
+ <coplet-definition>wsrp_test_portlet</coplet-definition>
+ </coplet-instance>
-->
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-test.xml?rev=426912&r1=426594&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-test.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal-user-test.xml Sun Jul 30 11:41:45 2006
@@ -17,70 +17,70 @@
<!-- SVN $Id$ -->
<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- This portlet is on every page. -->
- <coplet-instance-data id="static_sample_1">
- <coplet-data>static_sample</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="PortalIntro_1">
- <coplet-data>PortalIntro</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalRight_1">
- <coplet-data>PortalRight</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalLeft_1">
- <coplet-data>PortalLeft</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalBottom_1">
- <coplet-data>PortalBottom</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalDemo_1">
- <coplet-data>PortalDemo</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="Gallery_Petstore">
- <coplet-data>Gallery</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="GalleryViewer_1">
- <coplet-data>GalleryViewer</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="Portlet_1">
- <coplet-data>Portlet1</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="Portlet_2">
- <coplet-data>Portlet2</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="TestPortlet_1">
- <coplet-data>TestPortlet1</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="CocoonPortlet">
- <coplet-data>CocoonPortlet</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="app_test_1">
- <coplet-data>app_test_one</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="app_test_2">
- <coplet-data>app_test_one</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="app_test_3">
- <coplet-data>app_test_two</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="app_test_4">
- <coplet-data>app_test_two</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="Google_1">
- <coplet-data>Google</coplet-data>
- </coplet-instance-data>
+ <coplet-instance id="static_sample_1">
+ <coplet-definition>static_sample</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="PortalIntro_1">
+ <coplet-definition>PortalIntro</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalRight_1">
+ <coplet-definition>PortalRight</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalLeft_1">
+ <coplet-definition>PortalLeft</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalBottom_1">
+ <coplet-definition>PortalBottom</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalDemo_1">
+ <coplet-definition>PortalDemo</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="GalleryPetstore_1">
+ <coplet-definition>Gallery</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="GalleryViewer_1">
+ <coplet-definition>GalleryViewer</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="Portlet_1">
+ <coplet-definition>Portlet1</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="Portlet_2">
+ <coplet-definition>Portlet2</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="TestPortlet_1">
+ <coplet-definition>TestPortlet1</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="CocoonPortlet">
+ <coplet-definition>CocoonPortlet</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="app_test_1">
+ <coplet-definition>app_test_one</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="app_test_2">
+ <coplet-definition>app_test_one</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="app_test_3">
+ <coplet-definition>app_test_two</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="app_test_4">
+ <coplet-definition>app_test_two</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="Google_1">
+ <coplet-definition>Google</coplet-definition>
+ </coplet-instance>
<!-- wsrp example -->
- <coplet-instance-data id="WSRP_Calc_1">
- <coplet-data>wsrp_calc_portlet</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="WSRP_Test_1">
- <coplet-data>wsrp_test_portlet</coplet-data>
- </coplet-instance-data>
+ <coplet-instance id="WSRP_Calc_1">
+ <coplet-definition>wsrp_calc_portlet</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="WSRP_Test_1">
+ <coplet-definition>wsrp_test_portlet</coplet-definition>
+ </coplet-instance>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml?rev=426912&r1=426594&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/copletinstance/portal.xml Sun Jul 30 11:41:45 2006
@@ -16,135 +16,135 @@
-->
<!-- SVN $Id$ -->
<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <coplet-instance-data id="Newsweek_1">
- <coplet-data>Newsweek</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="NYTBusiness_1">
- <coplet-data>NYTBusiness</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="BBCNews_1">
- <coplet-data>BBCNews</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="CNETNews_1">
- <coplet-data>CNETNews</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="CNETBusiness_1">
- <coplet-data>CNETBusiness</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="CSTNews_1">
- <coplet-data>CSTNews</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="CNNEurope_1">
- <coplet-data>CNNEurope</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="CZWeblog_1">
- <coplet-data>CZWeblog</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="Weblog_1">
- <coplet-data>Weblog</coplet-data>
- </coplet-instance-data>
-
- <coplet-instance-data id="PortalIntro_1">
- <coplet-data>PortalIntro</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalRight_1">
- <coplet-data>PortalRight</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalLeft_1">
- <coplet-data>PortalLeft</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalBottom_1">
- <coplet-data>PortalBottom</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="PortalDemo_1">
- <coplet-data>PortalDemo</coplet-data>
- </coplet-instance-data>
+ <coplet-instance id="Newsweek_1">
+ <coplet-definition>Newsweek</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="NYTBusiness_1">
+ <coplet-definition>NYTBusiness</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="BBCNews_1">
+ <coplet-definition>BBCNews</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="CNETNews_1">
+ <coplet-definition>CNETNews</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="CNETBusiness_1">
+ <coplet-definition>CNETBusiness</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="CSTNews_1">
+ <coplet-definition>CSTNews</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="CNNEurope_1">
+ <coplet-definition>CNNEurope</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="CZWeblog_1">
+ <coplet-definition>CZWeblog</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="Weblog_1">
+ <coplet-definition>Weblog</coplet-definition>
+ </coplet-instance>
+
+ <coplet-instance id="PortalIntro_1">
+ <coplet-definition>PortalIntro</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalRight_1">
+ <coplet-definition>PortalRight</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalLeft_1">
+ <coplet-definition>PortalLeft</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalBottom_1">
+ <coplet-definition>PortalBottom</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="PortalDemo_1">
+ <coplet-definition>PortalDemo</coplet-definition>
+ </coplet-instance>
<!-- This is the basket sample
-->
- <coplet-instance-data id="basket">
- <coplet-data>Basket</coplet-data>
+ <coplet-instance id="basket">
+ <coplet-definition>Basket</coplet-definition>
<attribute> <!-- which kinds are enabled for this user: briefcase, basker, folder? -->
<name>basket:enabled-storages</name>
<value xsi:type="java:java.lang.String">briefcase,basket,folder</value>
</attribute>
- </coplet-instance-data>
+ </coplet-instance>
- <coplet-instance-data id="basket_document">
- <coplet-data>Basket</coplet-data>
+ <coplet-instance id="basket_document">
+ <coplet-definition>Basket</coplet-definition>
<attribute>
<name>type</name>
<value xsi:type="java:java.lang.String">document</value>
</attribute>
- </coplet-instance-data>
- <coplet-instance-data id="basket_request">
- <coplet-data>Basket</coplet-data>
+ </coplet-instance>
+ <coplet-instance id="basket_request">
+ <coplet-definition>Basket</coplet-definition>
<attribute>
<name>type</name>
<value xsi:type="java:java.lang.String">request</value>
</attribute>
- </coplet-instance-data>
- <coplet-instance-data id="basket_result">
- <coplet-data>Basket</coplet-data>
+ </coplet-instance>
+ <coplet-instance id="basket_result">
+ <coplet-definition>Basket</coplet-definition>
<attribute>
<name>type</name>
<value xsi:type="java:java.lang.String">result</value>
</attribute>
- </coplet-instance-data>
- <coplet-instance-data id="basket_notepad">
- <coplet-data>Basket</coplet-data>
+ </coplet-instance>
+ <coplet-instance id="basket_notepad">
+ <coplet-definition>Basket</coplet-definition>
<attribute>
<name>type</name>
<value xsi:type="java:java.lang.String">notepad</value>
</attribute>
- </coplet-instance-data>
- <coplet-instance-data id="basket_folder">
- <coplet-data>Basket</coplet-data>
+ </coplet-instance>
+ <coplet-instance id="basket_folder">
+ <coplet-definition>Basket</coplet-definition>
<attribute>
<name>type</name>
<value xsi:type="java:java.lang.String">folder</value>
</attribute>
- </coplet-instance-data>
+ </coplet-instance>
- <coplet-instance-data id="Basket_admin">
- <coplet-data>Basket_admin</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="basket_content">
- <coplet-data>BasketContent</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="BasketAdmin">
- <coplet-data>BasketAdmin</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="basket_sample_1">
- <coplet-data>BasketSampleStaticCoplet</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="basket_sample_2">
- <coplet-data>BasketSampleCopletWithAttribute</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="basket_sample_3">
- <coplet-data>BasketSampleCopletWithInlineProcess</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="basket_sample_4">
- <coplet-data>BasketSampleCopletWithInputProcess</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="basket_sample_5">
- <coplet-data>BasketSampleCopletWithApp</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="basket_sample_6">
- <coplet-data>BasketSampleCopletWithUpload</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="basket_sample_7">
- <coplet-data>BasketSampleCopletWithInputProcessShow</coplet-data>
- </coplet-instance-data>
- <coplet-instance-data id="basket_sample_8">
- <coplet-data>BasketSampleCopletList</coplet-data>
- </coplet-instance-data>
+ <coplet-instance id="Basket_admin">
+ <coplet-definition>Basket_admin</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="basket_content">
+ <coplet-definition>BasketContent</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="BasketAdmin">
+ <coplet-definition>BasketAdmin</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="basket_sample_1">
+ <coplet-definition>BasketSampleStaticCoplet</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="basket_sample_2">
+ <coplet-definition>BasketSampleCopletWithAttribute</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="basket_sample_3">
+ <coplet-definition>BasketSampleCopletWithInlineProcess</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="basket_sample_4">
+ <coplet-definition>BasketSampleCopletWithInputProcess</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="basket_sample_5">
+ <coplet-definition>BasketSampleCopletWithApp</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="basket_sample_6">
+ <coplet-definition>BasketSampleCopletWithUpload</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="basket_sample_7">
+ <coplet-definition>BasketSampleCopletWithInputProcessShow</coplet-definition>
+ </coplet-instance>
+ <coplet-instance id="basket_sample_8">
+ <coplet-definition>BasketSampleCopletList</coplet-definition>
+ </coplet-instance>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml?rev=426912&r1=426594&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/coplettype/portal.xml Sun Jul 30 11:41:45 2006
@@ -16,11 +16,11 @@
-->
<!-- SVN $Id$ -->
<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <coplet-base-data id="URICoplet">
+ <coplet-type id="URICoplet">
<coplet-adapter>uri</coplet-adapter>
- </coplet-base-data>
+ </coplet-type>
- <coplet-base-data id="Portlet">
+ <coplet-type id="Portlet">
<coplet-adapter>portlet</coplet-adapter>
<configuration>
<name>full-screen</name>
@@ -30,14 +30,14 @@
<name>handle-sizing</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</configuration>
- </coplet-base-data>
+ </coplet-type>
- <coplet-base-data id="WSRP">
+ <coplet-type id="WSRP">
<coplet-adapter>wsrp</coplet-adapter>
<configuration>
<name>buffer</name>
<value xsi:type="java:java.lang.Boolean">true</value>
</configuration>
- </coplet-base-data>
+ </coplet-type>
</coplets>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-anonymous.xml Sun Jul 30 11:41:45 2006
@@ -21,13 +21,13 @@
<item>
<parameter name="width" value="60%"/>
<coplet-layout name="coplet" layout-renderer-name="borderless-window">
- <coplet-instance-data>PortalIntro_1</coplet-instance-data>
+ <coplet-instance>PortalIntro_1</coplet-instance>
</coplet-layout>
</item>
<item>
<parameter name="width" value="40%"/>
<coplet-layout name="coplet" layout-renderer-name="nowindow">
- <coplet-instance-data>Login_1</coplet-instance-data>
+ <coplet-instance>Login_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -38,13 +38,13 @@
<item>
<parameter name="width" value="25%"/>
<coplet-layout name="coplet" layout-renderer-name="borderless-window">
- <coplet-instance-data>PortalLeft_1</coplet-instance-data>
+ <coplet-instance>PortalLeft_1</coplet-instance>
</coplet-layout>
</item>
<item>
<parameter name="width" value="75%"/>
<coplet-layout name="coplet" layout-renderer-name="borderless-window">
- <coplet-instance-data>PortalRight_1</coplet-instance-data>
+ <coplet-instance>PortalRight_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -52,7 +52,7 @@
<item>
<parameter name="height" value="500"/>
<coplet-layout name="coplet" layout-renderer-name="borderless-window">
- <coplet-instance-data>PortalBottom_1</coplet-instance-data>
+ <coplet-instance>PortalBottom_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-cocoon.xml Sun Jul 30 11:41:45 2006
@@ -19,7 +19,7 @@
<named-item name="Main">
<coplet-layout name="coplet">
- <coplet-instance-data>PortalDemo_1</coplet-instance-data>
+ <coplet-instance>PortalDemo_1</coplet-instance>
</coplet-layout>
</named-item>
@@ -27,12 +27,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>GalleryPetstore</coplet-instance-data>
+ <coplet-instance>GalleryPetstore_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>GalleryViewer_1</coplet-instance-data>
+ <coplet-instance>GalleryViewer_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -43,24 +43,24 @@
<composite-layout name="row">
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>TestPortlet_1</coplet-instance-data>
+ <coplet-instance>TestPortlet_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>CocoonPortlet</coplet-instance-data>
+ <coplet-instance>CocoonPortlet</coplet-instance>
</coplet-layout>
</item>
<item>
<composite-layout name="column">
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>Portlet_1</coplet-instance-data>
+ <coplet-instance>Portlet_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>Portlet_2</coplet-instance-data>
+ <coplet-instance>Portlet_2</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -70,7 +70,7 @@
<named-item name="Portals Bridges">
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>Petstore_1</coplet-instance-data>
+ <coplet-instance>Petstore_1</coplet-instance>
</coplet-layout>
</named-item>
@@ -78,12 +78,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet" layout-renderer-name="wsrp-window">
- <coplet-instance-data>WSRP_Calc_1</coplet-instance-data>
+ <coplet-instance>WSRP_Calc_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" layout-renderer-name="wsrp-window">
- <coplet-instance-data>WSRP_Test_1</coplet-instance-data>
+ <coplet-instance>WSRP_Test_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -97,13 +97,13 @@
<item>
<parameter name="width" value="50%" />
<coplet-layout name="coplet" >
- <coplet-instance-data>app_test_1</coplet-instance-data>
+ <coplet-instance>app_test_1</coplet-instance>
</coplet-layout>
</item>
<item>
<parameter name="width" value="50%" />
<coplet-layout name="coplet" >
- <coplet-instance-data>app_test_2</coplet-instance-data>
+ <coplet-instance>app_test_2</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -113,13 +113,13 @@
<item>
<parameter name="width" value="50%" />
<coplet-layout name="coplet" >
- <coplet-instance-data>app_test_3</coplet-instance-data>
+ <coplet-instance>app_test_3</coplet-instance>
</coplet-layout>
</item>
<item>
<parameter name="width" value="50%" />
<coplet-layout name="coplet" >
- <coplet-instance-data>app_test_4</coplet-instance-data>
+ <coplet-instance>app_test_4</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -129,7 +129,7 @@
<named-item name="AppCoplet">
<coplet-layout name="coplet">
- <coplet-instance-data>Google_1</coplet-instance-data>
+ <coplet-instance>Google_1</coplet-instance>
</coplet-layout>
</named-item>
</composite-layout>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal-user-test.xml Sun Jul 30 11:41:45 2006
@@ -21,19 +21,19 @@
<composite-layout name="column" static="true">
<item>
<coplet-layout name="coplet" static="true">
- <coplet-instance-data>static_sample_1</coplet-instance-data>
+ <coplet-instance>static_sample_1</coplet-instance>
</coplet-layout>
</item>
<item>
<composite-layout name="row">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>GalleryPetstore</coplet-instance-data>
+ <coplet-instance>GalleryPetstore_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>GalleryViewer_1</coplet-instance-data>
+ <coplet-instance>GalleryViewer_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -42,12 +42,12 @@
<composite-layout name="row">
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>TestPortlet_1</coplet-instance-data>
+ <coplet-instance>TestPortlet_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" layout-renderer-name="portlet-window">
- <coplet-instance-data>CocoonPortlet</coplet-instance-data>
+ <coplet-instance>CocoonPortlet</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -59,17 +59,17 @@
<composite-layout name="column" static="true">
<item>
<coplet-layout name="coplet" static="true">
- <coplet-instance-data>static_sample_1</coplet-instance-data>
+ <coplet-instance>static_sample_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" >
- <coplet-instance-data>app_test_1</coplet-instance-data>
+ <coplet-instance>app_test_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" >
- <coplet-instance-data>app_test_2</coplet-instance-data>
+ <coplet-instance>app_test_2</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/profiles/layout/portal.xml Sun Jul 30 11:41:45 2006
@@ -19,7 +19,7 @@
<named-item name="Main">
<coplet-layout name="coplet">
- <coplet-instance-data>PortalDemo_1</coplet-instance-data>
+ <coplet-instance>PortalDemo_1</coplet-instance>
</coplet-layout>
</named-item>
@@ -36,14 +36,14 @@
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>Newsweek_1</coplet-instance-data>
+ <coplet-instance>Newsweek_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
<parameter name="border" value="0"/>
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>NYTBusiness_1</coplet-instance-data>
+ <coplet-instance>NYTBusiness_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -57,7 +57,7 @@
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>BBCNews_1</coplet-instance-data>
+ <coplet-instance>BBCNews_1</coplet-instance>
</coplet-layout>
</item>
<item>
@@ -71,7 +71,7 @@
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>CNETNews_1</coplet-instance-data>
+ <coplet-instance>CNETNews_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -88,14 +88,14 @@
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>CSTNews_1</coplet-instance-data>
+ <coplet-instance>CSTNews_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
<parameter name="border" value="0" />
<parameter name="border-color" value="#AA0000" />
- <coplet-instance-data>CNNEurope_1</coplet-instance-data>
+ <coplet-instance>CNNEurope_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -110,7 +110,7 @@
<item>
<parameter name="width" value="20%" />
<coplet-layout name="coplet">
- <coplet-instance-data>CZWeblog_1</coplet-instance-data>
+ <coplet-instance>CZWeblog_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -119,7 +119,7 @@
<composite-layout name="row">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>Weblog_1</coplet-instance-data>
+ <coplet-instance>Weblog_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -131,12 +131,12 @@
<composite-layout name="tab">
<named-item name="One">
<coplet-layout name="coplet">
- <coplet-instance-data>CZWeblog_1</coplet-instance-data>
+ <coplet-instance>CZWeblog_1</coplet-instance>
</coplet-layout>
</named-item>
<named-item name="Two">
<coplet-layout name="coplet">
- <coplet-instance-data>Weblog_1</coplet-instance-data>
+ <coplet-instance>Weblog_1</coplet-instance>
</coplet-layout>
</named-item>
</composite-layout>
@@ -146,12 +146,12 @@
<composite-layout name="linktab">
<named-item name="One">
<coplet-layout name="coplet">
- <coplet-instance-data>CZWeblog_1</coplet-instance-data>
+ <coplet-instance>CZWeblog_1</coplet-instance>
</coplet-layout>
</named-item>
<named-item name="Two">
<coplet-layout name="coplet">
- <coplet-instance-data>Weblog_1</coplet-instance-data>
+ <coplet-instance>Weblog_1</coplet-instance>
</coplet-layout>
</named-item>
</composite-layout>
@@ -161,26 +161,26 @@
<composite-layout name="linktab">
<named-item name="One">
<coplet-layout name="coplet">
- <coplet-instance-data>CZWeblog_1</coplet-instance-data>
+ <coplet-instance>CZWeblog_1</coplet-instance>
</coplet-layout>
</named-item>
<named-item name="Two">
<composite-layout name="tab">
<named-item name="Weblog">
<coplet-layout name="coplet">
- <coplet-instance-data>Weblog_1</coplet-instance-data>
+ <coplet-instance>Weblog_1</coplet-instance>
</coplet-layout>
</named-item>
<named-item name="Gallery">
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>GalleryPetstore</coplet-instance-data>
+ <coplet-instance>GalleryPetstore_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>GalleryViewer_1</coplet-instance-data>
+ <coplet-instance>GalleryViewer_1</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -201,7 +201,7 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket_sample_8</coplet-instance-data>
+ <coplet-instance>basket_sample_8</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -214,12 +214,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket_sample_1</coplet-instance-data>
+ <coplet-instance>basket_sample_1</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" >
- <coplet-instance-data>basket_sample_2</coplet-instance-data>
+ <coplet-instance>basket_sample_2</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -228,12 +228,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket_sample_3</coplet-instance-data>
+ <coplet-instance>basket_sample_3</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" >
- <coplet-instance-data>basket_sample_4</coplet-instance-data>
+ <coplet-instance>basket_sample_4</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -242,12 +242,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket_sample_5</coplet-instance-data>
+ <coplet-instance>basket_sample_5</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket_sample_6</coplet-instance-data>
+ <coplet-instance>basket_sample_6</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -260,32 +260,32 @@
<composite-layout name="tab">
<named-item name="All">
<coplet-layout name="coplet">
- <coplet-instance-data>basket</coplet-instance-data>
+ <coplet-instance>basket</coplet-instance>
</coplet-layout>
</named-item>
<named-item name="Document">
<coplet-layout name="coplet">
- <coplet-instance-data>basket_document</coplet-instance-data>
+ <coplet-instance>basket_document</coplet-instance>
</coplet-layout>
</named-item>
<named-item name="Request">
<coplet-layout name="coplet">
- <coplet-instance-data>basket_request</coplet-instance-data>
+ <coplet-instance>basket_request</coplet-instance>
</coplet-layout>
</named-item>
<named-item name="Result">
<coplet-layout name="coplet">
- <coplet-instance-data>basket_result</coplet-instance-data>
+ <coplet-instance>basket_result</coplet-instance>
</coplet-layout>
</named-item>
<named-item name="Notepad">
<coplet-layout name="coplet">
- <coplet-instance-data>basket_notepad</coplet-instance-data>
+ <coplet-instance>basket_notepad</coplet-instance>
</coplet-layout>
</named-item>
<named-item name="Folder">
<coplet-layout name="coplet">
- <coplet-instance-data>basket_folder</coplet-instance-data>
+ <coplet-instance>basket_folder</coplet-instance>
</coplet-layout>
</named-item>
</composite-layout>
@@ -294,12 +294,12 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet" id="basket-content">
- <coplet-instance-data>basketcontent</coplet-instance-data>
+ <coplet-instance>basketcontent</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>basket_sample_7</coplet-instance-data>
+ <coplet-instance>basket_sample_7</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
@@ -310,17 +310,17 @@
<composite-layout name="column">
<item>
<coplet-layout name="coplet" >
- <coplet-instance-data>BasketAdmin</coplet-instance-data>
+ <coplet-instance>BasketAdmin</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet">
- <coplet-instance-data>Basket_admin</coplet-instance-data>
+ <coplet-instance>Basket_admin</coplet-instance>
</coplet-layout>
</item>
<item>
<coplet-layout name="coplet" id="basket-content-admin">
- <coplet-instance-data>basket_content</coplet-instance-data>
+ <coplet-instance>basket_content</coplet-instance>
</coplet-layout>
</item>
</composite-layout>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-tools-impl/src/main/java/org/apache/cocoon/portal/tools/copletManagement/LayoutActions.java Sun Jul 30 11:41:45 2006
@@ -25,9 +25,9 @@
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.cocoon.forms.formmodel.Repeater.RepeaterRow;
import org.apache.cocoon.portal.PortalException;
-import org.apache.cocoon.portal.coplet.CopletData;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
import org.apache.cocoon.portal.coplet.CopletFactory;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.layout.CompositeLayout;
import org.apache.cocoon.portal.layout.Item;
import org.apache.cocoon.portal.layout.Layout;
@@ -245,7 +245,7 @@
}
}
for(Iterator it = lets.iterator(); it.hasNext();) {
- CopletData cd = (CopletData) it.next();
+ CopletDefinition cd = (CopletDefinition) it.next();
String cdid = cd.getId();
for(Iterator it2 = coplets.iterator(); it2.hasNext();) {
String cdidTmp = (String) it2.next();
@@ -255,10 +255,10 @@
}
for(Iterator it = copletDatas.iterator(); it.hasNext();) {
- CopletData cd = (CopletData) it.next();
+ CopletDefinition cd = (CopletDefinition) it.next();
try {
- CopletInstanceData cinst = cf.newInstance(cd);
+ CopletInstance cinst = cf.newInstance(cd);
CopletLayout lay = (CopletLayout) lf.newInstance("coplet");
lay.setCopletInstanceData(cinst);
if(obj instanceof Item) {
@@ -279,7 +279,7 @@
return copletDatas;
}
- public CopletInstanceData getCopletInstanceData(String id) {
+ public CopletInstance getCopletInstanceData(String id) {
Object obj = getLayoutElement(layout, id, "", 1);
if(obj instanceof CopletLayout) {
return ((CopletLayout) obj).getCopletInstanceData();