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 2005/09/01 11:42:40 UTC
svn commit: r265686 - in /cocoon/blocks: portal-sample/trunk/WEB-INF/
portal-sample/trunk/WEB-INF/xconf/ portal-sample/trunk/samples/
portal-sample/trunk/samples/coplets/basket/
portal-sample/trunk/samples/coplets/basket/xml/ portal-sample/trunk/sample...
Author: cziegeler
Date: Thu Sep 1 02:42:28 2005
New Revision: 265686
URL: http://svn.apache.org/viewcvs?rev=265686&view=rev
Log:
Create own block for portal sample
Modified:
cocoon/blocks/portal-sample/trunk/WEB-INF/portlet.xml
cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-tools.samplesxconf
cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf
cocoon/blocks/portal-sample/trunk/samples/coplets/basket/basket.js
cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sample.xml
cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sitemap.xmap
cocoon/blocks/portal-sample/trunk/samples/coplets/basket/xml/staticcoplet.xml
cocoon/blocks/portal-sample/trunk/samples/profiles/copletdata/portal.xml
cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap
cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap
cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/sitemap.xmap
cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
Modified: cocoon/blocks/portal-sample/trunk/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/WEB-INF/portlet.xml?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/WEB-INF/portlet.xml (original)
+++ cocoon/blocks/portal-sample/trunk/WEB-INF/portlet.xml Thu Sep 1 02:42:28 2005
@@ -170,7 +170,7 @@
<init-param>
<name>servlet-path</name>
- <value>samples/blocks/portal/portlets/hello</value>
+ <value>samples/blocks/portal-sample/portlets/hello</value>
</init-param>
<expiration-cache>-1</expiration-cache>
Modified: cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-tools.samplesxconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-tools.samplesxconf?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-tools.samplesxconf (original)
+++ cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal-tools.samplesxconf Thu Sep 1 02:42:28 2005
@@ -26,7 +26,7 @@
<component class="org.apache.cocoon.portal.tools.PortalToolManager"
role="org.apache.cocoon.portal.tools.PortalToolManager">
- <parameter name="root" value="context://samples/blocks/portal/tools/"/>
+ <parameter name="root" value="context://samples/blocks/portal-sample/tools/"/>
<parameter name="conf" value="conf.xml"/>
<parameter name="auth" value="auth.xml"/>
</component>
Modified: cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf (original)
+++ cocoon/blocks/portal-sample/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf Thu Sep 1 02:42:28 2005
@@ -43,10 +43,10 @@
-->
<!-- These are the skins the user can choose from: -->
<skins>
- <skin name="basic" base-path="context://samples/blocks/portal/skins/basic">
+ <skin name="basic" base-path="context://samples/blocks/portal-sample/skins/basic">
<thumbnail-path>images/thumb.jpg</thumbnail-path>
</skin>
- <skin name="common" base-path="context://samples/blocks/portal/skins/common">
+ <skin name="common" base-path="context://samples/blocks/portal-sample/skins/common">
<thumbnail-path>images/thumb.jpg</thumbnail-path>
</skin>
</skins>
Modified: cocoon/blocks/portal-sample/trunk/samples/coplets/basket/basket.js
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/coplets/basket/basket.js?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/coplets/basket/basket.js (original)
+++ cocoon/blocks/portal-sample/trunk/samples/coplets/basket/basket.js Thu Sep 1 02:42:28 2005
@@ -200,7 +200,7 @@
var profileManager = service.getComponentManager().getProfileManager();
var coplet = profileManager.getCopletInstanceData(copletId);
- var item = new Packages.org.apache.cocoon.portal.coplets.basket.ContentItem("cocoon://samples/blocks/portal/coplets/basket/copletwithappresult.showresult.flow", true);
+ var item = new Packages.org.apache.cocoon.portal.coplets.basket.ContentItem("cocoon://samples/blocks/portal-sample/coplets/basket/copletwithappresult.showresult.flow", true);
var event = new Packages.org.apache.cocoon.portal.coplets.basket.events.AddItemEvent(store, item);
service.getComponentManager().getEventManager().getPublisher().publish(event);
Modified: cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sample.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sample.xml?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sample.xml (original)
+++ cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sample.xml Thu Sep 1 02:42:28 2005
@@ -17,6 +17,6 @@
<!-- SVN $Id$ -->
<p xmlns:basket="http://apache.org/cocoon/portal/basket/1.0">
This is a sample for the basket portlet.<br/>
-<basket:add-item href="context://samples/blocks/portal/coplets/basket/sample.xml" content="true">Add the content</basket:add-item> 
-<basket:add-item href="context://samples/blocks/portal/coplets/basket/sample.xml">Add the link</basket:add-item>
+<basket:add-item href="context://samples/blocks/portal-sample/coplets/basket/sample.xml" content="true">Add the content</basket:add-item> 
+<basket:add-item href="context://samples/blocks/portal-sample/coplets/basket/sample.xml">Add the link</basket:add-item>
</p>
Modified: cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sitemap.xmap?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sitemap.xmap (original)
+++ cocoon/blocks/portal-sample/trunk/samples/coplets/basket/sitemap.xmap Thu Sep 1 02:42:28 2005
@@ -216,14 +216,14 @@
<map:parameter name="application" value="portal"/>
<map:select type="resource-exists">
- <map:when test="context://samples/blocks/portal/profiles/basket/quotas-user-{ID}.xml">
- <map:generate src="context://samples/blocks/portal/profiles/basket/quotas-user-{ID}.xml"/>
+ <map:when test="context://samples/blocks/portal-sample/profiles/basket/quotas-user-{ID}.xml">
+ <map:generate src="context://samples/blocks/portal-sample/profiles/basket/quotas-user-{ID}.xml"/>
</map:when>
- <map:when test="context://samples/blocks/portal/profiles/basket/quotas-role-{role}.xml">
- <map:generate src="context://samples/blocks/portal/profiles/basket/quotas-role-{role}.xml"/>
+ <map:when test="context://samples/blocks/portal-sample/profiles/basket/quotas-role-{role}.xml">
+ <map:generate src="context://samples/blocks/portal-sample/profiles/basket/quotas-role-{role}.xml"/>
</map:when>
<map:otherwise>
- <map:generate src="context://samples/blocks/portal/profiles/basket/quotas.xml"/>
+ <map:generate src="context://samples/blocks/portal-sample/profiles/basket/quotas.xml"/>
</map:otherwise>
</map:select>
<map:transform src="xsl/quota2result.xsl">
Modified: cocoon/blocks/portal-sample/trunk/samples/coplets/basket/xml/staticcoplet.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/coplets/basket/xml/staticcoplet.xml?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/coplets/basket/xml/staticcoplet.xml (original)
+++ cocoon/blocks/portal-sample/trunk/samples/coplets/basket/xml/staticcoplet.xml Thu Sep 1 02:42:28 2005
@@ -17,10 +17,10 @@
<!-- SVN $Id$ -->
<p xmlns:basket="http://apache.org/cocoon/portal/basket/1.0">
This is a sample for the basket portlet.<br/>
- <basket:add-item href="context://samples/blocks/portal/coplets/basket/sample.xml" content="true">Add the content</basket:add-item> 
- <basket:add-item href="context://samples/blocks/portal/coplets/basket/sample.xml">Add the link</basket:add-item>  
- <basket:add-item store="briefcase" href="context://samples/blocks/portal/coplets/basket/sample.xml" content="true">Add the content to the briefcase</basket:add-item> 
- <basket:add-item store="briefcase" href="context://samples/blocks/portal/coplets/basket/sample.xml">Add the link to the briefcase</basket:add-item>
+ <basket:add-item href="context://samples/blocks/portal-sample/coplets/basket/sample.xml" content="true">Add the content</basket:add-item> 
+ <basket:add-item href="context://samples/blocks/portal-sample/coplets/basket/sample.xml">Add the link</basket:add-item>  
+ <basket:add-item store="briefcase" href="context://samples/blocks/portal-sample/coplets/basket/sample.xml" content="true">Add the content to the briefcase</basket:add-item> 
+ <basket:add-item store="briefcase" href="context://samples/blocks/portal-sample/coplets/basket/sample.xml">Add the link to the briefcase</basket:add-item>
<jx:if test="#{isBasketFull}" xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
<br/><b>You have reached the allowed quota for your basket.</b>
</jx:if>
Modified: cocoon/blocks/portal-sample/trunk/samples/profiles/copletdata/portal.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/profiles/copletdata/portal.xml?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/profiles/copletdata/portal.xml (original)
+++ cocoon/blocks/portal-sample/trunk/samples/profiles/copletdata/portal.xml Thu Sep 1 02:42:28 2005
@@ -248,7 +248,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/content</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/content</value>
</attribute>
</coplet-data>
<coplet-data id="BasketAdmin" name="standard">
@@ -256,7 +256,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/basket-admin</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/basket-admin</value>
</attribute>
</coplet-data>
<coplet-data id="Basket" name="standard">
@@ -264,7 +264,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/basket</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/basket</value>
</attribute>
</coplet-data>
<coplet-data id="Basket.admin" name="standard">
@@ -272,7 +272,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/basket.admin</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/basket.admin</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleStaticCoplet" name="standard">
@@ -284,7 +284,7 @@
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/staticcoplet.add.preflow</value>
+ <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" name="standard">
@@ -296,7 +296,7 @@
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithattr.add.preflow</value>
+ <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" name="standard">
@@ -308,7 +308,7 @@
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithinline.add.preflow</value>
+ <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" name="standard">
@@ -328,11 +328,11 @@
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/application</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/application</value>
</attribute>
<attribute>
<name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithinput.add.flow</value>
+ <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" name="standard">
@@ -344,7 +344,7 @@
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithinputshow.changeTitle.preflow</value>
+ <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" name="standard">
@@ -364,11 +364,11 @@
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/application</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/application</value>
</attribute>
<attribute>
<name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithapp.add.flow</value>
+ <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" name="standard">
@@ -388,11 +388,11 @@
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/application</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/application</value>
</attribute>
<attribute>
<name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletlist</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/copletlist</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleCopletWithUpload" name="standard">
@@ -404,7 +404,7 @@
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithupload.add.preflow</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal-sample/coplets/basket/copletwithupload.add.preflow</value>
</attribute>
</coplet-data>
@@ -483,7 +483,7 @@
</attribute>
<attribute>
<name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/samples/form</value>
+ <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" name="standard">
Modified: cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap (original)
+++ cocoon/blocks/portal-sample/trunk/samples/sitemap-auth.xmap Thu Sep 1 02:42:28 2005
@@ -169,7 +169,7 @@
<map:match pattern="save-user-profile">
<map:generate src="resources/save-user-profile.xml"/>
<map:transform src="styles/save-user-profile.xsl">
- <map:parameter name="profiles" value="context://samples/blocks/portal/profiles/"/>
+ <map:parameter name="profiles" value="context://samples/blocks/portal-sample/profiles/"/>
</map:transform>
<map:transform type="session"/>
<map:transform type="write-source"/>
Modified: cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap (original)
+++ cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap Thu Sep 1 02:42:28 2005
@@ -142,7 +142,7 @@
<map:match pattern="save-user-profile">
<map:generate src="resources/save-user-profile.xml"/>
<map:transform src="styles/save-user-profile.xsl">
- <map:parameter name="profiles" value="context://samples/blocks/portal/profiles/"/>
+ <map:parameter name="profiles" value="context://samples/blocks/portal-sample/profiles/"/>
</map:transform>
<map:transform type="session"/>
<map:transform type="write-source"/>
Modified: cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/sitemap.xmap?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/sitemap.xmap (original)
+++ cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/sitemap.xmap Thu Sep 1 02:42:28 2005
@@ -37,9 +37,9 @@
</map:match>
<map:match pattern="save-user-profile">
- <map:generate src="context://samples/blocks/portal/resources/save-user-profile.xml"/>
- <map:transform src="context://samples/blocks/portal/styles/save-user-profile.xsl">
- <map:parameter name="profiles" value="context://samples/blocks/portal/profiles/"/>
+ <map:generate src="context://samples/blocks/portal-sample/resources/save-user-profile.xml"/>
+ <map:transform src="context://samples/blocks/portal-sample/styles/save-user-profile.xsl">
+ <map:parameter name="profiles" value="context://samples/blocks/portal-sample/profiles/"/>
</map:transform>
<map:transform type="session"/>
<map:transform type="write-source"/>
Modified: cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf?rev=265686&r1=265685&r2=265686&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf (original)
+++ cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.xconf Thu Sep 1 02:42:28 2005
@@ -36,8 +36,9 @@
<component-instance name="coplet" class="org.apache.cocoon.portal.components.modules.input.CopletModule" logger="portal"/>
<component-instance name="portal-layout" class="org.apache.cocoon.portal.components.modules.input.LayoutModule" logger="portal"/>
<component-instance name="portal-skin" class="org.apache.cocoon.portal.components.modules.input.SkinModule" logger="portal"/>
+ <!-- FIXME: THIS HAS TO BE PORTAL DEPENDENT AND NOT GLOBAL -->
<component-instance name="portalpath" class="org.apache.cocoon.components.modules.input.ProjectPathModule" logger="portal">
- <uri-prefix>samples/blocks/portal/</uri-prefix>
+ <uri-prefix>samples/blocks/portal-sample/</uri-prefix>
</component-instance>
</input-modules>