cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/webapp/sunspotdemo/styles portalHTML-Netscape.xsl portalHTML.xsl portalconfHTML.xsl sunLet_MoreoverDotCom.xsl sunLet_sundnNews.xsl sunletconf.xsl sunriseconfHTML.xsl sunriseeditHTML.xsl
Date Thu, 18 Apr 2002 08:13:42 GMT
cziegeler    02/04/18 01:13:42

  Modified:    src/scratchpad/src/org/apache/cocoon/sunshine/transformation
                        InsertTransformer.java
               src/webapp/sunspotdemo/profiles admintypes.xml
                        globalprofile.xml layoutprofile.xml
                        roleprofile-admin.xml roleprofile-guest.xml
                        sunletprofile.xml types.xml
               src/webapp/sunspotdemo/resources roleprofile.xml
                        saveglobalprofile.xml saveroleprofile.xml
                        saveuserprofile.xml saveuserstatus.xml
                        sunrise-changeuser.xml sunrise-delrole.xml
                        sunrise-deluser.xml sunrise-loaduser.xml
                        sunrise-newrole.xml sunrise-newuser.xml
                        userprofile.xml userstatus.xml
               src/webapp/sunspotdemo/resources/auth portal.xml
                        sunlet-customnews.xml sunlet-feedback.xml
                        sunletconfig-customnews.xml
               src/webapp/sunspotdemo/resources/free login.xml
               src/webapp/sunspotdemo/styles portalHTML-Netscape.xsl
                        portalHTML.xsl portalconfHTML.xsl
                        sunLet_MoreoverDotCom.xsl sunLet_sundnNews.xsl
                        sunletconf.xsl sunriseconfHTML.xsl
                        sunriseeditHTML.xsl
  Added:       src/webapp/sunspotdemo/profiles userprofile-cocoon.xml
  Removed:     src/scratchpad/src/org/apache/cocoon/sunshine SunShine.java
                        SunShineConstants.java sunshine-act.xmap
                        sunshine-gen.xmap sunshine-int.xpipe
                        sunshine-tran.xmap sunshine.xconf sunshine.xpipe
               src/scratchpad/src/org/apache/cocoon/sunshine/acting
                        SessionAction.java
               src/scratchpad/src/org/apache/cocoon/sunshine/components
                        AbstractSunShineComponent.java
               src/scratchpad/src/org/apache/cocoon/sunshine/connector
                        Resource.java ResourceConnector.java
                        ResourceConnectorImpl.java XMLLoader.java
                        XMLSaver.java
               src/scratchpad/src/org/apache/cocoon/sunshine/context
                        RequestSessionContext.java
                        ResponseSessionContext.java SessionContext.java
                        SessionContextProvider.java
                        SimpleSessionContext.java
                        StandardSessionContextProvider.java
               src/scratchpad/src/org/apache/cocoon/sunshine/helpers
                        URLRewriter.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunrise
                        ApplicationHandler.java Constants.java Handler.java
                        SunRise.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/acting
                        AuthAction.java LoggedInAction.java
                        LoginAction.java LogoutAction.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/context
                        SessionContextImpl.java
                        SessionContextProviderImpl.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/generation
                        ConfigurationGenerator.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunrise/selection
                        MediaSelector.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunspot
                        Constants.java SunSpot.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/acting
                        AuthAction.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/context
                        SessionContextImpl.java
                        SessionContextProviderImpl.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/generation
                        ConfigurationGenerator.java PortalGenerator.java
               src/scratchpad/src/org/apache/cocoon/sunshine/sunspot/sunlet
                        SunLetThread.java Sunlet.java
               src/scratchpad/src/org/apache/cocoon/sunshine/transformation
                        AbstractSunShineTransformer.java
                        SunShineConnectTransformer.java
                        SunShinePostTransformer.java
                        SunShinePreTransformer.java
                        SunShineTransformer.java
               src/scratchpad/src/org/apache/cocoon/sunshine/xml
                        NodeListImpl.java XMLUtil.java
               src/webapp/sunspotdemo/profiles userprofile-sunshine.xml
                        userstatus-sunshine.xml
  Log:
  Removed obsolete scratchpad classes, start converting portal demo
  
  Revision  Changes    Path
  1.5       +6 -6      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/InsertTransformer.java
  
  Index: InsertTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/transformation/InsertTransformer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- InsertTransformer.java	2 Apr 2002 14:23:45 -0000	1.4
  +++ InsertTransformer.java	18 Apr 2002 08:13:40 -0000	1.5
  @@ -57,9 +57,9 @@
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.environment.Source;
   import org.apache.cocoon.xml.XMLUtils;
  -import org.apache.cocoon.sunshine.SunShineConstants;
  -import org.apache.cocoon.sunshine.connector.ResourceConnector;
  -import org.apache.cocoon.sunshine.xml.XMLUtil;
  +import org.apache.cocoon.webapps.session.SessionConstants;
  +import org.apache.cocoon.webapps.session.connector.ResourceConnector;
  +import org.apache.cocoon.webapps.session.xml.XMLUtil;
   
   /**
    * This implementation allows the inserting of an xml fragment into a
  @@ -112,10 +112,10 @@
    * reinsert a replaced node at a given path in the new fragment.
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: InsertTransformer.java,v 1.4 2002/04/02 14:23:45 cziegeler Exp $
  + * @version CVS $Id: InsertTransformer.java,v 1.5 2002/04/18 08:13:40 cziegeler Exp $
   */
   public class InsertTransformer
  -extends AbstractSunShineTransformer {
  +extends org.apache.cocoon.webapps.session.transformation.AbstractSessionTransformer {
   
      /**
        * Elements
  @@ -149,7 +149,7 @@
        * Default constructor
        */
       public InsertTransformer() {
  -        this.namespaceURI = SunShineConstants.SUNSHINE_NAMESPACE_URI;
  +        this.namespaceURI = SessionConstants.SESSION_NAMESPACE_URI;
       }
   
       public void setupTransforming()
  
  
  
  1.2       +14 -14    xml-cocoon2/src/webapp/sunspotdemo/profiles/admintypes.xml
  
  Index: admintypes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/profiles/admintypes.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- admintypes.xml	18 Feb 2002 09:10:11 -0000	1.1
  +++ admintypes.xml	18 Apr 2002 08:13:40 -0000	1.2
  @@ -1,5 +1,5 @@
   <?xml version="1.0" standalone="yes"?>
  -<!-- $Id: admintypes.xml,v 1.1 2002/02/18 09:10:11 cziegeler Exp $ 
  +<!-- $Id: admintypes.xml,v 1.2 2002/04/18 08:13:40 cziegeler Exp $ 
   
    Description: The type profile
   
  @@ -8,7 +8,7 @@
   <type-profile>
   
      	 <typedefs>
  -		<!-- The following types are defined by sunSpot: (Names are casesensitiv!)
  +		<!-- The following types are defined by the portal engine: (Names are casesensitiv!)
                     	      STRING, BOOLEAN, ENUMERATION, INTEGER, CARDINAL -->
   		<typedef name="backgroundcolor" type="ENUMERATION">
   			<value name="white">#ffffff</value>
  @@ -63,7 +63,7 @@
   			<value name="light-green">#ABBEAB</value>
   			<value name="green">#4A594A</value>
   		</typedef>
  -		<typedef name="sunletsize" type="ENUMERATION">
  +		<typedef name="copletsize" type="ENUMERATION">
   			<value name="Maximized">max</value>
   			<value name="Minimized">min</value>
   		</typedef>
  @@ -92,30 +92,30 @@
   			<columns><number type="columnnumber" description="Amount"/></columns>
   		</portal>
   		</layout-profile>
  -		<sunlets-profile>
  -			<sunlets>
  -				<sunlet id="*">
  +		<coplets-profile>
  +			<coplets>
  +				<coplet id="*">
   					<configuration>
   						<mandatory type="BOOLEAN" description="Required"/>
   						<sizable type="BOOLEAN" description="Resizable"/>
   						<active type="BOOLEAN" description="Active"/>
   					</configuration>
   					<title type="STRING" description="Title"/>
  -				</sunlet>
  -			</sunlets>
  -		</sunlets-profile>
  +				</coplet>
  +			</coplets>
  +		</coplets-profile>
   		<portal-profile>
   			<content>
   				<column position="*">
   					<width type="CARDINAL" description="Width"/>
  -					<sunlets>
  -						<sunlet id="*" position="*" number="*">
  +					<coplets>
  +						<coplet id="*" position="*" number="*">
   							<status>
   								<visible type="BOOLEAN" description="Visibile"/>
  -								<size type="sunletsize" description="Size"/>
  +								<size type="copletsize" description="Size"/>
   							</status>
  -						</sunlet>
  -					</sunlets>
  +						</coplet>
  +					</coplets>
   				</column>
   			</content>
   		</portal-profile>
  
  
  
  1.2       +22 -22    xml-cocoon2/src/webapp/sunspotdemo/profiles/globalprofile.xml
  
  Index: globalprofile.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/profiles/globalprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- globalprofile.xml	18 Feb 2002 09:10:11 -0000	1.1
  +++ globalprofile.xml	18 Apr 2002 08:13:40 -0000	1.2
  @@ -1,71 +1,71 @@
   <?xml version="1.0"?>
  -<!-- $Id: globalprofile.xml,v 1.1 2002/02/18 09:10:11 cziegeler Exp $ 
  +<!-- $Id: globalprofile.xml,v 1.2 2002/04/18 08:13:40 cziegeler Exp $ 
   -->
   <global-delta>
   	<layout-delta>
   	 </layout-delta>
   
  -	<sunlets-delta>
  -	</sunlets-delta>
  +	<coplets-delta>
  +	</coplets-delta>
   
   	<portal-profile>
    
   	<content>
   		<header>
  -     			<sunlet id="personalize" position="1" number="1">
  +     			<coplet id="personalize" position="1" number="1">
   				<status>
   					<visible>true</visible>
    	    					<size>max</size>
   					</status>
  -				</sunlet>
  +				</coplet>
   		</header>
   		<column position="1">
   			<width>28%</width>
  -			<sunlets>
  -     				<sunlet id="administration" position="1" number="2">
  +			<coplets>
  +     				<coplet id="administration" position="1" number="2">
     					<status>
           						<visible>true</visible>
       	    					<size>max</size>
   					</status>
  -				</sunlet>
  -				<sunlet id="sundnnews" position="2" number="8">
  +				</coplet>
  +				<coplet id="sundnnews" position="2" number="8">
     					<status>
          					<visible>true</visible>
       	    					<size>max</size>
   					</status>
  -				</sunlet>
  -			</sunlets>
  +				</coplet>
  +			</coplets>
       		</column>
     
   		 <column position="2">
   			<width>50%</width>
  -			<sunlets>
  -				<sunlet id="customnews" position="1" number="7">
  +			<coplets>
  +				<coplet id="customnews" position="1" number="7">
     					<status>
          					<visible>true</visible>
       	    					<size>max</size>
   					</status>
  -				</sunlet>
  -				<sunlet id="feedback" position="3" number="9">        
  +				</coplet>
  +				<coplet id="feedback" position="3" number="9">        
   					<status>
   					      <visible>true</visible>               
   						<size>max</size>      
   					</status>     
  -				</sunlet>
  -			</sunlets>
  +				</coplet>
  +			</coplets>
      		</column>
    		
   		 <column position="3">
   			<width>22%</width>
  -			<sunlets>
  -      				<sunlet id="germany" position="2" number="9">
  +			<coplets>
  +      				<coplet id="germany" position="2" number="9">
     					<status>
           					<visible>true</visible>
        	   					<size>max</size>
   					</status>
  -				</sunlet>
  +				</coplet>
   
  -			</sunlets>
  +			</coplets>
      		</column>
   	
    	</content>
  @@ -74,7 +74,7 @@
   <personal-profile>
   	<greeting>Welcome</greeting>
   	<messages>
  -		<sunlet_not_available>The sunLet is currently not available.</sunlet_not_available>
  +		<coplet_not_available>The coplet is currently not available.</coplet_not_available>
   	</messages>
   </personal-profile>
   
  
  
  
  1.2       +6 -6      xml-cocoon2/src/webapp/sunspotdemo/profiles/layoutprofile.xml
  
  Index: layoutprofile.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/profiles/layoutprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- layoutprofile.xml	18 Feb 2002 09:10:11 -0000	1.1
  +++ layoutprofile.xml	18 Apr 2002 08:13:40 -0000	1.2
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<!-- $Id: layoutprofile.xml,v 1.1 2002/02/18 09:10:11 cziegeler Exp $ 
  +<!-- $Id: layoutprofile.xml,v 1.2 2002/04/18 08:13:40 cziegeler Exp $ 
   
   -->
   
  @@ -21,23 +21,23 @@
            				</layout>
         			</layouts>
   			
  -			  <!-- The following means that the sunSpot portal has a header area -->
  +			  <!-- The following means that the portal has a header area -->
     			<header>
   				<exists>true</exists>
     			</header>
     			
  -			<!-- The following means that sunSpot has 3 columns -->
  +			<!-- The following means that the portal has 3 columns -->
   			<columns>
   				<number>3</number>
   			</columns>
   
  -  			<!-- The following means that the sunSpot has a footer area -->
  +  			<!-- The following means that the portal has a footer area -->
     			<footer>
   				<exists>false</exists>
     			</footer>
   		</portal>
   
  -		<sunlets>
  +		<coplets>
   			<layouts>
           				<layout>
   					<title>
  @@ -62,7 +62,7 @@
   					</content>
   				</layout>
   			</layouts>
  - 		</sunlets>
  + 		</coplets>
   
   	</layout-profile>
   
  
  
  
  1.2       +7 -7      xml-cocoon2/src/webapp/sunspotdemo/profiles/roleprofile-admin.xml
  
  Index: roleprofile-admin.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/profiles/roleprofile-admin.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- roleprofile-admin.xml	18 Feb 2002 09:10:11 -0000	1.1
  +++ roleprofile-admin.xml	18 Apr 2002 08:13:40 -0000	1.2
  @@ -1,16 +1,16 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  -<!-- $Id: roleprofile-admin.xml,v 1.1 2002/02/18 09:10:11 cziegeler Exp $ 
  +<!-- $Id: roleprofile-admin.xml,v 1.2 2002/04/18 08:13:40 cziegeler Exp $ 
   
   -->
   <role-delta>
  -	<sunlets-delta>
  -		<sunlets>
  -			<sunlet id="administration">
  +	<coplets-delta>
  +		<coplets>
  +			<coplet id="administration">
   				<configuration>
          					<active>true</active> <!-- this is only active for admins -->  
       				</configuration>
  -			</sunlet>
  +			</coplet>
   
  -		</sunlets>
  -	</sunlets-delta>
  +		</coplets>
  +	</coplets-delta>
   </role-delta>
  
  
  
  1.2       +27 -27    xml-cocoon2/src/webapp/sunspotdemo/profiles/roleprofile-guest.xml
  
  Index: roleprofile-guest.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/profiles/roleprofile-guest.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- roleprofile-guest.xml	18 Feb 2002 09:10:11 -0000	1.1
  +++ roleprofile-guest.xml	18 Apr 2002 08:13:40 -0000	1.2
  @@ -1,79 +1,79 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<!-- $Id: roleprofile-guest.xml,v 1.1 2002/02/18 09:10:11 cziegeler Exp $ 
  +<!-- $Id: roleprofile-guest.xml,v 1.2 2002/04/18 08:13:40 cziegeler Exp $ 
   
    Description: The delta for the guest role
  -              Disable the sunLet personalize
  -              Add a new sunLet personalize-guest
  +              Disable the coplet personalize
  +              Add a new coplet personalize-guest
   
   -->
   <role-delta>
  -	<sunlets-delta>
  -		<sunlets>
  -			<sunlet id="personalize">
  +	<coplets-delta>
  +		<coplets>
  +			<coplet id="personalize">
   				<configuration>
          					<active>false</active> <!-- this is not active for guests -->  
       				</configuration>
  -			</sunlet>
  -			<sunlet id="personalizeguest">
  +			</coplet>
  +			<coplet id="personalizeguest">
        				<configuration>  
          				<active>true</active>  
       				</configuration>
  -			</sunlet>
  -		</sunlets>
  -	</sunlets-delta>
  +			</coplet>
  +		</coplets>
  +	</coplets-delta>
   
   <portal-profile>
    
   	<content>
   		<header>
  -     			<sunlet id="personalizeguest" position="1" number="1">
  +     			<coplet id="personalizeguest" position="1" number="1">
   				<status>
   					<visible>true</visible>
      					<size>max</size>
   				</status>
  -			</sunlet>
  +			</coplet>
   		</header>
   		<column position="1">
   			<width>28%</width>
  -			<sunlets>
  -				<sunlet id="sundnnews" position="2" number="8">
  +			<coplets>
  +				<coplet id="sundnnews" position="2" number="8">
     					<status>
          					<visible>true</visible>
       	    					<size>max</size>
   					</status>
  -				</sunlet>
  -			</sunlets>
  +				</coplet>
  +			</coplets>
       		</column>
     
   		 <column position="2">
   			<width>50%</width>
  -			<sunlets>
  -				<sunlet id="customnews" position="1" number="7">
  +			<coplets>
  +				<coplet id="customnews" position="1" number="7">
     					<status>
          					<visible>true</visible>
       	    					<size>max</size>
   					</status>
  -				</sunlet>
  -				<sunlet id="feedback" position="3" number="9">        
  +				</coplet>
  +				<coplet id="feedback" position="3" number="9">        
   					<status>
   					      <visible>true</visible>               
   						<size>max</size>      
   					</status>     
  -				</sunlet>
  -			</sunlets>
  +				</coplet>
  +			</coplets>
      		</column>
    		
   		 <column position="3">
   			<width>22%</width>
  -			<sunlets>
  -      				<sunlet id="germany" position="2" number="9">
  +			<coplets>
  +      				<coplet id="germany" position="2" number="9">
     					<status>
           					<visible>true</visible>
        	   					<size>max</size>
   					</status>
  -				</sunlet>
  +				</coplet>
   
  -			</sunlets>
  +			</coplets>
      		</column>
   	
    	</content>
  
  
  
  1.3       +21 -21    xml-cocoon2/src/webapp/sunspotdemo/profiles/sunletprofile.xml
  
  Index: sunletprofile.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/profiles/sunletprofile.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sunletprofile.xml	20 Feb 2002 16:07:26 -0000	1.2
  +++ sunletprofile.xml	18 Apr 2002 08:13:40 -0000	1.3
  @@ -1,9 +1,9 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  -<!-- $Id: sunletprofile.xml,v 1.2 2002/02/20 16:07:26 cziegeler Exp $ 
  +<!-- $Id: sunletprofile.xml,v 1.3 2002/04/18 08:13:40 cziegeler Exp $ 
   -->
  -<sunlets-profile>
  - 	<sunlets>  
  -		<sunlet id="sundnnews">
  +<coplets-profile>
  + 	<coplets>  
  +		<coplet id="sundnnews">
    			<resource uri="cocoon:raw://sunspotdemosunlet-onlinesundn.xml"/>
        			<configuration>  
          				<mandatory>false</mandatory>
  @@ -17,8 +17,8 @@
           				<visible>true</visible>
           				<size>max</size>
   			</status>
  -		</sunlet>
  -		<sunlet id="banknews">
  +		</coplet>
  +		<coplet id="banknews">
       			<resource uri="cocoon:raw://sunspotdemosunlet-online-banking.xml"/>
        			<configuration>  
          			<mandatory>false</mandatory>
  @@ -31,8 +31,8 @@
          			<visible>true</visible>
           			<size>max</size>
   			</status>
  -		</sunlet>
  -		<sunlet id="customnews">
  +		</coplet>
  +		<coplet id="customnews">
       			<resource uri="cocoon:raw://sunspotdemosunlet-customnews"/>
       			<customization uri="cocoon:raw://sunspotdemosunletconf-customnews"/>
        			<configuration>  
  @@ -47,8 +47,8 @@
           			<visible>true</visible>
           			<size>max</size>
   			</status>
  -		</sunlet>
  -		<sunlet id="germany">
  +		</coplet>
  +		<coplet id="germany">
       			<resource uri="cocoon:raw://sunspotdemosunlet-online-germany.xml"/>
        			<configuration>  
          				<mandatory>false</mandatory>
  @@ -61,8 +61,8 @@
           				<visible>true</visible>
           				<size>max</size>
   			</status>
  -		</sunlet>
  -		<sunlet id="feedback">
  +		</coplet>
  +		<coplet id="feedback">
       			<resource uri="cocoon:raw://sunspotdemosunlet-feedback.xml"/>
        			<configuration>  
          				<mandatory>false</mandatory>
  @@ -74,8 +74,8 @@
           				<visible>true</visible>
           				<size>max</size>
   			</status>
  -		</sunlet>
  -		<sunlet id="administration">
  +		</coplet>
  +		<coplet id="administration">
       			<resource uri="cocoon:raw://sunspotdemosunlet-administration.xml"/>
        			<configuration>  
          				<mandatory>false</mandatory>
  @@ -87,8 +87,8 @@
           				<visible>true</visible>
           				<size>max</size>
   			</status>
  -		</sunlet>
  -		<sunlet id="personalize">
  +		</coplet>
  +		<coplet id="personalize">
       			<resource uri="cocoon:raw://sunspotdemosunlet-personalize.xml"/>
        			<configuration>  
          				<mandatory>true</mandatory>
  @@ -100,8 +100,8 @@
           				<visible>true</visible>
           				<size>max</size>
   			</status>
  -		</sunlet>
  -		<sunlet id="personalizeguest">
  +		</coplet>
  +		<coplet id="personalizeguest">
      			<resource uri="cocoon:raw://sunspotdemosunlet-personalizeguest.xml"/>
   			<configuration>  
        				<mandatory>true</mandatory>
  @@ -113,6 +113,6 @@
        				<visible>true</visible>
        				<size>max</size>
   			</status>
  -		</sunlet>
  -	</sunlets>
  -</sunlets-profile>
  +		</coplet>
  +	</coplets>
  +</coplets-profile>
  
  
  
  1.2       +8 -8      xml-cocoon2/src/webapp/sunspotdemo/profiles/types.xml
  
  Index: types.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/profiles/types.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- types.xml	18 Feb 2002 09:10:11 -0000	1.1
  +++ types.xml	18 Apr 2002 08:13:40 -0000	1.2
  @@ -1,5 +1,5 @@
   <?xml version="1.0" standalone="yes"?>
  -<!-- $Id: types.xml,v 1.1 2002/02/18 09:10:11 cziegeler Exp $ 
  +<!-- $Id: types.xml,v 1.2 2002/04/18 08:13:40 cziegeler Exp $ 
   
    Description: The type profile
   
  @@ -8,7 +8,7 @@
   <type-profile>
   
      	 <typedefs>
  -		<!-- The following types are defined by sunSpot: (Names are casesensitiv!)
  +		<!-- The following types are defined by the portal engine: (Names are casesensitiv!)
                     	      STRING, BOOLEAN, ENUMERATION, INTEGER, CARDINAL -->
   		<typedef name="backgroundcolor" type="ENUMERATION">
   			<value name="white">#ffffff</value>
  @@ -63,7 +63,7 @@
   			<value name="light-green">#ABBEAB</value>
   			<value name="green">#4A594A</value>
   		</typedef>
  -		<typedef name="sunletsize" type="ENUMERATION">
  +		<typedef name="copletsize" type="ENUMERATION">
   			<value name="Maximized">max</value>
   			<value name="Minimized">min</value>
   		</typedef>
  @@ -94,14 +94,14 @@
   			<content>
   				<column position="*">
   					<width type="CARDINAL" description="Width"/>
  -					<sunlets>
  -						<sunlet id="*" position="*" number="*">
  +					<coplets>
  +						<coplet id="*" position="*" number="*">
   							<status>
   								<visible type="BOOLEAN" description="Visibile"/>
  -								<size type="sunletsize" description="Size"/>
  +								<size type="copletsize" description="Size"/>
   							</status>
  -						</sunlet>
  -					</sunlets>
  +						</coplet>
  +					</coplets>
   				</column>
   			</content>
   		</portal-profile>
  
  
  
  1.1                  xml-cocoon2/src/webapp/sunspotdemo/profiles/userprofile-cocoon.xml
  
  Index: userprofile-cocoon.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- $Id: userprofile-cocoon.xml,v 1.1 2002/04/18 08:13:40 cziegeler Exp $ 
  
  -->
  <user-delta>
  	<portal-profile>    
  		<content>   
  			<header>           
  				<coplet id="personalize" position="1" number="1">        
  					<status>               
  						<visible>true</visible>               
  						<size>max</size>      
  					</status>     
  				</coplet>   
  			</header>   
  			<column position="1">    
  				<width>28%</width>    
  					<coplets>           
  						<coplet id="administration" position="1" number="2">        
  							<status>               
  								<visible>true</visible>               
  								<size>max</size>      
  							</status>     
  						</coplet>                                
  					</coplets>       
  			</column>       
  			<column position="2">    
  				<width>50%</width>    
  					<coplets>     
  						<coplet id="customnews" position="1" number="5">        
  							<status>              
  								<visible>true</visible>               
  								<size>max</size>      
  							</status>     
  						</coplet>    
  						<coplet id="feedback" position="2" number="7">        
  							<status>             
  								<visible>true</visible>               
  								<size>max</size>      
  							</status>     
  						</coplet>
  					</coplets>      
  			</column>        
  			<column position="3">    
  				<width>22%</width>    
  					<coplets>           
  						<coplet id="germany" position="2" number="9">        
  							<status>              
  								<visible>true</visible>               
  								<size>max</size>      
  							</status>     
  						</coplet>     
  					</coplets>      
  			</column>     
  		</content> 
  	</portal-profile>
  	<layout-delta>
  		<portal>
  			<layouts>
  				<layout>
  					<background>
  						<color>#ffffff</color>
  					</background>
  				</layout>
  			</layouts>
  		</portal>
  	</layout-delta>
  </user-delta>
  
  
  
  1.2       +6 -6      xml-cocoon2/src/webapp/sunspotdemo/resources/roleprofile.xml
  
  Index: roleprofile.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/roleprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- roleprofile.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ roleprofile.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,11 +1,11 @@
   <?xml version="1.0"?>
  -<!-- $Id: roleprofile.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: roleprofile.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
   -->
   <roledelta>
  -<sunshine:include xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0" ignoreErrors="true">
  -	<sunshine:connection>
  -		<sunshine:target>sunspotdemo/profiles/roleprofile-<sunshine:getxml context="request" path="/parameter/role"/>.xml</sunshine:target>
  -	</sunshine:connection>
  -</sunshine:include>
  +<session:include xmlns:session="http://cocoon.apache.org/session/1.0" ignoreErrors="true">
  +	<session:connection>
  +		<session:target>sunspotdemo/profiles/roleprofile-<session:getxml context="request" path="/parameter/role"/>.xml</session:target>
  +	</session:connection>
  +</session:include>
   </roledelta>
  
  
  
  1.2       +8 -8      xml-cocoon2/src/webapp/sunspotdemo/resources/saveglobalprofile.xml
  
  Index: saveglobalprofile.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/saveglobalprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- saveglobalprofile.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ saveglobalprofile.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,13 +1,13 @@
   <?xml version="1.0"?>
  -<!-- $Id: saveglobalprofile.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: saveglobalprofile.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
    Description: This resource saves the global delta.
   
   -->
  -<userdelta xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<sunshine:insert>
  -    		<sunshine:file>sunspotdemo/profiles/globalprofile.xml</sunshine:file>
  -    	<sunshine:path>/</sunshine:path>
  -    	<sunshine:fragment><sunshine:getxml context="request" path="/parameter/content"/></sunshine:fragment>
  -	<sunshine:replace>global-delta</sunshine:replace>
  -	</sunshine:insert>
  +<userdelta xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<session:insert>
  +    		<session:file>sunspotdemo/profiles/globalprofile.xml</session:file>
  +    	<session:path>/</session:path>
  +    	<session:fragment><session:getxml context="request" path="/parameter/content"/></session:fragment>
  +	<session:replace>global-delta</session:replace>
  +	</session:insert>
   </userdelta>
  
  
  
  1.2       +8 -8      xml-cocoon2/src/webapp/sunspotdemo/resources/saveroleprofile.xml
  
  Index: saveroleprofile.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/saveroleprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- saveroleprofile.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ saveroleprofile.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,13 +1,13 @@
   <?xml version="1.0"?>
  -<!-- $Id: saveroleprofile.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: saveroleprofile.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
    Description: This resource saves the role profile delta to a file with the name of the role.
   
   -->
  -<userdelta xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<sunshine:insert>
  -    		<sunshine:file>sunspotdemo/profiles/roleprofile-<sunshine:getxml context="request" path="/parameter/role"/>.xml</sunshine:file>
  -    	<sunshine:path>/</sunshine:path>
  -    	<sunshine:fragment><sunshine:getxml context="request" path="/parameter/content"/></sunshine:fragment>
  -	<sunshine:replace>role-delta</sunshine:replace>
  -	</sunshine:insert>
  +<userdelta xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<session:insert>
  +    		<session:file>sunspotdemo/profiles/roleprofile-<session:getxml context="request" path="/parameter/role"/>.xml</session:file>
  +    	<session:path>/</session:path>
  +    	<session:fragment><session:getxml context="request" path="/parameter/content"/></session:fragment>
  +	<session:replace>role-delta</session:replace>
  +	</session:insert>
   </userdelta>
  
  
  
  1.2       +8 -8      xml-cocoon2/src/webapp/sunspotdemo/resources/saveuserprofile.xml
  
  Index: saveuserprofile.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/saveuserprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- saveuserprofile.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ saveuserprofile.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,15 +1,15 @@
   <?xml version="1.0"?>
  -<!-- $Id: saveuserprofile.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: saveuserprofile.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
   
    Description: This resource save the user profile delta to a file with the name of the user.
   
   -->
  -<userdelta xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<sunshine:insert>
  -    		<sunshine:file>sunspotdemo/profiles/userprofile-<sunshine:getxml context="request" path="/parameter/ID"/>.xml</sunshine:file>
  -    	<sunshine:path>/</sunshine:path>
  -    	<sunshine:fragment><sunshine:getxml context="request" path="/parameter/content"/></sunshine:fragment>
  -	<sunshine:replace>user-delta</sunshine:replace>
  -	</sunshine:insert>
  +<userdelta xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<session:insert>
  +    		<session:file>sunspotdemo/profiles/userprofile-<session:getxml context="request" path="/parameter/ID"/>.xml</session:file>
  +    	<session:path>/</session:path>
  +    	<session:fragment><session:getxml context="request" path="/parameter/content"/></session:fragment>
  +	<session:replace>user-delta</session:replace>
  +	</session:insert>
   </userdelta>
  
  
  
  1.2       +8 -8      xml-cocoon2/src/webapp/sunspotdemo/resources/saveuserstatus.xml
  
  Index: saveuserstatus.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/saveuserstatus.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- saveuserstatus.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ saveuserstatus.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,14 +1,14 @@
   <?xml version="1.0"?>
  -<!-- $Id: saveuserstatus.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: saveuserstatus.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
    Description: This resource save the user status profile to a file with the name of the user.
   
   -->
  -<userdelta xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<sunshine:insert>
  -    		<sunshine:file>sunspotdemo/profiles/userstatus-<sunshine:getxml context="request" path="/parameter/ID"/>.xml</sunshine:file>
  -    	<sunshine:path>/</sunshine:path>
  -    	<sunshine:fragment><sunshine:getxml context="request" path="/parameter/content"/></sunshine:fragment>
  -	<sunshine:replace>status-profile</sunshine:replace>
  -	</sunshine:insert>
  +<userdelta xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<session:insert>
  +    		<session:file>sunspotdemo/profiles/userstatus-<session:getxml context="request" path="/parameter/ID"/>.xml</session:file>
  +    	<session:path>/</session:path>
  +    	<session:fragment><session:getxml context="request" path="/parameter/content"/></session:fragment>
  +	<session:replace>status-profile</session:replace>
  +	</session:insert>
   </userdelta>
  
  
  
  1.2       +29 -29    xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-changeuser.xml
  
  Index: sunrise-changeuser.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-changeuser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-changeuser.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ sunrise-changeuser.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,40 +1,40 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunrise-changeuser.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: sunrise-changeuser.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
    Description: Add a new user
   
   -->
   
  -<adduser xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<!-- add to sunrise users -->
  -	<sunshine:insert>
  -    		<sunshine:file>sunspotdemo/resources/sunrise-user.xml</sunshine:file>
  -    		<sunshine:path>/authentication/users</sunshine:path>
  -    		<sunshine:fragment>
  +<adduser xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<!-- add to authentication users -->
  +	<session:insert>
  +    		<session:file>sunspotdemo/resources/sunrise-user.xml</session:file>
  +    		<session:path>/authentication/users</session:path>
  +    		<session:fragment>
   		<user>
  -			<name><sunshine:getxml context="request" path="/parameter/ID"/></name>
  +			<name><session:getxml context="request" path="/parameter/ID"/></name>
   			<password>
  -				<new><sunshine:getxml context="request" path="/parameter/password"/></new>
  -				<hashed><sunshine:getxml context="request" path="/parameter/password"/></hashed>
  -				<old><sunshine:getxml context="request" path="/parameter/sunriseoldpassword"/></old>
  +				<new><session:getxml context="request" path="/parameter/password"/></new>
  +				<hashed><session:getxml context="request" path="/parameter/password"/></hashed>
  +				<old><session:getxml context="request" path="/parameter/autholdpassword"/></old>
   			</password>
  -			<role><sunshine:getxml context="request" path="/parameter/role"/></role>
  -                  <title><sunshine:getxml context="request" path="/parameter/title"/></title>
  -			<firstname><sunshine:getxml context="request" path="/parameter/firstname"/></firstname>
  -                  <lastname><sunshine:getxml context="request" path="/parameter/lastname"/></lastname>
  -			<company><sunshine:getxml context="request" path="/parameter/company"/></company>
  -                  <street><sunshine:getxml context="request" path="/parameter/street"/></street>
  -			<zipcode><sunshine:getxml context="request" path="/parameter/zipcode"/></zipcode>
  -                  <city><sunshine:getxml context="request" path="/parameter/city"/></city>
  -			<country><sunshine:getxml context="request" path="/parameter/country"/></country>
  -                  <phone><sunshine:getxml context="request" path="/parameter/phone"/></phone>
  -                  <fax><sunshine:getxml context="request" path="/parameter/fax"/></fax>
  -			<email><sunshine:getxml context="request" path="/parameter/email"/></email>
  -                  <bankid><sunshine:getxml context="request" path="/parameter/bankid"/></bankid>
  -			<bankname><sunshine:getxml context="request" path="/parameter/bankname"/></bankname>
  -                  <accountid><sunshine:getxml context="request" path="/parameter/accountid"/></accountid>
  +			<role><session:getxml context="request" path="/parameter/role"/></role>
  +                  <title><session:getxml context="request" path="/parameter/title"/></title>
  +			<firstname><session:getxml context="request" path="/parameter/firstname"/></firstname>
  +                  <lastname><session:getxml context="request" path="/parameter/lastname"/></lastname>
  +			<company><session:getxml context="request" path="/parameter/company"/></company>
  +                  <street><session:getxml context="request" path="/parameter/street"/></street>
  +			<zipcode><session:getxml context="request" path="/parameter/zipcode"/></zipcode>
  +                  <city><session:getxml context="request" path="/parameter/city"/></city>
  +			<country><session:getxml context="request" path="/parameter/country"/></country>
  +                  <phone><session:getxml context="request" path="/parameter/phone"/></phone>
  +                  <fax><session:getxml context="request" path="/parameter/fax"/></fax>
  +			<email><session:getxml context="request" path="/parameter/email"/></email>
  +                  <bankid><session:getxml context="request" path="/parameter/bankid"/></bankid>
  +			<bankname><session:getxml context="request" path="/parameter/bankname"/></bankname>
  +                  <accountid><session:getxml context="request" path="/parameter/accountid"/></accountid>
   		</user>
  -		</sunshine:fragment>
  -		<sunshine:replace>user[name='<sunshine:getxml context="request" path="/parameter/ID"/>']</sunshine:replace>
  -	</sunshine:insert>
  +		</session:fragment>
  +		<session:replace>user[name='<session:getxml context="request" path="/parameter/ID"/>']</session:replace>
  +	</session:insert>
   </adduser>
  
  
  
  1.2       +15 -15    xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-delrole.xml
  
  Index: sunrise-delrole.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-delrole.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-delrole.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ sunrise-delrole.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,23 +1,23 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunrise-delrole.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: sunrise-delrole.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
    Description: Delete a role
   
   -->
   
  -<addrole xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<sunshine:insert>
  -    		<sunshine:file>sunspotdemo/resources/sunrise-roles.xml</sunshine:file>
  -    	<sunshine:path>roles</sunshine:path>
  -    	<sunshine:fragment></sunshine:fragment>
  -    	<sunshine:replace>role[. = '<sunshine:getxml context="request" path="/parameter/role"/>']</sunshine:replace>
  -	</sunshine:insert>
  +<addrole xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<session:insert>
  +    		<session:file>sunspotdemo/resources/sunrise-roles.xml</session:file>
  +    	<session:path>roles</session:path>
  +    	<session:fragment></session:fragment>
  +    	<session:replace>role[. = '<session:getxml context="request" path="/parameter/role"/>']</session:replace>
  +	</session:insert>
   	<!-- delete role profile -->
  -	<sunshine:insert>
  -		<sunshine:file>sunspotdemo/profiles/roleprofile-<sunshine:getxml context="request" path="/parameter/role"/>.xml</sunshine:file>
  -    		<sunshine:path>/</sunshine:path>
  -    		<sunshine:fragment><role-delta/>
  -		</sunshine:fragment>
  -		<sunshine:replace>role-delta</sunshine:replace>
  -	</sunshine:insert>
  +	<session:insert>
  +		<session:file>sunspotdemo/profiles/roleprofile-<session:getxml context="request" path="/parameter/role"/>.xml</session:file>
  +    		<session:path>/</session:path>
  +    		<session:fragment><role-delta/>
  +		</session:fragment>
  +		<session:replace>role-delta</session:replace>
  +	</session:insert>
   </addrole>
  
  
  
  1.2       +24 -24    xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-deluser.xml
  
  Index: sunrise-deluser.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-deluser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-deluser.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ sunrise-deluser.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,32 +1,32 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunrise-deluser.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: sunrise-deluser.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
    Description: Delete a user
   
   -->
   
  -<adduser xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<!-- delete from sunrise users -->
  -	<sunshine:insert>
  -    		<sunshine:file>sunspotdemo/resources/sunrise-user.xml</sunshine:file>
  -    		<sunshine:path>/authentication/users</sunshine:path>
  -    		<sunshine:fragment>
  -		</sunshine:fragment>
  -		<sunshine:replace>user[name='<sunshine:getxml context="request" path="/parameter/ID"/>']</sunshine:replace>
  -	</sunshine:insert>
  +<adduser xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<!-- delete from authentication users -->
  +	<session:insert>
  +    		<session:file>sunspotdemo/resources/sunrise-user.xml</session:file>
  +    		<session:path>/authentication/users</session:path>
  +    		<session:fragment>
  +		</session:fragment>
  +		<session:replace>user[name='<session:getxml context="request" path="/parameter/ID"/>']</session:replace>
  +	</session:insert>
   	<!-- delete user profile -->
  -	<sunshine:insert>
  -		<sunshine:file>sunspotdemo/profiles/userprofile-<sunshine:getxml context="request" path="/parameter/ID"/>.xml</sunshine:file>
  -    		<sunshine:path>/</sunshine:path>
  -    		<sunshine:fragment><user-delta/>
  -		</sunshine:fragment>
  -		<sunshine:replace>user-delta</sunshine:replace>
  -	</sunshine:insert>
  +	<session:insert>
  +		<session:file>sunspotdemo/profiles/userprofile-<session:getxml context="request" path="/parameter/ID"/>.xml</session:file>
  +    		<session:path>/</session:path>
  +    		<session:fragment><user-delta/>
  +		</session:fragment>
  +		<session:replace>user-delta</session:replace>
  +	</session:insert>
   	<!-- delete user status profile -->
  -	<sunshine:insert>
  -		<sunshine:file>sunspotdemo/profiles/userstatus-<sunshine:getxml context="request" path="/parameter/ID"/>.xml</sunshine:file>
  -    		<sunshine:path>/</sunshine:path>
  -    		<sunshine:fragment><user-delta/>
  -		</sunshine:fragment>
  -		<sunshine:replace>status-profile</sunshine:replace>
  -	</sunshine:insert>
  +	<session:insert>
  +		<session:file>sunspotdemo/profiles/userstatus-<session:getxml context="request" path="/parameter/ID"/>.xml</session:file>
  +    		<session:path>/</session:path>
  +    		<session:fragment><user-delta/>
  +		</session:fragment>
  +		<session:replace>status-profile</session:replace>
  +	</session:insert>
   </adduser>
  
  
  
  1.2       +10 -10    xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-loaduser.xml
  
  Index: sunrise-loaduser.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-loaduser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-loaduser.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ sunrise-loaduser.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,18 +1,18 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunrise-loaduser.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: sunrise-loaduser.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
    Description: load u user
   
   -->
  -<loaduser xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  +<loaduser xmlns:session="http://cocoon.apache.org/session/1.0">
   	<info>
  -		<ID><sunshine:getxml context="request" path="/parameter/ID"/></ID>
  -		<role><sunshine:getxml context="request" path="/parameter/role"/></role>
  -		<type><sunshine:getxml context="request" path="/parameter/type"/></type>
  +		<ID><session:getxml context="request" path="/parameter/ID"/></ID>
  +		<role><session:getxml context="request" path="/parameter/role"/></role>
  +		<type><session:getxml context="request" path="/parameter/type"/></type>
   	</info>
  -	<sunshine:include xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0" ignoreErrors="true">
  -		<sunshine:connection>
  -			<sunshine:target>sunspotdemo/resources/sunrise-user.xml</sunshine:target>
  -		</sunshine:connection>
  -	</sunshine:include>
  +	<session:include xmlns:session="http://cocoon.apache.org/session/1.0" ignoreErrors="true">
  +		<session:connection>
  +			<session:target>sunspotdemo/resources/sunrise-user.xml</session:target>
  +		</session:connection>
  +	</session:include>
   </loaduser>
  
  
  
  1.2       +7 -7      xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-newrole.xml
  
  Index: sunrise-newrole.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-newrole.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-newrole.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ sunrise-newrole.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,14 +1,14 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunrise-newrole.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: sunrise-newrole.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
    Description: Add a new role
   
   -->
   
  -<addrole xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<sunshine:insert>
  -    		<sunshine:file>sunspotdemo/resources/sunrise-roles.xml</sunshine:file>
  -    	<sunshine:path>roles</sunshine:path>
  -    	<sunshine:fragment><role><sunshine:getxml context="request" path="/parameter/role"/></role></sunshine:fragment>
  -	</sunshine:insert>
  +<addrole xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<session:insert>
  +    		<session:file>sunspotdemo/resources/sunrise-roles.xml</session:file>
  +    	<session:path>roles</session:path>
  +    	<session:fragment><role><session:getxml context="request" path="/parameter/role"/></role></session:fragment>
  +	</session:insert>
   </addrole>
  
  
  
  1.2       +27 -27    xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-newuser.xml
  
  Index: sunrise-newuser.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/sunrise-newuser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunrise-newuser.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ sunrise-newuser.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,36 +1,36 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunrise-newuser.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: sunrise-newuser.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
    Description: Add a new user
   
   -->
   
  -<adduser xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<!-- add to sunrise users -->
  -	<sunshine:insert>
  -    		<sunshine:file>sunspotdemo/resources/sunrise-user.xml</sunshine:file>
  -    		<sunshine:path>/authentication/users</sunshine:path>
  -    		<sunshine:fragment>
  +<adduser xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<!-- add to authentication users -->
  +	<session:insert>
  +    		<session:file>sunspotdemo/resources/sunrise-user.xml</session:file>
  +    		<session:path>/authentication/users</session:path>
  +    		<session:fragment>
   		<user>
  -			<name><sunshine:getxml context="request" path="/parameter/ID"/></name>
  -			<password><sunshine:getxml context="request" path="/parameter/password"/></password>
  -			<role><sunshine:getxml context="request" path="/parameter/role"/></role>
  -                  <title><sunshine:getxml context="request" path="/parameter/title"/></title>
  -			<firstname><sunshine:getxml context="request" path="/parameter/firstname"/></firstname>
  -                  <lastname><sunshine:getxml context="request" path="/parameter/lastname"/></lastname>
  -			<company><sunshine:getxml context="request" path="/parameter/company"/></company>
  -                  <street><sunshine:getxml context="request" path="/parameter/street"/></street>
  -			<zipcode><sunshine:getxml context="request" path="/parameter/zipcode"/></zipcode>
  -                  <city><sunshine:getxml context="request" path="/parameter/city"/></city>
  -			<country><sunshine:getxml context="request" path="/parameter/country"/></country>
  -                  <phone><sunshine:getxml context="request" path="/parameter/phone"/></phone>
  -                  <fax><sunshine:getxml context="request" path="/parameter/fax"/></fax>
  -			<email><sunshine:getxml context="request" path="/parameter/email"/></email>
  -                  <bankid><sunshine:getxml context="request" path="/parameter/bankid"/></bankid>
  -			<bankname><sunshine:getxml context="request" path="/parameter/bankname"/></bankname>
  -                  <accountid><sunshine:getxml context="request" path="/parameter/accountid"/></accountid>
  +			<name><session:getxml context="request" path="/parameter/ID"/></name>
  +			<password><session:getxml context="request" path="/parameter/password"/></password>
  +			<role><session:getxml context="request" path="/parameter/role"/></role>
  +                  <title><session:getxml context="request" path="/parameter/title"/></title>
  +			<firstname><session:getxml context="request" path="/parameter/firstname"/></firstname>
  +                  <lastname><session:getxml context="request" path="/parameter/lastname"/></lastname>
  +			<company><session:getxml context="request" path="/parameter/company"/></company>
  +                  <street><session:getxml context="request" path="/parameter/street"/></street>
  +			<zipcode><session:getxml context="request" path="/parameter/zipcode"/></zipcode>
  +                  <city><session:getxml context="request" path="/parameter/city"/></city>
  +			<country><session:getxml context="request" path="/parameter/country"/></country>
  +                  <phone><session:getxml context="request" path="/parameter/phone"/></phone>
  +                  <fax><session:getxml context="request" path="/parameter/fax"/></fax>
  +			<email><session:getxml context="request" path="/parameter/email"/></email>
  +                  <bankid><session:getxml context="request" path="/parameter/bankid"/></bankid>
  +			<bankname><session:getxml context="request" path="/parameter/bankname"/></bankname>
  +                  <accountid><session:getxml context="request" path="/parameter/accountid"/></accountid>
   		</user>
  -		</sunshine:fragment>
  -		<sunshine:replace>user[name='<sunshine:getxml context="request" path="/parameter/ID"/>']</sunshine:replace>
  -	</sunshine:insert>
  +		</session:fragment>
  +		<session:replace>user[name='<session:getxml context="request" path="/parameter/ID"/>']</session:replace>
  +	</session:insert>
   </adduser>
  
  
  
  1.2       +6 -6      xml-cocoon2/src/webapp/sunspotdemo/resources/userprofile.xml
  
  Index: userprofile.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/userprofile.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- userprofile.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ userprofile.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,11 +1,11 @@
   <?xml version="1.0"?>
  -<!-- $Id: userprofile.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: userprofile.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
   -->
   <userdelta>
  -<sunshine:include xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0" ignoreErrors="true">
  -	<sunshine:connection>
  -		<sunshine:target>sunspotdemo/profiles/userprofile-<sunshine:getxml context="request" path="/parameter/ID"/>.xml</sunshine:target>
  -	</sunshine:connection>
  -</sunshine:include>
  +<session:include xmlns:session="http://cocoon.apache.org/session/1.0" ignoreErrors="true">
  +	<session:connection>
  +		<session:target>sunspotdemo/profiles/userprofile-<session:getxml context="request" path="/parameter/ID"/>.xml</session:target>
  +	</session:connection>
  +</session:include>
   </userdelta>
  
  
  
  1.2       +6 -6      xml-cocoon2/src/webapp/sunspotdemo/resources/userstatus.xml
  
  Index: userstatus.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/userstatus.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- userstatus.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ userstatus.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,12 +1,12 @@
   <?xml version="1.0"?>
  -<!-- $Id: userstatus.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: userstatus.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
    Description: Load the status profile from a file name userstatus-<username>.xml
   
   -->
   <statusprofile>
  -<sunshine:include xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0" ignoreErrors="true">
  -	<sunshine:connection>
  -		<sunshine:target>sunspotdemo/profiles/userstatus-<sunshine:getxml context="request" path="/parameter/ID"/>.xml</sunshine:target>
  -	</sunshine:connection>
  -</sunshine:include>
  +<session:include xmlns:session="http://cocoon.apache.org/session/1.0" ignoreErrors="true">
  +	<session:connection>
  +		<session:target>sunspotdemo/profiles/userstatus-<session:getxml context="request" path="/parameter/ID"/>.xml</session:target>
  +	</session:connection>
  +</session:include>
   </statusprofile>
  
  
  
  1.3       +3 -3      xml-cocoon2/src/webapp/sunspotdemo/resources/auth/portal.xml
  
  Index: portal.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/auth/portal.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portal.xml	20 Feb 2002 16:07:26 -0000	1.2
  +++ portal.xml	18 Apr 2002 08:13:41 -0000	1.3
  @@ -1,14 +1,14 @@
   <?xml version="1.0"?>
  -<!-- $Id: portal.xml,v 1.2 2002/02/20 16:07:26 cziegeler Exp $ 
  +<!-- $Id: portal.xml,v 1.3 2002/04/18 08:13:41 cziegeler Exp $ 
   -->
  -<page xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  +<page xmlns:session="http://cocoon.apache.org/session/1.0">
   	<pageset columns="*" rows="118,*">
   		<part title="Header" scrolling="no">
   			<url>sunspotdemo-header</url>
   		</part>
   		<pageset columns="*" rows="*,15">
   			<part title="Content">
  -				<url>sunspotdemo-portlets<sunshine:getxml context="request" path="/querystring"/></url>
  +				<url>sunspotdemo-portlets<session:getxml context="request" path="/querystring"/></url>
   			</part>
   			<part name="bottom" scrolling="no">
     				<url>sunspotdemo-bottom</url> 
  
  
  
  1.2       +9 -9      xml-cocoon2/src/webapp/sunspotdemo/resources/auth/sunlet-customnews.xml
  
  Index: sunlet-customnews.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/auth/sunlet-customnews.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunlet-customnews.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ sunlet-customnews.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,12 +1,12 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunlet-customnews.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: sunlet-customnews.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   -->
  -<p xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<sunshine:include>
  -		<sunshine:connection>
  -			<sunshine:target>
  -				http://p.moreover.com/cgi-local/page?index_<sunshine:getxml context="sunSpot" path="/sunlet-data/feed"/>+xml
  -			</sunshine:target>
  -		</sunshine:connection>
  -	</sunshine:include>
  +<p xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<session:include>
  +		<session:connection>
  +			<session:target>
  +				http://p.moreover.com/cgi-local/page?index_<session:getxml context="portal" path="/coplet-data/feed"/>+xml
  +			</session:target>
  +		</session:connection>
  +	</session:include>
   </p>
  
  
  
  1.2       +2 -2      xml-cocoon2/src/webapp/sunspotdemo/resources/auth/sunlet-feedback.xml
  
  Index: sunlet-feedback.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/auth/sunlet-feedback.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunlet-feedback.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ sunlet-feedback.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,9 +1,9 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunlet-feedback.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: sunlet-feedback.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
   
   
  - Description: Feedback sunLet
  + Description: Feedback coplet
   
   -->
   <content>
  
  
  
  1.2       +8 -8      xml-cocoon2/src/webapp/sunspotdemo/resources/auth/sunletconfig-customnews.xml
  
  Index: sunletconfig-customnews.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/auth/sunletconfig-customnews.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunletconfig-customnews.xml	18 Feb 2002 09:10:12 -0000	1.1
  +++ sunletconfig-customnews.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,13 +1,13 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunletconfig-customnews.xml,v 1.1 2002/02/18 09:10:12 cziegeler Exp $ 
  +<!-- $Id: sunletconfig-customnews.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
   
   -->
  -<page xmlns:sunshine="http://cocoon.apache.org/sunshine/1.0">
  -	<sunshine:form name="customnews" method="POST">
  -		<sunshine:action><sunshine:getxml context="sunSpot" path="/configuration/uri"/></sunshine:action>
  -		<sunshine:content>
  -			<sunshine:inputxml context="sunSpot" path="/sunlet-data/feed" name="Newsfeed" type="text"/>
  -		</sunshine:content>
  +<page xmlns:session="http://cocoon.apache.org/session/1.0">
  +	<session:form name="customnews" method="POST">
  +		<session:action><session:getxml context="portal" path="/configuration/uri"/></session:action>
  +		<session:content>
  +			<session:inputxml context="portal" path="/coplet-data/feed" name="Newsfeed" type="text"/>
  +		</session:content>
               <input type="submit" value="Change"/>
  -	</sunshine:form>
  +	</session:form>
   </page>
  
  
  
  1.2       +3 -3      xml-cocoon2/src/webapp/sunspotdemo/resources/free/login.xml
  
  Index: login.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/resources/free/login.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- login.xml	18 Feb 2002 09:10:13 -0000	1.1
  +++ login.xml	18 Apr 2002 08:13:41 -0000	1.2
  @@ -1,9 +1,9 @@
   <?xml version="1.0"?>
  -<!-- $Id: login.xml,v 1.1 2002/02/18 09:10:13 cziegeler Exp $ 
  - Description: The login form for sunspotdemo
  +<!-- $Id: login.xml,v 1.2 2002/04/18 08:13:41 cziegeler Exp $ 
  + Description: The login form for the portal
   
   -->
  -<page title="sunspotdemo login">
  +<page title="Portal Login">
   	<content>
   		<form>
   			<url>sunspotdemofree-auth?resource=sunspotdemo-portal</url>
  
  
  
  1.2       +33 -33    xml-cocoon2/src/webapp/sunspotdemo/styles/portalHTML-Netscape.xsl
  
  Index: portalHTML-Netscape.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/styles/portalHTML-Netscape.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- portalHTML-Netscape.xsl	18 Feb 2002 09:10:13 -0000	1.1
  +++ portalHTML-Netscape.xsl	18 Apr 2002 08:13:42 -0000	1.2
  @@ -3,10 +3,10 @@
   <xsl:stylesheet version="1.0" 
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
  -<!-- $Id: portalHTML-Netscape.xsl,v 1.1 2002/02/18 09:10:13 cziegeler Exp $ 
  +<!-- $Id: portalHTML-Netscape.xsl,v 1.2 2002/04/18 08:13:42 cziegeler Exp $ 
   
   
  - Description: sunSpot Portal to HTML - Alternative for netscape (swapping sunLet icons and title)
  + Description: Portal to HTML - Alternative for netscape (swapping coplet icons and title)
   
   -->
   
  @@ -15,7 +15,7 @@
   <xsl:template match="portal">
   <html>
   	<head>
  -    	<title>sunSpot</title>
  +    	<title>Portal</title>
       	</head>
   	<body text="#0B2A51" link="#0B2A51" vlink="#666666" bgcolor="#cccccc">
   		<xsl:attribute name="bgcolor"><xsl:value-of select="layout/portal/background/color"/></xsl:attribute>
  @@ -74,8 +74,8 @@
   									<xsl:value-of select="ancestor::portal/personal-profile/greeting"/>
   								</b>
   								<br/><br/>
  -								<xsl:if test="sunlet">
  -									<xsl:apply-templates select="sunlet"/>
  +								<xsl:if test="coplet">
  +									<xsl:apply-templates select="coplet"/>
   								</xsl:if>
                   						</font>
   							<br/>
  @@ -117,7 +117,7 @@
   <td vAlign="top">
   <xsl:attribute name="width"><xsl:value-of select="@width"/></xsl:attribute>
   <table width="100%" border="0" cellspacing="0" cellpadding="0">
  -	<xsl:for-each select="sunlet">
  +	<xsl:for-each select="coplet">
   		<xsl:sort select="@position"/>
   		<tr>
   			<td><img src="sunspotdemoimg-space.gif" width="10"/></td>
  @@ -130,23 +130,23 @@
   </td>
   </xsl:template>
   
  -<!-- One sunLet -->
  +<!-- One coplet -->
   
  -<xsl:template match="sunlet">
  -	<xsl:variable name="cmd"><xsl:value-of select="ancestor::portal/configuration/uri"/>&amp;sunspotcmd=</xsl:variable>
  -	<xsl:variable name="sunletident"><xsl:value-of select="@id"/>_<xsl:value-of select="@number"/></xsl:variable>
  +<xsl:template match="coplet">
  +	<xsl:variable name="cmd"><xsl:value-of select="ancestor::portal/configuration/uri"/>&amp;portalcmd=</xsl:variable>
  +	<xsl:variable name="copletident"><xsl:value-of select="@id"/>_<xsl:value-of select="@number"/></xsl:variable>
   <table border="0" cellSpacing="0" width="100%">
   	<tr vAlign="top">
   		<td align="left">
  -			<xsl:attribute name="bgColor"><xsl:value-of select="ancestor::portal/layout/sunlets/title/background/color"/></xsl:attribute>
  +			<xsl:attribute name="bgColor"><xsl:value-of select="ancestor::portal/layout/coplets/title/background/color"/></xsl:attribute>
   			<font>
  -				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/color"/></xsl:attribute>
  -				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/type"/></xsl:attribute>
  -				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/size"/></xsl:attribute>
  +				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/color"/></xsl:attribute>
  +				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/type"/></xsl:attribute>
  +				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/size"/></xsl:attribute>
   				
   				<!-- customize -->
   				<xsl:if test="configuration/customizable='true' and (not(status/customize) or status/customize='false')">
  -					<xsl:variable name="customize"><xsl:value-of select="$cmd"/>customize_<xsl:value-of select="$sunletident"/></xsl:variable>
  +					<xsl:variable name="customize"><xsl:value-of select="$cmd"/>customize_<xsl:value-of select="$copletident"/></xsl:variable>
   					<a>
   						<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($customize), ' ', '')"/></xsl:attribute>
   						<img src="sunspotdemoimg-customize.gif" border="0" alt="Customize"/>
  @@ -155,8 +155,8 @@
   				
   			<!-- minimize/maximize -->
   			<xsl:if test="configuration/sizable='true' and status/size/@formpath">
  -				<xsl:variable name="linkurlmax"><xsl:value-of select="$cmd"/>minimize_<xsl:value-of select="$sunletident"/></xsl:variable>
  -				<xsl:variable name="linkurlmin"><xsl:value-of select="$cmd"/>maximize_<xsl:value-of select="$sunletident"/></xsl:variable>
  +				<xsl:variable name="linkurlmax"><xsl:value-of select="$cmd"/>minimize_<xsl:value-of select="$copletident"/></xsl:variable>
  +				<xsl:variable name="linkurlmin"><xsl:value-of select="$cmd"/>maximize_<xsl:value-of select="$copletident"/></xsl:variable>
   				<a>
   					<xsl:choose>
   						<xsl:when test="status/size='max'">
  @@ -173,8 +173,8 @@
   			<!-- show/ hide -->
   			<xsl:choose>
   				<xsl:when test="status/visible/@formpath and configuration/mandatory='false'">
  -					<xsl:variable name="linkurlshow"><xsl:value-of select="$cmd"/>show_<xsl:value-of select="$sunletident"/></xsl:variable>
  -					<xsl:variable name="linkurlhide"><xsl:value-of select="$cmd"/>hide_<xsl:value-of select="$sunletident"/></xsl:variable>
  +					<xsl:variable name="linkurlshow"><xsl:value-of select="$cmd"/>show_<xsl:value-of select="$copletident"/></xsl:variable>
  +					<xsl:variable name="linkurlhide"><xsl:value-of select="$cmd"/>hide_<xsl:value-of select="$copletident"/></xsl:variable>
   					<a>
   						<xsl:choose>
   							<xsl:when test="status/visible='true'">
  @@ -194,7 +194,7 @@
   			</xsl:choose>
   			<!-- mandatory/delete -->
   			<xsl:if test="configuration/mandatory='false'">
  -				<xsl:variable name="linkurlmand"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$sunletident"/></xsl:variable>
  +				<xsl:variable name="linkurlmand"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$copletident"/></xsl:variable>
   				<a>
   					<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurlmand), ' ', '')"/></xsl:attribute>
   					<img src="sunspotdemoimg-delete.gif" border="0" alt="Delete"/>
  @@ -203,11 +203,11 @@
   			</font>
   		</td>
   		<td align="right">
  -			<xsl:attribute name="bgColor"><xsl:value-of select="ancestor::portal/layout/sunlets/title/background/color"/></xsl:attribute>
  +			<xsl:attribute name="bgColor"><xsl:value-of select="ancestor::portal/layout/coplets/title/background/color"/></xsl:attribute>
   			<font>
  -				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/color"/></xsl:attribute>
  -				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/type"/></xsl:attribute>
  -				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/size"/></xsl:attribute>	
  +				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/color"/></xsl:attribute>
  +				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/type"/></xsl:attribute>
  +				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/size"/></xsl:attribute>	
   				<img height="1" src="sunspotdemoimg-space.gif" width="5"/>				
   				<b><xsl:value-of select="title"/></b>
   			</font>
  @@ -217,9 +217,9 @@
   		<tr>
   			<td colSpan="2">
   			<font>
  -				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/color"/></xsl:attribute>
  -				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/type"/></xsl:attribute>
  -				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/size"/></xsl:attribute>
  +				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/color"/></xsl:attribute>
  +				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/type"/></xsl:attribute>
  +				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/size"/></xsl:attribute>
   				<xsl:apply-templates select="content"/>
   			</font>
   			</td>
  @@ -236,9 +236,9 @@
   	<td><xsl:for-each select="@*"><xsl:copy/></xsl:for-each>
   	<xsl:if test="not(font) and not(FONT)">
   		<font>
  -			<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/color"/></xsl:attribute>
  -			<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/type"/></xsl:attribute>
  -			<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/size"/></xsl:attribute>
  +			<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/color"/></xsl:attribute>
  +			<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/type"/></xsl:attribute>
  +			<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/size"/></xsl:attribute>
   			<xsl:apply-templates/>
   		</font>
   	</xsl:if>
  @@ -251,9 +251,9 @@
   	<td><xsl:for-each select="@*"><xsl:copy/></xsl:for-each>
               <xsl:if test="not(font) and not(FONT)">
   		<font>
  -			<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/color"/></xsl:attribute>
  -			<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/type"/></xsl:attribute>
  -			<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/size"/></xsl:attribute>
  +			<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/color"/></xsl:attribute>
  +			<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/type"/></xsl:attribute>
  +			<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/size"/></xsl:attribute>
   			<xsl:apply-templates/>
   		</font>
   	</xsl:if>
  
  
  
  1.2       +33 -33    xml-cocoon2/src/webapp/sunspotdemo/styles/portalHTML.xsl
  
  Index: portalHTML.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/styles/portalHTML.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- portalHTML.xsl	18 Feb 2002 09:10:13 -0000	1.1
  +++ portalHTML.xsl	18 Apr 2002 08:13:42 -0000	1.2
  @@ -3,10 +3,10 @@
   <xsl:stylesheet version="1.0" 
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
  -<!-- $Id: portalHTML.xsl,v 1.1 2002/02/18 09:10:13 cziegeler Exp $ 
  +<!-- $Id: portalHTML.xsl,v 1.2 2002/04/18 08:13:42 cziegeler Exp $ 
   
   
  - Description: sunSpot Portal to HTML
  + Description: Portal to HTML
   
   -->
   
  @@ -15,7 +15,7 @@
   <xsl:template match="portal">
   <html>
   	<head>
  -    	<title>sunSpot</title>
  +    	<title>Portal</title>
       	</head>
   	<body text="#0B2A51" link="#0B2A51" vlink="#666666" bgcolor="#cccccc">
   		<xsl:attribute name="bgcolor"><xsl:value-of select="layout/portal/background/color"/></xsl:attribute>
  @@ -74,8 +74,8 @@
   									<xsl:value-of select="ancestor::portal/personal-profile/greeting"/>
   								</b>
   								<br/><br/>
  -								<xsl:if test="sunlet">
  -									<xsl:apply-templates select="sunlet"/>
  +								<xsl:if test="coplet">
  +									<xsl:apply-templates select="coplet"/>
   								</xsl:if>
                   						</font>
   							<br/>
  @@ -117,7 +117,7 @@
   <td vAlign="top">
   <xsl:attribute name="width"><xsl:value-of select="@width"/></xsl:attribute>
   <table width="100%" border="0" cellspacing="0" cellpadding="0">
  -	<xsl:for-each select="sunlet">
  +	<xsl:for-each select="coplet">
   		<xsl:sort select="@position"/>
   		<tr>
   			<td><img src="sunspotdemoimg-space.gif" width="10"/></td>
  @@ -130,33 +130,33 @@
   </td>
   </xsl:template>
   
  -<!-- One sunLet -->
  +<!-- One coplet -->
   
  -<xsl:template match="sunlet">
  -	<xsl:variable name="cmd"><xsl:value-of select="ancestor::portal/configuration/uri"/>&amp;sunspotcmd=</xsl:variable>
  -	<xsl:variable name="sunletident"><xsl:value-of select="@id"/>_<xsl:value-of select="@number"/></xsl:variable>
  +<xsl:template match="coplet">
  +	<xsl:variable name="cmd"><xsl:value-of select="ancestor::portal/configuration/uri"/>&amp;portalcmd=</xsl:variable>
  +	<xsl:variable name="copletident"><xsl:value-of select="@id"/>_<xsl:value-of select="@number"/></xsl:variable>
   <table border="0" cellSpacing="0" width="100%">
   	<tr vAlign="top">
   		<td>
  -			<xsl:attribute name="bgColor"><xsl:value-of select="ancestor::portal/layout/sunlets/title/background/color"/></xsl:attribute>
  +			<xsl:attribute name="bgColor"><xsl:value-of select="ancestor::portal/layout/coplets/title/background/color"/></xsl:attribute>
   			<font>
  -				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/color"/></xsl:attribute>
  -				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/type"/></xsl:attribute>
  -				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/size"/></xsl:attribute>	
  +				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/color"/></xsl:attribute>
  +				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/type"/></xsl:attribute>
  +				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/size"/></xsl:attribute>	
   				<img height="1" src="sunspotdemoimg-space.gif" width="5"/>				
   				<b><xsl:value-of select="title"/></b>
   			</font>
   		</td>
   		<td align="right">
  -			<xsl:attribute name="bgColor"><xsl:value-of select="ancestor::portal/layout/sunlets/title/background/color"/></xsl:attribute>
  +			<xsl:attribute name="bgColor"><xsl:value-of select="ancestor::portal/layout/coplets/title/background/color"/></xsl:attribute>
   			<font>
  -				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/color"/></xsl:attribute>
  -				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/type"/></xsl:attribute>
  -				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/title/font/size"/></xsl:attribute>
  +				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/color"/></xsl:attribute>
  +				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/type"/></xsl:attribute>
  +				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/title/font/size"/></xsl:attribute>
   				
   				<!-- customize -->
   				<xsl:if test="configuration/customizable='true' and (not(status/customize) or status/customize='false')">
  -					<xsl:variable name="customize"><xsl:value-of select="$cmd"/>customize_<xsl:value-of select="$sunletident"/></xsl:variable>
  +					<xsl:variable name="customize"><xsl:value-of select="$cmd"/>customize_<xsl:value-of select="$copletident"/></xsl:variable>
   					<a>
   						<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($customize), ' ', '')"/></xsl:attribute>
   						<img src="sunspotdemoimg-customize.gif" border="0" alt="Customize"/>
  @@ -165,8 +165,8 @@
   				
   				<!-- minimize/maximize -->
   				<xsl:if test="configuration/sizable='true' and status/size/@formpath">
  -					<xsl:variable name="linkurlmax"><xsl:value-of select="$cmd"/>minimize_<xsl:value-of select="$sunletident"/></xsl:variable>
  -					<xsl:variable name="linkurlmin"><xsl:value-of select="$cmd"/>maximize_<xsl:value-of select="$sunletident"/></xsl:variable>
  +					<xsl:variable name="linkurlmax"><xsl:value-of select="$cmd"/>minimize_<xsl:value-of select="$copletident"/></xsl:variable>
  +					<xsl:variable name="linkurlmin"><xsl:value-of select="$cmd"/>maximize_<xsl:value-of select="$copletident"/></xsl:variable>
   					<a>
   						<xsl:choose>
   							<xsl:when test="status/size='max'">
  @@ -184,8 +184,8 @@
   				<!-- show/ hide -->
   				<xsl:choose>
   					<xsl:when test="status/visible/@formpath and configuration/mandatory='false'">
  -						<xsl:variable name="linkurlshow"><xsl:value-of select="$cmd"/>show_<xsl:value-of select="$sunletident"/></xsl:variable>
  -						<xsl:variable name="linkurlhide"><xsl:value-of select="$cmd"/>hide_<xsl:value-of select="$sunletident"/></xsl:variable>
  +						<xsl:variable name="linkurlshow"><xsl:value-of select="$cmd"/>show_<xsl:value-of select="$copletident"/></xsl:variable>
  +						<xsl:variable name="linkurlhide"><xsl:value-of select="$cmd"/>hide_<xsl:value-of select="$copletident"/></xsl:variable>
   						<a>
   							<xsl:choose>
   								<xsl:when test="status/visible='true'">
  @@ -206,7 +206,7 @@
   	
   				<!-- mandatory/delete -->
   				<xsl:if test="configuration/mandatory='false'">
  -					<xsl:variable name="linkurlmand"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$sunletident"/></xsl:variable>
  +					<xsl:variable name="linkurlmand"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$copletident"/></xsl:variable>
   					<a>
   						<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurlmand), ' ', '')"/></xsl:attribute>
   						<img src="sunspotdemoimg-delete.gif" border="0" alt="Delete"/>
  @@ -219,9 +219,9 @@
   		<tr>
   			<td colSpan="2">
   			<font>
  -				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/color"/></xsl:attribute>
  -				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/type"/></xsl:attribute>
  -				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/size"/></xsl:attribute>
  +				<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/color"/></xsl:attribute>
  +				<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/type"/></xsl:attribute>
  +				<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/size"/></xsl:attribute>
   				<xsl:apply-templates select="content"/>
   			</font>
   			</td>
  @@ -238,9 +238,9 @@
   	<td><xsl:for-each select="@*"><xsl:copy/></xsl:for-each>
   	<xsl:if test="not(font) and not(FONT)">
   		<font>
  -			<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/color"/></xsl:attribute>
  -			<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/type"/></xsl:attribute>
  -			<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/size"/></xsl:attribute>
  +			<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/color"/></xsl:attribute>
  +			<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/type"/></xsl:attribute>
  +			<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/size"/></xsl:attribute>
   			<xsl:apply-templates/>
   		</font>
   	</xsl:if>
  @@ -253,9 +253,9 @@
   	<td><xsl:for-each select="@*"><xsl:copy/></xsl:for-each>
               <xsl:if test="not(font) and not(FONT)">
   		<font>
  -			<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/color"/></xsl:attribute>
  -			<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/type"/></xsl:attribute>
  -			<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/sunlets/content/font/size"/></xsl:attribute>
  +			<xsl:attribute name="color"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/color"/></xsl:attribute>
  +			<xsl:attribute name="face"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/type"/></xsl:attribute>
  +			<xsl:attribute name="size"><xsl:value-of select="ancestor::portal/layout/coplets/content/font/size"/></xsl:attribute>
   			<xsl:apply-templates/>
   		</font>
   	</xsl:if>
  
  
  
  1.2       +149 -149  xml-cocoon2/src/webapp/sunspotdemo/styles/portalconfHTML.xsl
  
  Index: portalconfHTML.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/styles/portalconfHTML.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- portalconfHTML.xsl	18 Feb 2002 09:10:13 -0000	1.1
  +++ portalconfHTML.xsl	18 Apr 2002 08:13:42 -0000	1.2
  @@ -3,10 +3,10 @@
   <xsl:stylesheet version="1.0" 
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
  -<!-- $Id: portalconfHTML.xsl,v 1.1 2002/02/18 09:10:13 cziegeler Exp $ 
  +<!-- $Id: portalconfHTML.xsl,v 1.2 2002/04/18 08:13:42 cziegeler Exp $ 
   
   
  - Description: sunSpot Portal Configuration to HTML
  + Description: Portal Configuration to HTML
   
   -->
   
  @@ -100,12 +100,12 @@
   	</xsl:choose>
   </xsl:template>
   
  -<!-- sunSpot Configuration -->
  +<!-- Portal Configuration -->
   
   <xsl:template match="portalconf">
   <html>
   <head>
  -    <title>sunSpot Configuration</title>
  +    <title>Portal Configuration</title>
   </head>
   <body text="#0B2A51" link="#0B2A51" vlink="#666666">
   <xsl:attribute name="bgcolor">
  @@ -129,7 +129,7 @@
   								<td bgcolor="#cccccc">
   									<br/>
   									<font face="Arial, Helvetica, sans-serif" size="2">
  -										<xsl:variable name="linkurl"><xsl:value-of select="configuration/portal"/>?sunspotprofile=<xsl:value-of select="configuration/profile"/></xsl:variable>
  +										<xsl:variable name="linkurl"><xsl:value-of select="configuration/portal"/>?portalprofile=<xsl:value-of select="configuration/profile"/></xsl:variable>
   										<b><a target="_top">
   											<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   											<blockquote>Your Portal</blockquote>
  @@ -144,7 +144,7 @@
   								<td bgcolor="#cccccc">
   									<Bbr/>
   									<font face="Arial, Helvetica, sans-serif" size="2">
  -  										<xsl:variable name="linkurl"><xsl:value-of select="configuration/portal"/>?sunspotprofile=<xsl:value-of select="configuration/profile"/>&amp;sunspotcmd=save</xsl:variable>
  +  										<xsl:variable name="linkurl"><xsl:value-of select="configuration/portal"/>?portalprofile=<xsl:value-of select="configuration/profile"/>&amp;portalcmd=save</xsl:variable>
   										<b><a target="_top">
   											<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
                                               <blockquote>Save</blockquote>					
  @@ -188,7 +188,7 @@
   						</tr>
   						<tr>
   							<td>
  -								<xsl:apply-templates select="sunlets-profile"/>
  +								<xsl:apply-templates select="coplets-profile"/>
               				</td>
   						</tr>
   					</table>
  @@ -203,14 +203,14 @@
   </html>
   </xsl:template>
   
  -<!-- /sunSpot Configuration -->
  +<!-- /Portal Configuration -->
   
  -<!-- sunSpot Administration -->
  +<!-- Portal Administration -->
   
   <xsl:template match="portaladminconf">
   <html>
   	<head>
  -		<title>sunSpot Administration</title>
  +		<title>Portal Administration</title>
   	</head>
   	<body text="#0B2A51" link="#0B2A51" vlink="#666666" bgColor="#cccccc">
   		<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0" width="100%"><tbody>
  @@ -230,7 +230,7 @@
                     					</td>
                     					<td bgcolor="#AAB9BF" valign="bottom" align="center" colspan="2">
                       							<font face="Arial, Helvetica, sans-serif" size="6" color="#46627A">
  -									<b>sunSpot Administration</b>
  +									<b>Portal Administration</b>
   								</font>
   		                  			</td>
                   				</tr>
  @@ -271,7 +271,7 @@
   														</td>
   														<td width="1%"><img src="sunspotdemoimg-kast_m.gif"/></td>
   														<td width="98%" colspan="2">
  -															<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=main&amp;sunspotadmin_sunlets=cleancache</xsl:variable>
  +															<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=main&amp;portaladmin_coplets=cleancache</xsl:variable>
   															<font face="Arial, Helvetica, sans-serif" size="2">
   																<a><xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>Clear Profile Cache</a>
   															</font>
  @@ -300,9 +300,9 @@
   														</td>
   														<td width="1%"><img src="sunspotdemoimg-kast_m.gif"/></td>
   														<td width="98%" colspan="2">
  -															<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=sunlets</xsl:variable>
  +															<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=coplets</xsl:variable>
   															<font face="Arial, Helvetica, sans-serif" size="2">
  -																<a><xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>Change sunLet Profile</a>
  +																<a><xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>Change coplet Profile</a>
   															</font>
   														</td>
   													</tr>
  @@ -313,7 +313,7 @@
   														<td width="1%"><img src="sunspotdemoimg-kast_m.gif"/></td>
   														<td width="98%" colspan="2">
   															<font face="Arial, Helvetica, sans-serif" size="2">
  -															     After you have changed the sunLet Profile, you have to logout and login again, before you can edit other profiles.
  +															     After you have changed the coplet Profile, you have to logout and login again, before you can edit other profiles.
   															</font>
   														</td>
   													</tr>
  @@ -344,7 +344,7 @@
   															<xsl:attribute name="color">
   																<xsl:value-of select="ancestor::portalconf/layout-profile/portal/layouts/layout/font/color"/>
   															</xsl:attribute>
  -																<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=global</xsl:variable>
  +																<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=global</xsl:variable>
   																<a><xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>Change global Profile</a>
   															</font>
   														</td>
  @@ -377,7 +377,7 @@
   													<tr>
   														<td colspan="4"><img src="sunspotdemoimg-space.gif" height="10"/></td>
   													</tr>
  -													<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=role</xsl:variable>
  +													<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=role</xsl:variable>
   													<form method="post">
   														<xsl:attribute name="action"><xsl:value-of select="translate(normalize-space($acturl), ' ', '')"/></xsl:attribute>
   													<tr>
  @@ -403,7 +403,7 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<select name="sunspotrole">
  +															<select name="portalrole">
   															<xsl:for-each select="roles/role">
   															<option>
   																<xsl:attribute name="value">
  @@ -467,7 +467,7 @@
   													<tr>
   														<td colspan="4"><img src="sunspotdemoimg-space.gif" height="10"/></td>
   													</tr>
  -													<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=mainrole</xsl:variable>
  +													<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=mainrole</xsl:variable>
   													<form method="post">
   														<xsl:attribute name="action"><xsl:value-of select="translate(normalize-space($acturl), ' ', '')"/></xsl:attribute>
   													<tr>
  @@ -495,7 +495,7 @@
   															<img src="sunspotdemoimg-space.gif" width="10"/>
   															<xsl:variable name="selectedrole"><xsl:value-of select="roleusers/name"/></xsl:variable>
   															<xsl:variable name="selectedstate"><xsl:value-of select="state"/></xsl:variable>
  -															<select name="sunspotrole">
  +															<select name="portalrole">
   															<xsl:for-each select="roles/role">
   															<option>
   																<xsl:if test="normalize-space($selectedstate) = 'mainrole' and normalize-space($selectedrole) = normalize-space(.)">
  @@ -533,10 +533,10 @@
   													</tr>
   												 	</form>
   													<xsl:if test="state = 'mainrole'">
  -														<xsl:variable name="acturl2"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=user</xsl:variable>
  +														<xsl:variable name="acturl2"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=user</xsl:variable>
   														<form method="post">
   															<xsl:attribute name="action"><xsl:value-of select="translate(normalize-space($acturl2), ' ', '')"/></xsl:attribute>
  -															<input name="sunspotrole" type="hidden">
  +															<input name="portalrole" type="hidden">
   																<xsl:attribute name="value"><xsl:value-of select="roleusers/name"/></xsl:attribute>
   															</input>
   															<tr>
  @@ -551,7 +551,7 @@
   																</td>
   																<td width="97%">
   																<img src="sunspotdemoimg-space.gif" width="10"/>
  -																<select name="sunspotid">
  +																<select name="portalid">
   																<xsl:for-each select="roleusers/users/user">
   																	<option>
   																		<xsl:attribute name="value">
  @@ -627,7 +627,7 @@
   											<td bgcolor="#cccccc">
   												<br/>
   												<font face="Arial, Helvetica, sans-serif" size="2">
  -													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=main</xsl:variable>
  +													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=main</xsl:variable>
   													<b><a>
   														<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   														<blockquote>Main</blockquote>
  @@ -642,7 +642,7 @@
   											<td bgcolor="#cccccc">
   												<br/>
   												<font face="Arial, Helvetica, sans-serif" size="2"><b>
  -													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=main&amp;sunspotcmd=save</xsl:variable>
  +													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=main&amp;portalcmd=save</xsl:variable>
   													<a><xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   														<blockquote>Save</blockquote>
   													</a>
  @@ -711,7 +711,7 @@
   												</tr>
   												<tr>
   													<td>
  -														<xsl:apply-templates select="portalconf/sunlets-profile"/>
  +														<xsl:apply-templates select="portalconf/coplets-profile"/>
               			            								</td>
   												</tr>
   												<tr>
  @@ -721,8 +721,8 @@
   												</tr>
   												<tr>
   													<td>
  -														<xsl:for-each select="portalconf/sunlets-profile">
  -															<xsl:call-template name="admin_sunlets-profile"/>
  +														<xsl:for-each select="portalconf/coplets-profile">
  +															<xsl:call-template name="admin_coplets-profile"/>
   														</xsl:for-each>
               				            							</td>
   												</tr>
  @@ -734,7 +734,7 @@
   							</td>
   						</tr>
   						</xsl:when>
  -						<xsl:when test="state='sunlets'"> 
  +						<xsl:when test="state='coplets'"> 
   							<tr>
   
   <!--  Menue -->
  @@ -748,7 +748,7 @@
   											<td bgcolor="#cccccc">
   												<br/>
   												<font face="Arial, Helvetica, sans-serif" size="2">
  -													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=main</xsl:variable>
  +													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=main</xsl:variable>
   													<b><a>
   														<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   														<blockquote>Main</blockquote>
  @@ -763,7 +763,7 @@
   											<td bgcolor="#cccccc">
   												<br/>
   												<font face="Arial, Helvetica, sans-serif" size="2"><b>
  -													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=main&amp;sunspotadmin_sunlets=save</xsl:variable>
  +													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=main&amp;portaladmin_coplets=save</xsl:variable>
   													<a>
   														<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   														<blockquote>Save</blockquote>
  @@ -777,7 +777,7 @@
   
   <!-- Content -->
   			                  	<td><img src="sunspotdemoimg-space.gif" height="1" width="10"/></td>
  -								<!-- Present list of sunLets for editing-->
  +								<!-- Present list of coplets for editing-->
   								<td align="center">
   									<table cellpadding="2" cellspacing="0" border="0" bgcolor="#46627A" width="400" nowrap="">
   										<tr>	
  @@ -786,7 +786,7 @@
   													<tr>
   														<td colspan="4"><img src="sunspotdemoimg-space.gif" height="10" width="1"/></td>
   													</tr>
  -													<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=sunlet</xsl:variable>
  +													<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=coplet</xsl:variable>
   													<form method="post">
   														<xsl:attribute name="action"><xsl:value-of select="translate(normalize-space($acturl), ' ', '')"/></xsl:attribute>
   													<tr>
  @@ -796,7 +796,7 @@
   														<td width="1%"><img src="sunspotdemoimg-kast_o.gif"/></td>
   														<td colspan="2">
   															<font face="Arial, Helvetica, sans-serif" size="2">
  -																<b>Edit sunLet</b>
  +																<b>Edit coplet</b>
   															</font>
   														</td>
   													</tr>
  @@ -807,11 +807,11 @@
   																	</td>
   																	<td width="98%" colspan="2">
   																		<font face="Arial, Helvetica, sans-serif" size="2">
  -																			sunLet:
  +																			coplet:
   																		</font>
   																		<img src="sunspotdemoimg-space.gif" width="10"/>
  -																		<select name="sunspotsunlet">
  -																		<xsl:for-each select="sunlets/sunlets-profile/sunlets/sunlet">
  +																		<select name="portalcoplet">
  +																		<xsl:for-each select="coplets/coplets-profile/coplets/coplet">
   																		<option>
   																			<xsl:attribute name="value">
   																				<xsl:value-of select="normalize-space(@id)"/>
  @@ -836,7 +836,7 @@
   																	</td>
   																	<td width="1%">
   																		<font face="Arial, Helvetica, sans-serif" size="2">
  -																			<input type="submit" value="sunLet bearbeiten"/>
  +																			<input type="submit" value="Change coplet"/>
   																		</font>
   																	</td>
   																	<td width="97%">
  @@ -855,7 +855,7 @@
   												</table>
   												<br/>
   								
  -									<!-- Present list of sunLets for deleting-->
  +									<!-- Present list of coplets for deleting-->
   												<table cellpadding="2" cellspacing="0" border="0" bgcolor="#46627A" width="400">
   													<tr>	
   														<td>
  @@ -863,7 +863,7 @@
   																<tr>
   																	<td colspan="4"><img src="sunspotdemoimg-space.gif" height="10"/></td>
   																</tr>
  -																<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=sunlets&amp;sunspotadmin_sunlets=delete</xsl:variable>
  +																<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=coplets&amp;portaladmin_coplets=delete</xsl:variable>
   																<form method="post">
   																<xsl:attribute name="action"><xsl:value-of select="translate(normalize-space($acturl), ' ', '')"/></xsl:attribute>
   																<tr>
  @@ -873,7 +873,7 @@
   																	<td width="1%"><img src="sunspotdemoimg-kast_o.gif"/></td>
   																	<td colspan="2">
   																		<font face="Arial, Helvetica, sans-serif" size="2">
  -																			<b>Delete sunLet</b>
  +																			<b>Delete coplet</b>
   																		</font>
   																	</td>
   																</tr>
  @@ -884,11 +884,11 @@
   																	</td>		
   																	<td width="98%" colspan="2">
   																		<font face="Arial, Helvetica, sans-serif" size="2">
  -																			sunLet:
  +																			coplet:
   																		</font>
   																		<img src="sunspotdemoimg-space.gif" width="10"/>
  -																		<select name="sunspotsunlet">
  -																			<xsl:for-each select="sunlets/sunlets-profile/sunlets/sunlet">
  +																		<select name="portalcoplet">
  +																			<xsl:for-each select="coplets/coplets-profile/coplets/coplet">
   																			<option>
   																			<xsl:attribute name="value">
   																				<xsl:value-of select="normalize-space(@id)"/>
  @@ -913,7 +913,7 @@
   																	</td>
   																	<td width="1%">
   																		<font face="Arial, Helvetica, sans-serif" size="2">
  -																			<input type="submit" value="Delete sunLet"/>
  +																			<input type="submit" value="Delete coplet"/>
   																		</font>
   																	</td>
   																	<td width="97%">
  @@ -932,8 +932,8 @@
   												</table>
   												<br/>
   								
  -									<!--New sunLet-->
  -												<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=sunlet&amp;sunspotadmin_sunlets=new</xsl:variable>
  +									<!--New coplet-->
  +												<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=coplet&amp;portaladmin_coplets=new</xsl:variable>
   												<form method="post">
   													<xsl:attribute name="action"><xsl:value-of select="translate(normalize-space($acturl), ' ', '')"/></xsl:attribute>
   												<table cellpadding="2" cellspacing="0" border="0" bgcolor="#46627A" width="400">
  @@ -952,7 +952,7 @@
   														<td width="1%"><img src="sunspotdemoimg-kast_o.gif"/></td>
   														<td colspan="2">
   															<font face="Arial, Helvetica, sans-serif" size="2">
  -																<b>New sunLet</b>
  +																<b>New coplet</b>
   															</font>
   														</td>
   													</tr>
  @@ -966,7 +966,7 @@
   																Titel:
   															</font>
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<input name="sunspotadmin_title" type="text" size="25"/>
  +															<input name="portaladmin_title" type="text" size="25"/>
   														</td>
   													</tr>
   													<tr>
  @@ -983,7 +983,7 @@
   														</td>
   														<td width="1%">
   															<font face="Arial, Helvetica, sans-serif" size="2">
  -																<input type="submit" value="Create New sunLet"/>
  +																<input type="submit" value="Create New coplet"/>
   															</font>
   														</td>
   														<td width="97%">
  @@ -1005,7 +1005,7 @@
   					</td>
   				</tr>
   			</xsl:when>
  -			<xsl:otherwise> <!-- otherwise means state='sunlet' -->
  +			<xsl:otherwise> <!-- otherwise means state='coplet' -->
   				<tr>
   
   <!--  Menue -->
  @@ -1019,10 +1019,10 @@
   											<td bgcolor="#cccccc">
   												<br/>
   												<font face="Arial, Helvetica, sans-serif" size="2">
  -													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=sunlets</xsl:variable>
  +													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=coplets</xsl:variable>
   													<b><a>
   														<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
  -														<center>List of sunLets</center>
  +														<center>List of coplets</center>
   													</a></b>
   												</font>
   											</td>
  @@ -1034,14 +1034,14 @@
   											<td bgcolor="#cccccc">
   												<br/>
   												<font face="Arial, Helvetica, sans-serif" size="2"><b>
  -													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=sunlets&amp;sunspotadmin_sunlets=save</xsl:variable>
  +													<xsl:variable name="linkurl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=coplets&amp;portaladmin_coplets=save</xsl:variable>
   													<a>
   														<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   														<center>Save</center>
   													</a>
   												</b></font>
   									<font face="Arial, Helvetica, sans-serif" size="1">
  -                                                                                                                        <p align="center">If you have changed the sunLet Profile, you have to accept them by "Change"</p>
  +                                                                                                                        <p align="center">If you have changed the coplet Profile, you have to accept them by "Change"</p>
   									</font>
   											</td>
   										</tr>
  @@ -1052,12 +1052,12 @@
   <!-- Content -->
   			                  				<td align="center">
   								</td>
  -								<td> <!-- Edit one sunLet -->
  +								<td> <!-- Edit one coplet -->
   												<table cellpadding="0" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
   													<tr>
   														<td colspan="4"><img src="sunspotdemoimg-space.gif" height="10"/></td>
   													</tr>
  -													<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;sunspotadmin=sunlet&amp;sunspotsunlet=<xsl:value-of select="sunlet/@id"/>&amp;sunspotadmin_sunlets=change</xsl:variable>
  +													<xsl:variable name="acturl"><xsl:value-of select="configuration/uri"/>&amp;portaladmin=coplet&amp;portalcoplet=<xsl:value-of select="coplet/@id"/>&amp;portaladmin_coplets=change</xsl:variable>
   													<form method="post">
   														<xsl:attribute name="action"><xsl:value-of select="translate(normalize-space($acturl), ' ', '')"/></xsl:attribute>
   													<tr>
  @@ -1067,7 +1067,7 @@
   														<td width="1%"><img src="sunspotdemoimg-kast_o.gif"/></td>
   														<td colspan="2">
   															<font face="Arial, Helvetica, sans-serif" size="2">
  -																<b><xsl:value-of select="sunlet/title"></xsl:value-of></b>
  +																<b><xsl:value-of select="coplet/title"></xsl:value-of></b>
   															</font>
   														</td>
   													</tr>
  @@ -1083,8 +1083,8 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<input name="sunspotadmin_title" type="text" size="40">
  -																<xsl:attribute name="value"><xsl:value-of select="sunlet/title"></xsl:value-of></xsl:attribute>
  +															<input name="portaladmin_title" type="text" size="40">
  +																<xsl:attribute name="value"><xsl:value-of select="coplet/title"></xsl:value-of></xsl:attribute>
   															</input>
   														</td>
   													</tr>
  @@ -1100,7 +1100,7 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<input name="sunspotadmin_resource" type="text" size="40" value="{sunlet/resource/@uri}"/>
  +															<input name="portaladmin_resource" type="text" size="40" value="{coplet/resource/@uri}"/>
   														</td>
   													</tr>
   													<tr>
  @@ -1117,7 +1117,7 @@
   															<img src="sunspotdemoimg-space.gif" width="10"/>
   														</td>
   													</tr>
  -													<xsl:for-each select="sunlet/transformation/stylesheet">
  +													<xsl:for-each select="coplet/transformation/stylesheet">
   														<tr>
   															<td width="1%"><img src="sunspotdemoimg-space.gif" width="30"/></td>
   															<td width="1%" background="sunspotdemoimg-line_bg.gif">
  @@ -1133,11 +1133,11 @@
   																<font face="Arial, Helvetica, sans-serif" size="2">
   																<input type="text" size="30">
   																	<xsl:attribute name="value"><xsl:value-of select="."/></xsl:attribute>
  -																	<xsl:attribute name="name">sunspotadmin_xsl_<xsl:value-of select="position()"/></xsl:attribute>
  +																	<xsl:attribute name="name">portaladmin_xsl_<xsl:value-of select="position()"/></xsl:attribute>
   																</input>
   																<input type="checkbox">
   																	<xsl:attribute name="value"><xsl:value-of select="."/></xsl:attribute>
  -																	<xsl:attribute name="name">sunspotadmin_delxsl_<xsl:value-of select="position()"/></xsl:attribute>
  +																	<xsl:attribute name="name">portaladmin_delxsl_<xsl:value-of select="position()"/></xsl:attribute>
   																</input>delete
   																</font>
   															</td>
  @@ -1156,7 +1156,7 @@
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
   															<font face="Arial, Helvetica, sans-serif" size="2">
  -															<input type="checkbox" name="sunspotadmin_newxsl" value="true"/>Add Transformation
  +															<input type="checkbox" name="portaladmin_newxsl" value="true"/>Add Transformation
   															</font>
   														</td>
   													</tr>
  @@ -1172,12 +1172,12 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<select name="sunspotadmin_active">
  -																<option value="true"><xsl:if test="normalize-space(sunlet/configuration/active)='true'">
  +															<select name="portaladmin_active">
  +																<option value="true"><xsl:if test="normalize-space(coplet/configuration/active)='true'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>Yes
   																</option>
  -																<option value="false"><xsl:if test="normalize-space(sunlet/configuration/active)='false'">
  +																<option value="false"><xsl:if test="normalize-space(coplet/configuration/active)='false'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>No
   																</option>
  @@ -1196,12 +1196,12 @@
   														</td>
   														<td width="60%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<select name="sunspotadmin_mand">
  -																<option value="true"><xsl:if test="normalize-space(sunlet/configuration/mandatory)='true'">
  +															<select name="portaladmin_mand">
  +																<option value="true"><xsl:if test="normalize-space(coplet/configuration/mandatory)='true'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>Yes
   																</option>
  -																<option value="false"><xsl:if test="normalize-space(sunlet/configuration/mandatory)='false'">
  +																<option value="false"><xsl:if test="normalize-space(coplet/configuration/mandatory)='false'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>No
   																</option>
  @@ -1220,12 +1220,12 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<select name="sunspotadmin_sizable">
  -																<option value="true"><xsl:if test="normalize-space(sunlet/configuration/sizable)='true'">
  +															<select name="portaladmin_sizable">
  +																<option value="true"><xsl:if test="normalize-space(coplet/configuration/sizable)='true'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>Yes
   																</option>
  -																<option value="false"><xsl:if test="normalize-space(sunlet/configuration/sizable)='false'">
  +																<option value="false"><xsl:if test="normalize-space(coplet/configuration/sizable)='false'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>No
   																</option>
  @@ -1244,12 +1244,12 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<select name="sunspotadmin_handsize">
  -																<option value="true"><xsl:if test="normalize-space(sunlet/configuration/handlesSizable)='true'">
  +															<select name="portaladmin_handsize">
  +																<option value="true"><xsl:if test="normalize-space(coplet/configuration/handlesSizable)='true'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>Yes
   																</option>
  -																<option value="false"><xsl:if test="normalize-space(sunlet/configuration/handlesSizable)='false' or not(sunlet/configuration/handlesSizable)">
  +																<option value="false"><xsl:if test="normalize-space(coplet/configuration/handlesSizable)='false' or not(coplet/configuration/handlesSizable)">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>No
   																</option>
  @@ -1268,12 +1268,12 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<select name="sunspotadmin_handpar">
  -																<option value="true"><xsl:if test="normalize-space(sunlet/configuration/handlesParameters)='true' or not(sunlet/configuration/handlesParameters)">
  +															<select name="portaladmin_handpar">
  +																<option value="true"><xsl:if test="normalize-space(coplet/configuration/handlesParameters)='true' or not(coplet/configuration/handlesParameters)">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>Yes
   																</option>
  -																<option value="false"><xsl:if test="normalize-space(sunlet/configuration/handlesParameters)='false'">
  +																<option value="false"><xsl:if test="normalize-space(coplet/configuration/handlesParameters)='false'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>No
   																</option>
  @@ -1292,19 +1292,19 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<select name="sunspotadmin_customizable">
  -																<option value="true"><xsl:if test="normalize-space(sunlet/configuration/customizable)='true'">
  +															<select name="portaladmin_customizable">
  +																<option value="true"><xsl:if test="normalize-space(coplet/configuration/customizable)='true'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>Yes
   																</option>
  -																<option value="false"><xsl:if test="normalize-space(sunlet/configuration/customizable)='false' or not(sunlet/configuration/customizable)">
  +																<option value="false"><xsl:if test="normalize-space(coplet/configuration/customizable)='false' or not(coplet/configuration/customizable)">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>No
   																</option>
   															</select>
   														</td>
   													</tr>
  -													<xsl:if test="normalize-space(sunlet/configuration/customizable)='true'">
  +													<xsl:if test="normalize-space(coplet/configuration/customizable)='true'">
   													<tr>
   														<td width="1%"><img src="sunspotdemoimg-space.gif" width="30"/></td>
   														<td width="1%" background="sunspotdemoimg-line_bg.gif">
  @@ -1317,7 +1317,7 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<input name="sunspotadmin_cust" type="text" size="40" value="{sunlet/customization/@uri}"/>
  +															<input name="portaladmin_cust" type="text" size="40" value="{coplet/customization/@uri}"/>
   														</td>
   													</tr>
   													<tr>
  @@ -1332,12 +1332,12 @@
   														</td>
   														<td width="97%">
   															<img src="sunspotdemoimg-space.gif" width="10"/>
  -															<select name="sunspotadmin_persistent">
  -																<option value="true"><xsl:if test="normalize-space(sunlet/configuration/persistent)='true'">
  +															<select name="portaladmin_persistent">
  +																<option value="true"><xsl:if test="normalize-space(coplet/configuration/persistent)='true'">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>Yes
   																</option>
  -																<option value="false"><xsl:if test="normalize-space(sunlet/configuration/persistent)='false' or not(sunlet/configuration/persistent)">
  +																<option value="false"><xsl:if test="normalize-space(coplet/configuration/persistent)='false' or not(coplet/configuration/persistent)">
   																	<xsl:attribute name="selected">true</xsl:attribute>
   																	</xsl:if>No
   																</option>
  @@ -1359,7 +1359,7 @@
   														</td>
   														<td width="1%">
   															<font face="Arial, Helvetica, sans-serif" size="2">
  -																<input type="submit" name="sunspotadmin_submit" value="Change"/>
  +																<input type="submit" name="portaladmin_submit" value="Change"/>
   															</font>
   														</td>
   														<td width="97%">
  @@ -1397,7 +1397,7 @@
   </html>
   </xsl:template>
   
  -<!-- /sunSpot Administration -->
  +<!-- /Portal Administration -->
   
   <!-- Portal-Layout -->
   
  @@ -1440,20 +1440,20 @@
   								</td>
   							<td width="80%" valign="bottom" colspan="2">
   									<img src="sunspotdemoimg-space.gif"/>
  -									<xsl:if test="ancestor::portaladminconf and ancestor::portalconf/portal-profile/content/header/sunlet">
  +									<xsl:if test="ancestor::portaladminconf and ancestor::portalconf/portal-profile/content/header/coplet">
   									<font face="Arial, Helvetica, sans-serif" size="2">
   									<xsl:attribute name="color">
   									<xsl:value-of select="ancestor::portalconf/layout-profile/portal/layouts/layout/font/color"/>
   									</xsl:attribute>
  -  									<xsl:variable name="sunletid" select="ancestor::portalconf/portal-profile/content/header/sunlet/@id"/>
  -									<xsl:value-of select="ancestor::portalconf/sunlets-profile/sunlets/sunlet[@id = $sunletid]/title"/>
  +  									<xsl:variable name="copletid" select="ancestor::portalconf/portal-profile/content/header/coplet/@id"/>
  +									<xsl:value-of select="ancestor::portalconf/coplets-profile/coplets/coplet[@id = $copletid]/title"/>
   									</font>
   									</xsl:if>
   								<img src="sunspotdemoimg-space.gif" width="10" height="1"/>
  -									<xsl:if test="ancestor::portaladminconf and ancestor::portalconf/portal-profile/content/header/sunlet">
  -									<xsl:variable name="cmd"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;sunspotcmd=</xsl:variable>
  -									<xsl:variable name="sunletident"><xsl:value-of select="ancestor::portalconf/portal-profile/content/header/sunlet/@id"/>_<xsl:value-of select="ancestor::portalconf/portal-profile/content/header/sunlet/@number"/></xsl:variable>
  -									<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$sunletident"/></xsl:variable>
  +									<xsl:if test="ancestor::portaladminconf and ancestor::portalconf/portal-profile/content/header/coplet">
  +									<xsl:variable name="cmd"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;portalcmd=</xsl:variable>
  +									<xsl:variable name="copletident"><xsl:value-of select="ancestor::portalconf/portal-profile/content/header/coplet/@id"/>_<xsl:value-of select="ancestor::portalconf/portal-profile/content/header/coplet/@number"/></xsl:variable>
  +									<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$copletident"/></xsl:variable>
   									<a>
   										<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   										<img src="sunspotdemoimg-delete.gif" border="0" alt="Delete"/>
  @@ -1468,24 +1468,24 @@
   							</td>
   							<td>
   								<img src="sunspotdemoimg-space.gif"/>
  -								<xsl:if test="ancestor::portaladminconf and ancestor::portalconf/portal-profile/content/footer/sunlet">
  -  									<xsl:variable name="sunletid" select="ancestor::portalconf/portal-profile/content/footer/sunlet/@id"/>
  -									<xsl:value-of select="ancestor::portalconf/sunlets-profile/sunlets/sunlet[@id = $sunletid]/title"/>
  +								<xsl:if test="ancestor::portaladminconf and ancestor::portalconf/portal-profile/content/footer/coplet">
  +  									<xsl:variable name="copletid" select="ancestor::portalconf/portal-profile/content/footer/coplet/@id"/>
  +									<xsl:value-of select="ancestor::portalconf/coplets-profile/coplets/coplet[@id = $copletid]/title"/>
   								</xsl:if>
   							</td>
   							<td>
   								<img src="sunspotdemoimg-space.gif"/>
  -									<xsl:if test="ancestor::portaladminconf and ancestor::portalconf/portal-profile/content/footer/sunlet">
  +									<xsl:if test="ancestor::portaladminconf and ancestor::portalconf/portal-profile/content/footer/coplet">
   										<xsl:variable name="cmd">
   											<xsl:value-of select="ancestor::portalconf/configuration/uri"/>
  -											&amp;sunspotcmd=
  +											&amp;portalcmd=
   										</xsl:variable>
  -										<xsl:variable name="sunletident">
  -											<xsl:value-of select="ancestor::portalconf/portal-profile/content/footer/sunlet/@id"/>
  +										<xsl:variable name="copletident">
  +											<xsl:value-of select="ancestor::portalconf/portal-profile/content/footer/coplet/@id"/>
   												_
  -											<xsl:value-of select="ancestor::portalconf/portal-profile/content/footer/sunlet/@number"/>
  +											<xsl:value-of select="ancestor::portalconf/portal-profile/content/footer/coplet/@number"/>
   										</xsl:variable>
  -										<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$sunletident"/></xsl:variable>
  +										<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$copletident"/></xsl:variable>
   										<a>
   											<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   											<img src="sunspotdemoimg-delete.gif" border="0" alt="Delete"/>
  @@ -1620,14 +1620,14 @@
   
   <!-- /Portal-Layout Spalten -->
   
  -<!-- selected sunLets-->
  +<!-- selected coplets-->
   
   <xsl:template match="portal-profile">
   <font face="Arial, Helvetica, sans-serif" size="3">
   <xsl:attribute name="color">
   	<xsl:value-of select="ancestor::portalconf/layout-profile/portal/layouts/layout/font/color"/>
   </xsl:attribute>
  -	<b>Your sunLets</b>
  +	<b>Your coplets</b>
   </font>
   <table cellspacing="0" cellpadding="2" bgcolor="#46627A" width="100%" border="0">
   	<tr>
  @@ -1647,9 +1647,9 @@
   </table>
   </xsl:template>
   
  -<!-- / selected sunLets -->
  +<!-- / selected coplets -->
   
  -<!-- selected sunLets columns -->
  +<!-- selected coplets columns -->
   
   <xsl:template match="column">
   <xsl:variable name="colfirst" select="@position=1"/>
  @@ -1666,43 +1666,43 @@
   					<xsl:attribute name="color">
   						<xsl:value-of select="ancestor::portalconf/layout-profile/portal/layouts/layout/font/color"/>
   					</xsl:attribute>
  -						<b>sunLet</b>
  +						<b>coplet</b>
   					</font>
   				</td>
   			</tr>
  -			<xsl:for-each select="sunlets/sunlet">
  +			<xsl:for-each select="coplets/coplet">
                     		    <xsl:sort select="@position"/>
                                           <xsl:variable name="pos" select="@position"/>
  -			    <xsl:variable name="notrowfirst" select="ancestor::sunlets/sunlet[@position&lt;$pos]"/>
  -			    <xsl:variable name="notrowlast" select="ancestor::sunlets/sunlet[@position&gt;$pos]"/>
  -			    <xsl:variable name="cmd"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;sunspotcmd=</xsl:variable>
  -				<xsl:variable name="sunletid" select="@id"/>
  -				<xsl:variable name="sunletident"><xsl:value-of select="@id"/>_<xsl:value-of select="@number"/></xsl:variable>
  -				<xsl:variable name="sunletconf" select="ancestor::portalconf/sunlets-profile/sunlets/sunlet[@id=$sunletid]"/>
  +			    <xsl:variable name="notrowfirst" select="ancestor::coplets/coplet[@position&lt;$pos]"/>
  +			    <xsl:variable name="notrowlast" select="ancestor::coplets/coplet[@position&gt;$pos]"/>
  +			    <xsl:variable name="cmd"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;portalcmd=</xsl:variable>
  +				<xsl:variable name="copletid" select="@id"/>
  +				<xsl:variable name="copletident"><xsl:value-of select="@id"/>_<xsl:value-of select="@number"/></xsl:variable>
  +				<xsl:variable name="copletconf" select="ancestor::portalconf/coplets-profile/coplets/coplet[@id=$copletid]"/>
   				<tr valign="top">
   					<td>
   						<xsl:if test="not($colfirst)">
  -							<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>move_<xsl:value-of select="$sunletident"/>_<xsl:value-of select="$prevcol"/></xsl:variable>
  +							<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>move_<xsl:value-of select="$copletident"/>_<xsl:value-of select="$prevcol"/></xsl:variable>
   							<a><xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute><img src="sunspotdemoimg-left.gif" border="0" alt="Move to left"/></a>
   						</xsl:if>
   						<xsl:if test="not($collast)">
  -							<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>move_<xsl:value-of select="$sunletident"/>_<xsl:value-of select="$nextcol"/></xsl:variable>
  +							<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>move_<xsl:value-of select="$copletident"/>_<xsl:value-of select="$nextcol"/></xsl:variable>
   							<a><xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute><img src="sunspotdemoimg-right.gif" border="0" alt="Move to right"/></a>
   						</xsl:if>
   						<xsl:if test="$notrowfirst">
  -						    <xsl:for-each select="ancestor::sunlets/sunlet[@position&lt;$pos]">
  +						    <xsl:for-each select="ancestor::coplets/coplet[@position&lt;$pos]">
                                       			            <xsl:sort select="@position" order="descending"/>
   				                                                <xsl:if test="position()=1">
  -									<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>row_<xsl:value-of select="$sunletident"/>_<xsl:value-of select="@position"/></xsl:variable>
  +									<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>row_<xsl:value-of select="$copletident"/>_<xsl:value-of select="@position"/></xsl:variable>
   									<a><xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute><img src="sunspotdemoimg-up.gif" border="0" alt="Move up"/></a>
   								</xsl:if>
   				                            </xsl:for-each>
   						</xsl:if>
   						<xsl:if test="$notrowlast">
  -						    <xsl:for-each select="ancestor::sunlets/sunlet[@position&gt;$pos]">
  +						    <xsl:for-each select="ancestor::coplets/coplet[@position&gt;$pos]">
                                       			            <xsl:sort select="@position"/>
   				                                                <xsl:if test="position()=1">
  -									<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>row_<xsl:value-of select="$sunletident"/>_<xsl:value-of select="@position"/></xsl:variable>
  +									<xsl:variable name="linkurl"><xsl:value-of select="$cmd"/>row_<xsl:value-of select="$copletident"/>_<xsl:value-of select="@position"/></xsl:variable>
   									<a><xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute><img src="sunspotdemoimg-down.gif" border="0" alt="Move down"/></a>
   								</xsl:if>
   				                            </xsl:for-each>
  @@ -1714,15 +1714,15 @@
   						<xsl:attribute name="color">
   							<xsl:value-of select="ancestor::portalconf/layout-profile/portal/layouts/layout/font/color"/>
   						</xsl:attribute>
  -							<xsl:value-of select="$sunletconf/title"/>
  +							<xsl:value-of select="$copletconf/title"/>
   						</font>
   						<img src="sunspotdemoimg-space.gif" width="5" height="1"/>
   					</td>
   					<td align="right">
   						<!-- minimize/maximize -->
  -						<xsl:variable name="linkurlmax"><xsl:value-of select="$cmd"/>minimize_<xsl:value-of select="$sunletident"/></xsl:variable>
  -						<xsl:variable name="linkurlmin"><xsl:value-of select="$cmd"/>maximize_<xsl:value-of select="$sunletident"/></xsl:variable>
  -						<xsl:if test="$sunletconf/configuration/sizable='true' and status/size/@formpath">
  +						<xsl:variable name="linkurlmax"><xsl:value-of select="$cmd"/>minimize_<xsl:value-of select="$copletident"/></xsl:variable>
  +						<xsl:variable name="linkurlmin"><xsl:value-of select="$cmd"/>maximize_<xsl:value-of select="$copletident"/></xsl:variable>
  +						<xsl:if test="$copletconf/configuration/sizable='true' and status/size/@formpath">
   							<a>
   								<xsl:choose>
   									<xsl:when test="status/size='max'">
  @@ -1737,10 +1737,10 @@
   							</a>
   						</xsl:if>
   						<!-- show/ hide -->
  -						<xsl:variable name="linkurlshow"><xsl:value-of select="$cmd"/>show_<xsl:value-of select="$sunletident"/></xsl:variable>
  -						<xsl:variable name="linkurlhide"><xsl:value-of select="$cmd"/>hide_<xsl:value-of select="$sunletident"/></xsl:variable>
  +						<xsl:variable name="linkurlshow"><xsl:value-of select="$cmd"/>show_<xsl:value-of select="$copletident"/></xsl:variable>
  +						<xsl:variable name="linkurlhide"><xsl:value-of select="$cmd"/>hide_<xsl:value-of select="$copletident"/></xsl:variable>
   						<xsl:choose>
  -							<xsl:when test="status/visible/@formpath and $sunletconf/configuration/mandatory='false'">
  +							<xsl:when test="status/visible/@formpath and $copletconf/configuration/mandatory='false'">
   								<a>
   									<xsl:choose>
   										<xsl:when test="status/visible='true'">
  @@ -1756,8 +1756,8 @@
   							</xsl:when>
   						</xsl:choose>
   						<!-- mandatory/delete -->
  -						<xsl:variable name="linkurlmand"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$sunletident"/></xsl:variable>
  -						<xsl:if test="$sunletconf/configuration/mandatory='false'">
  +						<xsl:variable name="linkurlmand"><xsl:value-of select="$cmd"/>delete_<xsl:value-of select="$copletident"/></xsl:variable>
  +						<xsl:if test="$copletconf/configuration/mandatory='false'">
   							<a>
   								<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurlmand), ' ', '')"/></xsl:attribute>
   								<img src="sunspotdemoimg-delete.gif" border="0" alt="Delete"/>
  @@ -1771,16 +1771,16 @@
   </td>
   </xsl:template>
   
  -<!-- /selected sunLets columns -->
  +<!-- /selected coplets columns -->
   
  -<!-- All sunLets-->
  +<!-- All coplets-->
   
  -<xsl:template match="sunlets-profile">	
  +<xsl:template match="coplets-profile">	
   <font face="Arial, Helvetica, sans-serif" size="3">
   <xsl:attribute name="color">
   	<xsl:value-of select="ancestor::portalconf/layout-profile/portal/layouts/layout/font/color"/>
   </xsl:attribute>
  -	<b>All sunLets</b>
  +	<b>All coplets</b>
   </font>
   <table cellspacing="0" cellpadding="2" bgcolor="#46627A" width="100%" border="0">
   	<tr>
  @@ -1791,7 +1791,7 @@
   			</xsl:attribute>
   				<tbody>
   					<xsl:if test="ancestor::portaladminconf">
  -						<xsl:for-each select="sunlets/sunlet[configuration/active='true']">
  +						<xsl:for-each select="coplets/coplet[configuration/active='true']">
   							<tr>
   							<td>
   							<font face="Arial, Helvetica, sans-serif" size="2">
  @@ -1802,7 +1802,7 @@
   							</font>
   						</td>
   						<td>
  -							<xsl:variable name="linkurl"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;sunspotcmd=new_<xsl:value-of select="@id"/>_1</xsl:variable>
  +							<xsl:variable name="linkurl"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;portalcmd=new_<xsl:value-of select="@id"/>_1</xsl:variable>
   							<a>
   								<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   								<font face="Arial, Helvetica, sans-serif" size="2">
  @@ -1814,7 +1814,7 @@
   							</a>
   						</td>	
   						<td>
  -							<xsl:variable name="linkurl"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;sunspotcmd=new_<xsl:value-of select="@id"/>_header</xsl:variable>
  +							<xsl:variable name="linkurl"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;portalcmd=new_<xsl:value-of select="@id"/>_header</xsl:variable>
   							<a>
   								<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   								<font face="Arial, Helvetica, sans-serif" size="2">
  @@ -1826,7 +1826,7 @@
   							</a>
   						</td>	
   						<td>
  -							<xsl:variable name="linkurl"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;sunspotcmd=new_<xsl:value-of select="@id"/>_footer</xsl:variable>
  +							<xsl:variable name="linkurl"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;portalcmd=new_<xsl:value-of select="@id"/>_footer</xsl:variable>
   							<a>
   								<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   								<font face="Arial, Helvetica, sans-serif" size="2">
  @@ -1841,7 +1841,7 @@
   					</xsl:for-each>
   				</xsl:if>
   				<xsl:if test="not(ancestor::portaladminconf)">
  -					<xsl:for-each select="sunlets/sunlet[configuration/active='true' and configuration/mandatory='false']">
  +					<xsl:for-each select="coplets/coplet[configuration/active='true' and configuration/mandatory='false']">
   						<tr>
   						<td>
   							<font face="Arial, Helvetica, sans-serif" size="2">
  @@ -1852,7 +1852,7 @@
   							</font>
   						</td>
   						<td>
  -							<xsl:variable name="linkurl"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;sunspotcmd=new_<xsl:value-of select="@id"/>_1</xsl:variable>
  +							<xsl:variable name="linkurl"><xsl:value-of select="ancestor::portalconf/configuration/uri"/>&amp;portalcmd=new_<xsl:value-of select="@id"/>_1</xsl:variable>
   							<a>
   								<xsl:attribute name="href"><xsl:value-of select="translate(normalize-space($linkurl), ' ', '')"/></xsl:attribute>
   								<font face="Arial, Helvetica, sans-serif" size="2">
  @@ -1874,9 +1874,9 @@
   </table>
   </xsl:template>
   
  -<!-- /All sunLets -->
  +<!-- /All coplets -->
   
  -<xsl:template name="admin_sunlets-profile">	
  +<xsl:template name="admin_coplets-profile">	
   <form method="post">
   <xsl:attribute name="action">
   	<xsl:value-of select="normalize-space(ancestor::portalconf/configuration/uri)"/>
  @@ -1885,7 +1885,7 @@
   <xsl:attribute name="color">
   <xsl:value-of select="ancestor::portalconf/layout-profile/portal/layouts/layout/font/color"/>
   		</xsl:attribute>
  -<b>sunLets Configuration</b></font>
  +<b>coplets Configuration</b></font>
   <table cellspacing="0" cellpadding="2" bgcolor="#46627A" width="100%" border="0">
   	<tr>
   		<td>
  @@ -1894,13 +1894,13 @@
   				<xsl:value-of select="ancestor::portalconf/layout-profile/portal/layouts/layout/background/color"/>
   			</xsl:attribute>
   				<tbody>
  -				<xsl:for-each select="sunlets/sunlet">
  +				<xsl:for-each select="coplets/coplet">
   					<tr>
   						<td colspan="2">
   							<font face="Arial, Helvetica, sans-serif" size="2">
   <xsl:attribute name="color">
   <xsl:value-of select="ancestor::portalconf/layout-profile/portal/layouts/layout/font/color"/>
  -		</xsl:attribute><b>sunLet: <xsl:value-of select="title"/></b></font>
  +		</xsl:attribute><b>coplet: <xsl:value-of select="title"/></b></font>
   						</td>
   					</tr>
   					<xsl:for-each select="descendant::*[@formdescription and @formpath and @formtype]">	
  @@ -1924,7 +1924,7 @@
   					</tr>
   					</xsl:for-each>
   				</xsl:for-each>
  -				<tr><td><input type="submit" value="Change sunLets"/></td></tr>
  +				<tr><td><input type="submit" value="Change coplets"/></td></tr>
   				</tbody>
   			</table>
   		</td>
  
  
  
  1.2       +2 -2      xml-cocoon2/src/webapp/sunspotdemo/styles/sunLet_MoreoverDotCom.xsl
  
  Index: sunLet_MoreoverDotCom.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/styles/sunLet_MoreoverDotCom.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunLet_MoreoverDotCom.xsl	18 Feb 2002 09:10:13 -0000	1.1
  +++ sunLet_MoreoverDotCom.xsl	18 Apr 2002 08:13:42 -0000	1.2
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunLet_MoreoverDotCom.xsl,v 1.1 2002/02/18 09:10:13 cziegeler Exp $ 
  +<!-- $Id: sunLet_MoreoverDotCom.xsl,v 1.2 2002/04/18 08:13:42 cziegeler Exp $ 
   
   -->
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
  @@ -9,7 +9,7 @@
   <xsl:template match="text()|@*"><xsl:value-of select="."/></xsl:template>
   
   <xsl:template match="moreovernews">
  -<!-- Stylesheet to be used inside a sunLet. Generates HTML from an XML-feed from http://w.moreover.com/ -->
  +<!-- Stylesheet to be used inside a coplet. Generates HTML from an XML-feed from http://w.moreover.com/ -->
   <table>
   	<xsl:apply-templates select ="article"/>
   </table>
  
  
  
  1.2       +2 -2      xml-cocoon2/src/webapp/sunspotdemo/styles/sunLet_sundnNews.xsl
  
  Index: sunLet_sundnNews.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/styles/sunLet_sundnNews.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunLet_sundnNews.xsl	18 Feb 2002 09:10:13 -0000	1.1
  +++ sunLet_sundnNews.xsl	18 Apr 2002 08:13:42 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
  -<!-- $Id: sunLet_sundnNews.xsl,v 1.1 2002/02/18 09:10:13 cziegeler Exp $ 
  +<!-- $Id: sunLet_sundnNews.xsl,v 1.2 2002/04/18 08:13:42 cziegeler Exp $ 
   
   -->
   
  @@ -10,7 +10,7 @@
   
   <xsl:template match="text()|@*"><xsl:value-of select="."/></xsl:template>
   
  -<xsl:template match="news"><!-- Stylesheet to be used inside a sunLet. Generates HTML from an XML-feed from http://w.moreover.com/ -->
  +<xsl:template match="news"><!-- Stylesheet to be used inside a coplet. Generates HTML from an XML-feed from http://w.moreover.com/ -->
   
   	<table>
   		<xsl:apply-templates select ="article">
  
  
  
  1.2       +2 -2      xml-cocoon2/src/webapp/sunspotdemo/styles/sunletconf.xsl
  
  Index: sunletconf.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/styles/sunletconf.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunletconf.xsl	18 Feb 2002 09:10:13 -0000	1.1
  +++ sunletconf.xsl	18 Apr 2002 08:13:42 -0000	1.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
  -<!-- $Id: sunletconf.xsl,v 1.1 2002/02/18 09:10:13 cziegeler Exp $ 
  +<!-- $Id: sunletconf.xsl,v 1.2 2002/04/18 08:13:42 cziegeler Exp $ 
   
  - Description: The configuration page of a sunlet
  + Description: The configuration page of a coplet
   
   -->
   
  
  
  
  1.2       +24 -24    xml-cocoon2/src/webapp/sunspotdemo/styles/sunriseconfHTML.xsl
  
  Index: sunriseconfHTML.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/styles/sunriseconfHTML.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunriseconfHTML.xsl	18 Feb 2002 09:10:13 -0000	1.1
  +++ sunriseconfHTML.xsl	18 Apr 2002 08:13:42 -0000	1.2
  @@ -3,9 +3,9 @@
   <xsl:stylesheet version="1.0" 
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
  -<!-- $Id: sunriseconfHTML.xsl,v 1.1 2002/02/18 09:10:13 cziegeler Exp $ 
  +<!-- $Id: sunriseconfHTML.xsl,v 1.2 2002/04/18 08:13:42 cziegeler Exp $ 
   
  - Description: sunSpot sunRise User configuration to HTML. This stylesheet is
  + Description: Portal User configuration to HTML. This stylesheet is
                 used for the administrator when he manages the users
   
   -->
  @@ -15,7 +15,7 @@
   
   	<html>
   		<head>
  -			<title>sunRise User Management</title>
  +			<title>Portal User Management</title>
   		</head>
   		<body text="#0B2A51" link="#0B2A51" vlink="#666666" bgColor="#cccccc">
   		<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0" width="100%"><tbody>
  @@ -33,7 +33,7 @@
   		                  				</td>
                     						<td bgcolor="#AAB9BF" align="center" valign="bottom" colspan="2">
                       							<font face="Arial, Helvetica, sans-serif" size="6" color="#46627A">
  -									<b>sunRise User Management</b>
  +									<b>Portal User Management</b>
   								</font>
                     						</td>
   			              		</tr>
  @@ -56,7 +56,7 @@
   <!-- add new role -->						<xsl:if test="menue/addrole">
   									<form method="post">
   										<xsl:attribute name="action"><xsl:value-of select="normalize-space(uri)"/></xsl:attribute>
  -										<input type="hidden" value="addrole" name="sunrisestate"/>	
  +										<input type="hidden" value="addrole" name="authstate"/>	
   										<table cellpadding="2" cellspacing="0" border="0" bgcolor="#46627A" width="60%">
   											<tr>	
   												<td>
  @@ -69,7 +69,7 @@
   															<td width="1%"><img src="sunspotdemoimg-kast_m.gif"/></td>
   															<td width="1%">
   																<font face="Arial, Helvetica, sans-serif" size="2">
  -																	<input type="text" name="sunriserole" size="20"/>
  +																	<input type="text" name="authrole" size="20"/>
   																</font>
   															</td>
   															<td width="97%">
  @@ -91,7 +91,7 @@
   <!-- delete a role -->						<xsl:if test="menue/delrole">
   									<form method="post">
   										<xsl:attribute name="action"><xsl:value-of select="normalize-space(uri)"/></xsl:attribute>
  -										<input type="hidden" value="delrole" name="sunrisestate"/>	
  +										<input type="hidden" value="delrole" name="authstate"/>	
   										<table cellpadding="2" cellspacing="0" border="0" bgcolor="#46627A" width="60%">
   											<tr>	
   												<td>
  @@ -104,7 +104,7 @@
   															<td width="1%"><img src="sunspotdemoimg-kast_m.gif"/></td>
   															<td width="1%">
   																<font face="Arial, Helvetica, sans-serif" size="2">
  -																	<select name="sunriserole">
  +																	<select name="authrole">
   																		<xsl:for-each select="roles/role">
   																			<option>
   																				<xsl:attribute name="value">
  @@ -144,7 +144,7 @@
   													<xsl:attribute name="action">
   														<xsl:value-of select="normalize-space(uri)"/>
   													</xsl:attribute>
  -													<input type="hidden" value="selrole" name="sunrisestate"/>
  +													<input type="hidden" value="selrole" name="authstate"/>
   													<tr>
   														<td width="1%">
   															<img src="sunspotdemoimg-space.gif"/>
  @@ -169,7 +169,7 @@
   															<img src="sunspotdemoimg-kast.gif"/></td>
   														<td width="1%">
   															<font face="Arial, Helvetica, sans-serif" size="2">
  -																<select name="sunriserole">
  +																<select name="authrole">
   																	<xsl:for-each select="roles/role">
   																		<option>
   																			<xsl:attribute name="value">
  @@ -214,8 +214,8 @@
   															<xsl:attribute name="action">
   																<xsl:value-of select="normalize-space(uri)"/>
   															</xsl:attribute>
  -															<input type="hidden" value="adduser" name="sunrisestate"/>
  -												                                    <input type="hidden" name="sunriserole">
  +															<input type="hidden" value="adduser" name="authstate"/>
  +												                                    <input type="hidden" name="authrole">
   																<xsl:attribute name="value">
   																	<xsl:value-of select="$role"/>
   																</xsl:attribute>
  @@ -243,14 +243,14 @@
   																<xsl:attribute name="action">
   																	<xsl:value-of select="normalize-space(uri)"/>
   																</xsl:attribute>
  -																<input type="hidden" value="seluser" name="sunrisestate"/>
  -												                                                 <input type="hidden" name="sunriserole">
  +																<input type="hidden" value="seluser" name="authstate"/>
  +												                                                 <input type="hidden" name="authrole">
   																	<xsl:attribute name="value">
   																		<xsl:value-of select="$role"/>
   																	</xsl:attribute>
   																</input>
   																<td width="1%">
  -																	<select name="sunriseid">
  +																	<select name="authid">
   																		<xsl:for-each select="users/user/ID">
   																			<option>
   																				<xsl:attribute name="value">
  @@ -278,8 +278,8 @@
   													<xsl:variable name="user" select="normalize-space(user)"/>
   													<form method="post">
   					 									<xsl:attribute name="action"><xsl:value-of select="normalize-space(uri)"/></xsl:attribute>
  -														<input type="hidden" value="chguser" name="sunrisestate"/>
  -														<input type="hidden" name="sunriseuser">
  +														<input type="hidden" value="chguser" name="authstate"/>
  +														<input type="hidden" name="authuser">
   															<xsl:choose>
   																<xsl:when test="$user='error'">
   																	<xsl:attribute name="value">new</xsl:attribute>
  @@ -291,8 +291,8 @@
   																</xsl:otherwise>
   															</xsl:choose>
   														</input>
  -														<input type="hidden" name="sunriseoldrole" value="{$role}"/>
  -														<input type="hidden" name="sunriseoldpassword" value="{normalize-space(uservalues/data/password)}"/>
  +														<input type="hidden" name="autholdrole" value="{$role}"/>
  +														<input type="hidden" name="autholdpassword" value="{normalize-space(uservalues/data/password)}"/>
   														<tr>
   															<td width="1%"><img src="sunspotdemoimg-space.gif"/></td>
   															<td width="1%" background="sunspotdemoimg-line_bg.gif">
  @@ -402,14 +402,14 @@
   																	<img src="sunspotdemoimg-space.gif" width="10"/>
   																	<xsl:choose>
   																		<xsl:when test="$user='new'">
  -																			<input type="text" name="sunriseid" value="??"/>
  +																			<input type="text" name="authid" value="??"/>
   																		</xsl:when>
   																		<xsl:when test="$user='error'">
  -																			<input type="text" name="sunriseid" value="{uservalues/data/ID}"/>
  +																			<input type="text" name="authid" value="{uservalues/data/ID}"/>
   																		</xsl:when>
   																		<xsl:otherwise>
   																			<xsl:value-of select="uservalues/data/ID"/>
  -																			<input type="hidden" name="sunriseid">
  +																			<input type="hidden" name="authid">
   																				<xsl:attribute name="value">
   																					<xsl:value-of select="normalize-space(uservalues/data/ID)"/>
   																				</xsl:attribute>
  @@ -470,7 +470,7 @@
   															</td>
   															<td>
   																<img src="sunspotdemoimg-space.gif" width="10"/>
  -																<select name="sunriserole">
  +																<select name="authrole">
   																	<xsl:for-each select="roles/role">
   																		<option>
   																			<xsl:attribute name="value">
  @@ -503,7 +503,7 @@
   																<xsl:when test="not($user='new') and not($user='error')">
   																	<td width="1%">
   																		<font face="Arial, Helvetica, sans-serif" size="2">
  -																			<input type="checkbox" value="true" name="sunrisedeluser"/>	
  +																			<input type="checkbox" value="true" name="authdeluser"/>	
   																		</font>			
   																	</td>
   																	<td width="97%">
  
  
  
  1.2       +9 -9      xml-cocoon2/src/webapp/sunspotdemo/styles/sunriseeditHTML.xsl
  
  Index: sunriseeditHTML.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sunspotdemo/styles/sunriseeditHTML.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sunriseeditHTML.xsl	18 Feb 2002 09:10:13 -0000	1.1
  +++ sunriseeditHTML.xsl	18 Apr 2002 08:13:42 -0000	1.2
  @@ -3,9 +3,9 @@
   <xsl:stylesheet version="1.0" 
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
  -<!-- $Id: sunriseeditHTML.xsl,v 1.1 2002/02/18 09:10:13 cziegeler Exp $ 
  +<!-- $Id: sunriseeditHTML.xsl,v 1.2 2002/04/18 08:13:42 cziegeler Exp $ 
   
  - Description: sunSpot sunRise User Management to HTML. This stylesheet is used
  + Description: Portal User Management to HTML. This stylesheet is used
                 if the user changes his own information.
   
   -->
  @@ -15,7 +15,7 @@
   
   <html>
   <head>
  -    <title>sunRise User Managemenet</title>
  +    <title>Portal User Managemenet</title>
   </head>
   <body text="#0B2A51" link="#0B2A51" vlink="#666666" bgColor="#ffffff">
   <table border="0" cellPadding="0" cellSpacing="0" height="100%" width="100%">
  @@ -64,11 +64,11 @@
   											<xsl:variable name="user" select="normalize-space(user)"/>
   											<xsl:variable name="linkurl"><xsl:value-of select="normalize-space(uri)"/><xsl:value-of select="urlrewrite"/></xsl:variable>
   											<form method="post" action="{translate(normalize-space($linkurl), ' ', '')}">
  -												<input type="hidden" name="sunrisestate" value="chguser"/>
  -					                            	        	<input type="hidden" name="sunriserole" value="{$role}"/>
  -												<input type="hidden" name="sunriseuser" value="{normalize-space(user)}"/>
  -												<input type="hidden" name="sunriseoldrole" value="{$role}"/>
  -												<input type="hidden" name="sunriseoldpassword" value="{normalize-space(uservalues/data/password)}"/>
  +												<input type="hidden" name="authstate" value="chguser"/>
  +					                            	        	<input type="hidden" name="authrole" value="{$role}"/>
  +												<input type="hidden" name="authuser" value="{normalize-space(user)}"/>
  +												<input type="hidden" name="autholdrole" value="{$role}"/>
  +												<input type="hidden" name="autholdpassword" value="{normalize-space(uservalues/data/password)}"/>
   												<tr>
   													<td width="1%"><img src="sunspotdemoimg-space.gif"/></td>
   													<td width="1%">
  @@ -146,7 +146,7 @@
   														<img src="sunspotdemoimg-space.gif" width="10"/>
   														<font face="Arial, Helvetica, sans-serif" size="2">
   															<xsl:value-of select="uservalues/data/ID"/>
  -															<input type="hidden" name="sunriseid" value="{normalize-space(uservalues/data/ID)}"/>
  +															<input type="hidden" name="authid" value="{normalize-space(uservalues/data/ID)}"/>
   														</font>
   													</td>
   													<td width="1%"><img src="sunspotdemoimg-space.gif"/></td>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message