cziegeler 02/05/08 01:26:50
Modified: . build.xml
src/webapp/docs/samples samples.xml
src/webapp/samples samples.xml
Added: src/webapp/sunspotdemo portaldemo-act.xpipe
portaldemo-int.xpipe portaldemo.xpipe
Removed: src/scratchpad/src/org/apache/cocoon/sunshine
sunshine-act.xmap sunshine-int.xpipe sunshine.xpipe
Log:
Moved portal demo out of scratchpad
Revision Changes Path
1.205 +6 -1 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- build.xml 5 May 2002 02:43:51 -0000 1.204
+++ build.xml 8 May 2002 08:26:50 -0000 1.205
@@ -1096,7 +1096,7 @@
<taskdef name="xconf-tool" classname="XConfToolTask"
classpath="${tools.dir}/anttasks"/>
- <!-- Invoke the XConfTool to add optional entries -->
+ <!-- Invoke the XConfTool to add optional entries for components -->
<xconf-tool directory="${build.src}"
extension="xmap"
configuration="${build.war}/sitemap.xmap"/>
@@ -1108,6 +1108,11 @@
<xconf-tool directory="${build.src}"
extension="xconf"
configuration="${build.war}/WEB-INF/cocoon.xconf"/>
+
+ <!-- Invoke the XConfTool to add optional entries for demos -->
+ <xconf-tool directory="${build.war}"
+ extension="xpipe"
+ configuration="${build.war}/sitemap.xmap"/>
</target>
<!-- ===================================================================
-->
1.12 +2 -4 xml-cocoon2/src/webapp/docs/samples/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/docs/samples/samples.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- samples.xml 6 Mar 2002 17:00:28 -0000 1.11
+++ samples.xml 8 May 2002 08:26:50 -0000 1.12
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- CVS: $Id: samples.xml,v 1.11 2002/03/06 17:00:28 nicolaken Exp $ -->
+<!-- CVS: $Id: samples.xml,v 1.12 2002/05/08 08:26:50 cziegeler Exp $ -->
<samples xmlns:xlink="http://www.w3.org/1999/xlink";>
@@ -58,9 +58,7 @@
</sample>
<sample name="Portal & Authentication" href="sunspotdemoportal">
- A customizable Portal with Cocoon. In order to run this
- sample, you have to build the Cocoon webapp with the
"-Dinclude.scratchpad.libs"
- option.
+ This is a demo of the portal framework integrated into Cocoon.
</sample>
<sample name="Sources" href="sub/">
1.4 +2 -4 xml-cocoon2/src/webapp/samples/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/samples.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- samples.xml 26 Mar 2002 08:08:49 -0000 1.3
+++ samples.xml 8 May 2002 08:26:50 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- CVS: $Id: samples.xml,v 1.3 2002/03/26 08:08:49 nicolaken Exp $ -->
+<!-- CVS: $Id: samples.xml,v 1.4 2002/05/08 08:26:50 cziegeler Exp $ -->
<samples xmlns:xlink="http://www.w3.org/1999/xlink";>
@@ -91,9 +91,7 @@
</sample>
<sample name="Portal & Authentication" href="sunspotdemoportal">
- A customizable Portal with Cocoon. In order to run this
- sample, you have to build the Cocoon webapp with the
"-Dinclude.scratchpad.libs"
- option.
+ This is a demo of the portal framework integrated into Cocoon.
</sample>
<sample name="Sources" href="sub/">
1.1 xml-cocoon2/src/webapp/sunspotdemo/portaldemo-act.xpipe
Index: portaldemo-act.xpipe
===================================================================
<?xml version="1.0"?>
<xpipe xpath="/sitemap/components/actions/[EMAIL
PROTECTED]'auth-protect']/handlers"
unless="[EMAIL PROTECTED]'sunspotdemohandler']">
<handler name="sunspotdemohandler"
xmlns:map="http://apache.org/cocoon/sitemap/1.0";
xmlns:sunshine="http://sunshine.sundn.de/sunshine/1.0";>
<redirect-to uri="cocoon://sunspotdemoportal"/>
<authentication
uri="cocoon:raw://sunspotdemoresource-sunrise-authuser"/>
<load-users
uri="cocoon:raw://sunspotdemoresource-sunrise-loaduser"/>
<load-roles
uri="cocoon:raw://sunspotdemoresource-sunrise-roles"/>
<new-user
uri="cocoon:raw://sunspotdemoresource-sunrise-newuser"/>
<new-role
uri="cocoon:raw://sunspotdemoresource-sunrise-newrole"/>
<change-user
uri="cocoon:raw://sunspotdemoresource-sunrise-changeuser"/>
<delete-role
uri="cocoon:raw://sunspotdemoresource-sunrise-delrole"/>
<delete-user
uri="cocoon:raw://sunspotdemoresource-sunrise-deluser"/>
<applications>
<application loadondemand="true" name="sunspotdemo">
<configuration name="portal">
<auth-redirect>sunspotdemo-portal</auth-redirect>
<portal-uri>sunspotdemo-portal</portal-uri>
<profile-cache>true</profile-cache>
<process-coplets-parallel>false</process-coplets-parallel>
<default-coplets-timeout>10000</default-coplets-timeout> <!-- milliseconds -->
<profile>
<layout-base
uri="sunspotdemo/profiles/layoutprofile.xml"/>
<coplet-base
uri="sunspotdemo/profiles/sunletprofile.xml"/>
<coplet-base-save
uri="sunspotdemo/profiles/sunletprofile.xml"/>
<type-base
uri="sunspotdemo/profiles/types.xml"/>
<admin-type-base
uri="sunspotdemo/profiles/admintypes.xml"/>
<global-delta-load
uri="sunspotdemo/profiles/globalprofile.xml"/>
<global-delta-save
uri="cocoon:raw://sunspotdemoresource-saveglobalprofile"/>
<role-delta-load
uri="cocoon:raw://sunspotdemoresource-roleprofile"/>
<role-delta-save
uri="cocoon:raw://sunspotdemoresource-saveroleprofile"/>
<user-delta-load
uri="cocoon:raw://sunspotdemoresource-userprofile"/>
<user-delta-save
uri="cocoon:raw://sunspotdemoresource-saveuserprofile"/>
<user-status-load
uri="cocoon:raw://sunspotdemoresource-userstatus"/>
<user-status-save
uri="cocoon:raw://sunspotdemoresource-saveuserstatus"/>
</profile>
</configuration>
</application>
</applications>
</handler>
</xpipe>
1.1 xml-cocoon2/src/webapp/sunspotdemo/portaldemo-int.xpipe
Index: portaldemo-int.xpipe
===================================================================
<?xml version="1.0"?>
<xpipe xpath="/sitemap/pipelines"
insert-before="[EMAIL PROTECTED]'optional']"
unless="pipeline/[EMAIL PROTECTED]'sunspotdemoresource-sunrise-*']">
<map:pipeline internal-only="true">
<!-- This is the Cocoon Demo Portal Pipeline -->
<map:match pattern="sunspotdemoresource-sunrise-*">
<!-- authentication -->
<map:match pattern="sunspotdemoresource-sunrise-authuser">
<map:generate
src="sunspotdemo/resources/sunrise-user.xml"/>
<map:transform
src="sunspotdemo/styles/sunrise-user.xsl">
<map:parameter name="use-request-parameters"
value="true"/>
</map:transform>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="sunspotdemoresource-sunrise-changeuser">
<map:generate
src="sunspotdemo/resources/sunrise-changeuser.xml"/>
<map:transform type="session"/>
<map:transform src="sunspotdemo/styles/changeuser.xsl"/>
<map:transform type="write-source"/>
<map:transform src="sunspotdemo/styles/portal.xsl"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="sunspotdemoresource-*">
<map:generate src="sunspotdemo/resources/{1}.xml"/>
<map:transform type="session"/>
<map:transform type="write-source"/>
<map:transform src="sunspotdemo/styles/portal.xsl"/>
<map:serialize type="xml"/>
</map:match>
</map:match>
</map:pipeline>
</xpipe>
1.1 xml-cocoon2/src/webapp/sunspotdemo/portaldemo.xpipe
Index: portaldemo.xpipe
===================================================================
<?xml version="1.0"?>
<xpipe xpath="/sitemap/pipelines/[EMAIL PROTECTED]'optional']"
unless="[EMAIL PROTECTED]'sunspotdemoportal']">
<!-- This is the Cocoon Demo Portal Pipeline -->
<map:match pattern="sunspotdemoportal">
<map:act type="auth-loggedIn">
<map:parameter name="handler"
value="sunspotdemohandler"/>
<map:redirect-to uri="sunspotdemo-portal"/>
</map:act>
<map:generate src="sunspotdemo/resources/free/portal.xml"/>
<map:transform src="sunspotdemo/styles/TO-html.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<!-- images -->
<map:match pattern="sunspotdemoimg-*.gif">
<map:read mime-type="image/gif"
src="sunspotdemo/images/{1}.gif"/>
</map:match>
<map:match pattern="sunspotdemoimg-*.jpg">
<map:read mime-type="image/jpg"
src="sunspotdemo/images/{1}.jpg"/>
</map:match>
<!-- free sites -->
<map:match pattern="sunspotdemofree-login">
<map:act type="auth-loggedIn">
<map:parameter name="handler"
value="sunspotdemohandler"/>
<map:redirect-to uri="sunspotdemo-portal"/>
</map:act>
<map:generate src="sunspotdemo/resources/free/login.xml"/>
<map:transform src="sunspotdemo/styles/login-html.xsl"/>
<map:transform src="sunspotdemo/styles/TO-html.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<map:match pattern="sunspotdemofree-auth">
<map:act type="auth-loggedIn">
<map:parameter name="handler"
value="sunspotdemohandler"/>
<map:redirect-to uri="sunspotdemo-loggedin"/>
</map:act>
<map:act type="auth-login">
<map:parameter name="handler" value="sunspotdemohandler"/>
<map:parameter name="parameter_name"
value="request:name"/>
<map:parameter name="parameter_password"
value="request:password"/>
<map:redirect-to uri="sunspotdemo-portal"/>
</map:act>
<map:generate src="sunspotdemo/resources/free/auth.xml"/>
<map:transform src="sunspotdemo/styles/TO-html.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<map:match pattern="sunspotdemofree-*">
<map:act type="auth-loggedIn">
<map:parameter name="handler"
value="sunspotdemohandler"/>
<map:redirect-to uri="sunspotdemo-portal"/>
</map:act>
<map:generate src="sunspotdemo/resources/free/{1}.xml"/>
<map:transform src="sunspotdemo/styles/TO-html.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<map:match pattern="sunspotdemo**">
<map:act type="auth-protect">
<map:parameter name="handler"
value="sunspotdemohandler"/>
<map:parameter name="application" value="sunspotdemo"/>
<map:match pattern="sunspotdemoresource-save*">
<map:generate
src="sunspotdemo/resources/save{1}.xml"/>
<map:transform type="session"/>
<map:transform type="write-source"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="sunspotdemoresource-*">
<map:generate
src="sunspotdemo/resources/{1}.xml"/>
<map:transform type="session"/>
<map:transform type="write-source"/>
<map:transform
src="sunspotdemo/styles/portal.xsl"/>
<map:serialize type="xml"/>
</map:match>
<!-- sunlets -->
<map:match pattern="sunspotdemosunlet-onlinesundn.xml">
<map:generate
src="http://www.s-und-n.de/aktuelles/news.xml"/>
<map:transform
src="sunspotdemo/styles/sunLet_sundnNews.xsl"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="sunspotdemosunlet-online-*.xml">
<map:generate
src="http://p.moreover.com/cgi-local/page?index_{1}+xml"/>
<map:transform
src="sunspotdemo/styles/sunLet_MoreoverDotCom.xsl"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="sunspotdemosunlet-customnews">
<map:generate
src="sunspotdemo/resources/auth/sunlet-customnews.xml"/>
<map:transform type="session"/>
<map:transform
src="sunspotdemo/styles/sunLet_MoreoverDotCom.xsl"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="sunspotdemosunletconf-*">
<map:generate
src="sunspotdemo/resources/auth/sunletconfig-{1}.xml"/>
<map:transform type="session"/>
<map:transform
src="sunspotdemo/styles/sunletconf.xsl"/>
<map:serialize type="xml"/>
</map:match>
<map:match pattern="sunspotdemosunlet-*.xml">
<map:generate
src="sunspotdemo/resources/auth/sunlet-{1}.xml"/>
<map:serialize type="xml"/>
</map:match>
<!-- auth sites -->
<map:match pattern="sunspotdemo-conf">
<map:generate type="portal-conf"/>
<map:transform
src="sunspotdemo/styles/portalconfHTML.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<map:match pattern="sunspotdemo-adminconf">
<!-- This pipeline can only be accessed if the
current user is
allowed to configure the 'administration' coplet
-->
<map:act type="portal-auth">
<map:parameter name="coplet"
value="administration"/>
</map:act>
<map:generate src="admin" type="portal-conf"/>
<map:transform
src="sunspotdemo/styles/portalconfHTML.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<map:match pattern="sunspotdemo-sunriseconf">
<!-- This pipeline can only be accessed if the
current user is
allowed to configure the 'administration' coplet
-->
<map:act type="portal-auth">
<map:parameter name="coplet"
value="administration"/>
</map:act>
<map:generate type="auth-conf"/>
<map:transform
src="sunspotdemo/styles/sunriseconfHTML.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<map:match pattern="sunspotdemo-sunriseedit">
<map:generate src="user" type="auth-conf"/>
<map:transform
src="sunspotdemo/styles/sunriseeditHTML.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<map:match pattern="sunspotdemo-portlets">
<map:generate type="portal"/>
<map:select type="browser">
<map:when test="explorer">
<map:transform
src="sunspotdemo/styles/portalHTML.xsl"/>
</map:when>
<map:when test="netscape">
<map:transform
src="sunspotdemo/styles/portalHTML-Netscape.xsl"/>
</map:when>
<map:otherwise>
<map:transform
src="sunspotdemo/styles/portalHTML.xsl"/>
</map:otherwise>
</map:select>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<map:match pattern="sunspotdemo-logout">
<map:act type="auth-logout"/>
<map:generate
src="sunspotdemo/resources/auth/logout.xml"/>
<map:transform
src="sunspotdemo/styles/TO-html.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
<map:match pattern="sunspotdemo-*">
<map:generate
src="sunspotdemo/resources/auth/{1}.xml"/>
<map:transform type="session"/>
<map:transform type="write-source"/>
<map:transform
src="sunspotdemo/styles/TO-html.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
</map:act>
</map:match>
</xpipe>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
