cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r366193 - in /cocoon/blocks: portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/ portal-sample/trunk/samples/skins/basic/styles/ portal-sample/trunk/samples/skins/common/styles/ portal-sample/trunk/samples/skins/modern/styles/...
Date Thu, 05 Jan 2006 15:09:02 GMT
Author: cziegeler
Date: Thu Jan  5 07:07:01 2006
New Revision: 366193

URL: http://svn.apache.org/viewcvs?rev=366193&view=rev
Log:
More clean up

Modified:
    cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java
    cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java
    cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
    cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java
    cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/FolderTransformer.java
    cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java
    cocoon/blocks/portal-sample/trunk/samples/skins/basic/styles/portal-page.xsl
    cocoon/blocks/portal-sample/trunk/samples/skins/common/styles/portal-page.xsl
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl
    cocoon/blocks/portal-sample/trunk/samples/tools/main/functions.jx
    cocoon/blocks/portal-sample/trunk/samples/tools/main/menu.jx
    cocoon/blocks/portal-sample/trunk/samples/tools/main/tools.jx
    cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/tool.xml
    cocoon/blocks/portal-sample/trunk/samples/tools/sitemap.xmap
    cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/function.xsl
    cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/showTab.xsl
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalTool.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolBuilder.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/PortalToolsLayoutTransformer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/UserBean.java

Modified: cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java (original)
+++ cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java Thu Jan  5 07:07:01 2006
@@ -87,13 +87,13 @@
         if ( b != null && b.equals(Boolean.TRUE) ) {
             Object item = new ContentItem(cid, true);
             Event event = new AddItemEvent(store, item);
-            XMLUtils.createElement(contenthandler, elementName, service.getComponentManager().getLinkService().getLinkURI(event));
+            XMLUtils.createElement(contenthandler, elementName, service.getLinkService().getLinkURI(event));
         }
         b = (Boolean)cid.getCopletData().getAttribute("basket-link");
         if ( b != null && b.equals(Boolean.TRUE) ) {
             Object item = new ContentItem(cid, false);
             Event event = new AddItemEvent(store, item);
-            XMLUtils.createElement(contenthandler, elementName, service.getComponentManager().getLinkService().getLinkURI(event));            
+            XMLUtils.createElement(contenthandler, elementName, service.getLinkService().getLinkURI(event));            
         }
 
         context.invokeNext( layout, service, contenthandler );

Modified: cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java (original)
+++ cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java Thu Jan  5 07:07:01 2006
@@ -129,13 +129,13 @@
                     folder = this.basketManager.getFolder();
                 }
 
-                final LinkService linkService = service.getComponentManager().getLinkService();
+                final LinkService linkService = service.getLinkService();
 
                 XMLUtils.startElement(this.xmlConsumer, "basket-content");
 
                 this.toSAX(uc);
 
-                final ProfileManager profileManager = service.getComponentManager().getProfileManager();
+                final ProfileManager profileManager = service.getProfileManager();
 
                 XMLUtils.startElement(this.xmlConsumer, "items");
 
@@ -192,7 +192,7 @@
         PortalService service = null;
         try {
             service = (PortalService)this.manager.lookup(PortalService.ROLE);
-            LinkService linkService = service.getComponentManager().getLinkService();
+            LinkService linkService = service.getLinkService();
             XMLUtils.startElement(this.xmlConsumer, "basket-admin");
             if ( baskets.size() > 0 ) {
                 XMLUtils.startElement(this.xmlConsumer, "baskets");

Modified: cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java (original)
+++ cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java Thu Jan  5 07:07:01 2006
@@ -234,8 +234,8 @@
                 CopletLayout layout = (CopletLayout) event.getLayout();
                 CopletInstanceData cid = null;
                 if ( ci.isContent() ) {
-                    CopletData copletData = this.portalService.getComponentManager().getProfileManager().getCopletData(event.getCopletDataId());
-                    cid = this.portalService.getComponentManager().getCopletFactory().newInstance(copletData);
+                    CopletData copletData = this.portalService.getProfileManager().getCopletData(event.getCopletDataId());
+                    cid = this.portalService.getCopletFactory().newInstance(copletData);
                     cid.setAttribute("item-content", ci.getContent());                
                 } else {
                     if ( ci.getURL() != null ) {
@@ -246,8 +246,8 @@
                             resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
                             url = ci.getURL();
                             source = resolver.resolveURI(url);
-                            CopletData copletData = this.portalService.getComponentManager().getProfileManager().getCopletData(event.getCopletDataId());
-                            cid = this.portalService.getComponentManager().getCopletFactory().newInstance(copletData);
+                            CopletData copletData = this.portalService.getProfileManager().getCopletData(event.getCopletDataId());
+                            cid = this.portalService.getCopletFactory().newInstance(copletData);
                             cid.setAttribute("item-content", IOUtils.toByteArray(source.getInputStream()));
                         } catch (IOException se) {
                             this.getLogger().warn("Unable to get content for " + url, se);
@@ -261,9 +261,9 @@
                         }
                         
                     } else {
-                        final CopletInstanceData original = this.portalService.getComponentManager().getProfileManager().getCopletInstanceData(ci.getCopletId());
+                        final CopletInstanceData original = this.portalService.getProfileManager().getCopletInstanceData(ci.getCopletId());
                         final CopletData copletData = original.getCopletData();
-                        cid = this.portalService.getComponentManager().getCopletFactory().newInstance(copletData);
+                        cid = this.portalService.getCopletFactory().newInstance(copletData);
                         Map attributes = (Map) ci.getAttribute("coplet-attributes");
                         Iterator i = attributes.entrySet().iterator();
                         while ( i.hasNext() ) {
@@ -361,7 +361,7 @@
                     url = ci.getURL();
                     if ( url == null ) {
                         // copy coplet attributes
-                        CopletInstanceData cid = this.portalService.getComponentManager().getProfileManager().getCopletInstanceData(ci.getCopletId());
+                        CopletInstanceData cid = this.portalService.getProfileManager().getCopletInstanceData(ci.getCopletId());
                         url = "coplet://" + ci.getCopletId();
                         Map attributes = new HashMap();
                         Iterator i = cid.getAttributes().entrySet().iterator();
@@ -390,7 +390,7 @@
                 }
             } else if ( ci.getURL() == null ) {
                 // copy coplet attributes
-                CopletInstanceData cid = this.portalService.getComponentManager().getProfileManager().getCopletInstanceData(ci.getCopletId());
+                CopletInstanceData cid = this.portalService.getProfileManager().getCopletInstanceData(ci.getCopletId());
                 Map attributes = new HashMap();
                 Iterator i = cid.getAttributes().entrySet().iterator();
                 while ( i.hasNext() ) {
@@ -626,7 +626,7 @@
      * Get the current user
      */
     protected String getUser() {
-        return this.portalService.getComponentManager().getProfileManager().getUser().getUserName();        
+        return this.portalService.getProfileManager().getUser().getUserName();        
     }
 
     /**

Modified: cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java (original)
+++ cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java Thu Jan  5 07:07:01 2006
@@ -107,7 +107,7 @@
                     ci = new ContentItem(href, addContent);
                 } else {
                     final String copletId = attr.getValue("coplet");
-                    final CopletInstanceData cid = service.getComponentManager().getProfileManager().getCopletInstanceData(copletId);                    
+                    final CopletInstanceData cid = service.getProfileManager().getCopletInstanceData(copletId);                    
                     ci = new ContentItem(cid, addContent);
                 }
 
@@ -128,7 +128,7 @@
 
                 final Event e = new AddItemEvent(store, ci);
                 final AttributesImpl ai = new AttributesImpl();
-                String newLink = service.getComponentManager().getLinkService().getLinkURI(e);
+                String newLink = service.getLinkService().getLinkURI(e);
                 // check for bockmark
                 final String bookmark = attr.getValue("bookmark");
                 if ( bookmark != null && bookmark.length() > 0) {

Modified: cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/FolderTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/FolderTransformer.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/FolderTransformer.java (original)
+++ cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/FolderTransformer.java Thu Jan  5 07:07:01 2006
@@ -84,7 +84,7 @@
             try {
                 service = (PortalService)this.manager.lookup(PortalService.ROLE);
                 Event e = new UploadItemEvent(this.basketManager.getFolder(), this.uploadElements);
-                parameters = service.getComponentManager().getLinkService().getLinkURI(e);
+                parameters = service.getLinkService().getLinkURI(e);
                 int pos = parameters.indexOf('?');
                 ai.addCDATAAttribute("action", parameters.substring(0, pos));
                 parameters = parameters.substring(pos+1);

Modified: cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java (original)
+++ cocoon/blocks/portal-sample/trunk/java/org/apache/cocoon/portal/coplets/basket/UserConfiguration.java Thu Jan  5 07:07:01 2006
@@ -47,7 +47,7 @@
         final Session session = req.getSession();
         UserConfiguration uc = (UserConfiguration)session.getAttribute(ATTR_NAME);
         if ( uc == null ) {
-            final ProfileManager pm = service.getComponentManager().getProfileManager();
+            final ProfileManager pm = service.getProfileManager();
             final CopletInstanceData cid = pm.getCopletInstanceData("basket");
             if ( cid != null ) {
                 uc = new UserConfiguration(cid.getAttributes());

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/basic/styles/portal-page.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/basic/styles/portal-page.xsl?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/basic/styles/portal-page.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/basic/styles/portal-page.xsl Thu Jan  5 07:07:01 2006
@@ -18,16 +18,17 @@
 <xsl:stylesheet version="1.0" 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-<xsl:param name="user"/>
-<xsl:param name="title"/>
-<xsl:param name="base"/>
+  <xsl:param name="user"/>
+  <xsl:param name="title"/>
+  <xsl:param name="skin"/>
+  <xsl:param name="rsrcprefix"/>
 
 <xsl:template match="/">
-<html>
-	<head>
-		<title><xsl:value-of select="$title"/></title>
-		<link type="text/css" rel="stylesheet" href="{$base}css/page.css"/>
-		<link type="text/css" rel="stylesheet" href="{$base}css/wsrp.css"/>
+  <html>
+    <head>
+      <title><xsl:value-of select="$title"/></title>
+      <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/page.css"/>
+      <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/wsrp.css"/>
 	</head>
 	<body>
 	<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0" width="100%">
@@ -50,10 +51,10 @@
 			<tr> 
 				<td colspan="2" noWrap="" height="10" bgcolor="#DDDDDD" align="right">
 				    <xsl:if test="$user!='anonymous'">
-						<a href="{$base}logout" style="color:#4C6C8F;font-size:75%;">
+						<a href="logout" style="color:#4C6C8F;font-size:75%;">
 							Logout
 						</a><br/>
-						<a href="{$base}tools/" style="color:#4C6C8F;font-size:75%;">
+						<a href="tools/" style="color:#4C6C8F;font-size:75%;">
 							Tools
 						</a>
 				    </xsl:if>
@@ -67,7 +68,7 @@
 	<!-- content/tab row -->
 	<tr>
 	<td>
-	  <xsl:apply-templates/>
+      <xsl:copy-of select="*"/>
 	</td>
 	</tr>
 	<!-- end content/tab row -->
@@ -78,12 +79,12 @@
 		<tbody> 
 		<tr> 
 			<td colspan="2" noWrap="" height="10" bgcolor="#DDDDDD">
-				<img height="1" src="{$base}images/space.gif" width="1"/>
+				<img height="1" src="{$rsrcprefix}skin/{$skin}/images/space.gif" width="1"/>
 			</td>
 		</tr>
 		<tr> 
 			<td colspan="2" noWrap="" height="30" bgcolor="#CCCCCC">
-				<img height="1" src="{$base}images/space.gif" width="1"/>
+				<img height="1" src="{$rsrcprefix}skin/{$skin}/images/space.gif" width="1"/>
 			</td>
 		</tr>
 		</tbody>
@@ -97,25 +98,4 @@
 </html>
 
 </xsl:template>
-
-<!-- make links relative -->
-<xsl:template match="a[not(@target)]">
-	<a><xsl:apply-templates select="@*"/><xsl:attribute name="href"><xsl:value-of select="concat($base,@href)"/></xsl:attribute><xsl:apply-templates/></a>
-</xsl:template>
-<!-- make images relative -->
-<xsl:template match="img">
-	<img>
-		<xsl:apply-templates select="@*"/>
-		<xsl:attribute name="src"><xsl:value-of select="concat($base,@src)"/></xsl:attribute>
-	</img>
-</xsl:template>
-
-<!-- Copy all and apply templates -->
-
-<xsl:template match="@*|node()">
-   <xsl:copy>
-    <xsl:apply-templates select="@*|node()" />
-   </xsl:copy>
-  </xsl:template>
-
 </xsl:stylesheet>

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/common/styles/portal-page.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/common/styles/portal-page.xsl?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/common/styles/portal-page.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/common/styles/portal-page.xsl Thu Jan  5 07:07:01 2006
@@ -18,16 +18,17 @@
 <xsl:stylesheet version="1.0" 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-<xsl:param name="user"/>
-<xsl:param name="title"/>
-<xsl:param name="base"/>
+  <xsl:param name="user"/>
+  <xsl:param name="title"/>
+  <xsl:param name="skin"/>
+  <xsl:param name="rsrcprefix"/>
 
 <xsl:template match="/">
   <html>
     <head>
-			<title><xsl:value-of select="$title"/></title>
-      <link type="text/css" rel="stylesheet" href="{$base}css/page.css"/>
-      <link type="text/css" rel="stylesheet" href="{$base}css/wsrp.css"/>
+      <title><xsl:value-of select="$title"/></title>
+      <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/page.css"/>
+      <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/wsrp.css"/>
     </head>
     <body>
       <table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0" width="100%"><tbody> 
@@ -37,27 +38,27 @@
             <table border="0" cellPadding="0" cellSpacing="0" width="100%"><tbody> 
               <tr>
                 <td colspan="2" noWrap="" height="1%" bgcolor="#294563">
-                  <img height="5" src="{$base}images/space.gif" width="100%"/>
+                  <img height="5" src="{$rsrcprefix}skin/{$skin}/images/space.gif" width="100%"/>
                 </td>
               </tr>
               <tr> 
                 <td colspan="2" bgcolor="#294563" height="98%" align="center" valign="middle" width="100%">
-                  <img src="{$base}images/portal-logo.gif" width="250" height="90" />
+                  <img src="{$rsrcprefix}skin/{$skin}/images/portal-logo.gif" width="250" height="90" />
                 </td>
               </tr>
               <tr valign="bottom"> 
                 <td height="99%" bgcolor="#294563" width="99%" align="right">
                   <xsl:if test="$user!='anonymous'">
-                    <a href="{$base}logout"><img src="{$base}images/logout-door.gif" width="18" height="22" border="0"/></a>
+                    <a href="{$rsrcprefix}skin/{$skin}/logout"><img src="{$rsrcprefix}skin/{$skin}/images/logout-door.gif" width="18" height="22" border="0"/></a>
                   </xsl:if>
-                  <img height="5" src="{$base}images/space.gif" width="5"/>
+                  <img height="5" src="{$rsrcprefix}skin/{$skin}/images/space.gif" width="5"/>
                 </td>
                 <td height="99%" bgcolor="#294563" width="1%" align="right">
                   <xsl:if test="$user!='anonymous'">
-                    <a href="{$base}logout" style="color:#CFDCED;font-size:75%;">Logout</a>&#160;
-										<a href="{$base}tools/" style="color:#CFDCED;font-size:75%;">Tools</a>&#160;
+                    <a href="logout" style="color:#CFDCED;font-size:75%;">Logout</a>&#160;
+										<a href="tools/" style="color:#CFDCED;font-size:75%;">Tools</a>&#160;
                   </xsl:if>
-                  <img height="5" src="{$base}images/space.gif" width="5"/>
+                  <img height="5" src="{$rsrcprefix}skin/{$skin}/images/space.gif" width="5"/>
                 </td>
               </tr>
             </tbody></table>
@@ -67,7 +68,7 @@
         <!-- content/tab row -->
         <tr>
           <td>
-            <xsl:apply-templates/>
+            <xsl:copy-of select="*"/>
           </td>
         </tr>
         <!-- end content/tab row -->
@@ -77,7 +78,7 @@
             <table border="0" cellPadding="0" cellSpacing="0" width="100%"><tbody> 
               <tr> 
                 <td colspan="2" noWrap="" height="30" bgcolor="#294563">
-                  <img height="1" src="{$base}images/space.gif" width="1"/>
+                  <img height="1" src="{$rsrcprefix}skin/{$skin}/images/space.gif" width="1"/>
                 </td>
               </tr>
             </tbody></table>
@@ -89,25 +90,5 @@
   </html>
 
 </xsl:template>
-
-<!-- make links relative -->
-<xsl:template match="a[not(@target)]">
-	<a><xsl:apply-templates select="@*"/><xsl:attribute name="href"><xsl:value-of select="concat($base,@href)"/></xsl:attribute><xsl:apply-templates/></a>
-</xsl:template>
-<!-- make images relative -->
-<xsl:template match="img">
-	<img>
-		<xsl:apply-templates select="@*"/>
-		<xsl:attribute name="src"><xsl:value-of select="concat($base,@src)"/></xsl:attribute>
-	</img>
-</xsl:template>
-
-<!-- Copy all and apply templates -->
-
-<xsl:template match="@*|node()">
-   <xsl:copy>
-    <xsl:apply-templates select="@*|node()" />
-   </xsl:copy>
-  </xsl:template>
 
 </xsl:stylesheet>

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl Thu Jan  5 07:07:01 2006
@@ -21,30 +21,31 @@
   <xsl:param name="user"/>
   <xsl:param name="title"/>
   <xsl:param name="skin"/>
+  <xsl:param name="rsrcprefix"/>
 
   <xsl:template match="/">
     <html>
       <head>
         <title><xsl:value-of select="$title"/></title>
-        <link type="text/css" rel="stylesheet" href="skin/{$skin}/css/page.css"/>
-        <link type="text/css" rel="stylesheet" href="skin/{$skin}/css/wsrp.css"/>
-        <link type="text/css" rel="stylesheet" href="skin/{$skin}/css/portal-page.css"/>
-        <script src="resources/ajax/js/cocoon-ajax.js" type="text/javascript"/>
-        <script src="resources/portal/js/cocoon-portal.js" type="text/javascript"/>
+        <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/page.css"/>
+        <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/wsrp.css"/>
+        <link type="text/css" rel="stylesheet" href="{$rsrcprefix}skin/{$skin}/css/portal-page.css"/>
+        <script src="{$rsrcprefix}resources/ajax/js/cocoon-ajax.js" type="text/javascript"/>
+        <script src="{$rsrcprefix}resources/portal/js/cocoon-portal.js" type="text/javascript"/>
       </head>
       <body>
         <div class="cocoon-portal-header">
           
           <xsl:if test="$user!='anonymous'">
             <div id="cocoon-portal-header-logout">
-              <a href="logout"><img src="skin/{$skin}/images/logout-door.gif" width="18" height="22" border="0"/></a>
+              <a href="logout"><img src="{$rsrcprefix}skin/{$skin}/images/logout-door.gif" width="18" height="22" border="0"/></a>
               <a href="logout">Logout</a>
               &#160;
               <a href="tools/">Tools</a>
             </div>
           </xsl:if>
           <div id="cocoon-portal-header-logo" >
-            <img src="skin/{$skin}/images/portal-logo.gif" width="250" height="90"/>
+            <img src="{$rsrcprefix}skin/{$skin}/images/portal-logo.gif" width="250" height="90"/>
 	    </div>
 	    </div>
 	    

Modified: cocoon/blocks/portal-sample/trunk/samples/tools/main/functions.jx
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/tools/main/functions.jx?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/tools/main/functions.jx (original)
+++ cocoon/blocks/portal-sample/trunk/samples/tools/main/functions.jx Thu Jan  5 07:07:01 2006
@@ -18,7 +18,7 @@
 <div style="spacing:3px; padding:5px;">
 	<b><i18n:text key="portalTools.functions"/>:</b><br/>
 	<jx:forEach select="#{functions}" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
-		<a href="tools/plugins/#{../tool/id}/#{./function}"><i18n:text i18n:key="#{./name}"/></a><br/>
+		<a href="plugins/#{../tool/id}/#{./function}"><i18n:text i18n:key="#{./name}"/></a><br/>
 	</jx:forEach>
 </div>
 </jx:template>

Modified: cocoon/blocks/portal-sample/trunk/samples/tools/main/menu.jx
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/tools/main/menu.jx?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/tools/main/menu.jx (original)
+++ cocoon/blocks/portal-sample/trunk/samples/tools/main/menu.jx Thu Jan  5 07:07:01 2006
@@ -17,7 +17,7 @@
 <jx:template xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
 	<tab-layout xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
 		<jx:forEach select="#{tools}">
-			<named-item parameter="tools/functions/#{./id}" name="#{./toolName}"/>
+			<named-item parameter="functions/#{./id}" name="#{./toolName}"/>
 		</jx:forEach>
 	</tab-layout>
 </jx:template>

Modified: cocoon/blocks/portal-sample/trunk/samples/tools/main/tools.jx
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/tools/main/tools.jx?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/tools/main/tools.jx (original)
+++ cocoon/blocks/portal-sample/trunk/samples/tools/main/tools.jx Thu Jan  5 07:07:01 2006
@@ -18,7 +18,7 @@
 	<div style="spacing:3px; padding:5px;">
 	<b><i18n:text key="portalTools.tools"/>:</b><br/>
 	<jx:forEach select="#{tools}" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
-		<a href="tools/functions/#{./id}"><i18n:text key="#{./name}"/></a><br/>
+		<a href="functions/#{./id}"><i18n:text key="#{./name}"/></a><br/>
 	</jx:forEach>
 	</div>
 </jx:template>

Modified: cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/tool.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/tool.xml?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/tool.xml (original)
+++ cocoon/blocks/portal-sample/trunk/samples/tools/plugins/copletManagement/tool.xml Thu Jan  5 07:07:01 2006
@@ -15,11 +15,11 @@
   limitations under the License.
 -->
 <tool name="copletManagement.title" id="copletManagement">
-	<functions>
-		<function name="copletManagement.editLayout" id="copletMangementEditLayout" pipeline="showTab"/>
-		<function name="copletManagement.selectSkin" id="copletManagementSelectSkin" pipeline="selectSkin"/>
-	</functions>
-	<i18n>
-		<catalogue id="copletManagement" name="copletManagement"/>
-	</i18n>
+  <functions>
+    <function name="copletManagement.editLayout" id="copletMangementEditLayout" pipeline="showTab"/>
+    <function name="copletManagement.selectSkin" id="copletManagementSelectSkin" pipeline="selectSkin"/>
+  </functions>
+  <i18n>
+    <catalogue id="copletManagement" name="copletManagement"/>
+  </i18n>
 </tool>

Modified: cocoon/blocks/portal-sample/trunk/samples/tools/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/tools/sitemap.xmap?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/tools/sitemap.xmap (original)
+++ cocoon/blocks/portal-sample/trunk/samples/tools/sitemap.xmap Thu Jan  5 07:07:01 2006
@@ -41,16 +41,6 @@
   </map:flow>
 
   <map:pipelines>
-
-<!-- select skin to use -->
-    <map:component-configurations>
-      <map:global-variables>
-      	
-      </map:global-variables>
-
-    </map:component-configurations>
-
-<!-- Now the accessible pipelines -->
     <map:pipeline>
 		
 		<map:match pattern="">
@@ -76,8 +66,10 @@
         <map:transform src="skins/{portal-skin:skin}/styles/function.xsl" />
         <map:transform src="{portal-skin:skin.basepath}/styles/portal-page.xsl">
           <map:parameter name="title" value="{global:toolsTitle}"/>
+          <map:parameter name="skin" value="{portal-skin:skin}"/>
+          <map:parameter name="rsrcprefix" value="../"/>
         </map:transform>
-        <map:serialize type="html"></map:serialize>
+        <map:serialize type="html"/>
       </map:match>
 
       <map:match pattern="*/*.jx">
@@ -92,8 +84,10 @@
         <map:transform src="skins/{portal-skin:skin}/styles/function.xsl" />
         <map:transform src="{portal-skin:skin.basepath}/styles/portal-page.xsl">
           <map:parameter name="title" value="{global:toolsTitle}"/>
+          <map:parameter name="skin" value="{portal-skin:skin}"/>
+          <map:parameter name="rsrcprefix" value="../"/>
         </map:transform>
-        <map:serialize type="html"></map:serialize>
+        <map:serialize type="html"/>
       </map:match>
 
       <map:match pattern="*">

Modified: cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/function.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/function.xsl?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/function.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/function.xsl Thu Jan  5 07:07:01 2006
@@ -20,20 +20,19 @@
 
 <!-- Process a tab  -->
 <xsl:template match="tool-functions">
-				<table style="height: 1.8em" border="0" cellpadding="0" cellspacing="0" width="100%" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
-					<tr>
-						<td valign="middle" bgcolor="#B2C4E0" >
-							<div class="tab">
-								<xsl:for-each select="function">
-								 | <a href="{@parameter}" style=" font-size : 85%; border: 0; color: #000066;">
-									<xsl:value-of select="@name"/>
-								</a>
-								</xsl:for-each>
-							</div>
-						</td>
-					</tr>
-				</table>
-
+  <table style="height: 1.8em" border="0" cellpadding="0" cellspacing="0" width="100%" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
+    <tr>
+      <td valign="middle" bgcolor="#B2C4E0" >
+        <div class="tab">
+          <xsl:for-each select="function">
+            | <a href="{@parameter}" style=" font-size : 85%; border: 0; color: #000066;">
+              <xsl:value-of select="@name"/>
+            </a>
+          </xsl:for-each>
+        </div>
+      </td>
+    </tr>
+  </table>
 </xsl:template>
 
 <!-- Copy all and apply templates -->

Modified: cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/showTab.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/showTab.xsl?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/showTab.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/tools/skins/modern/styles/showTab.xsl Thu Jan  5 07:07:01 2006
@@ -17,39 +17,37 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 								xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
 
-	<!-- id of the current item -->
-	<xsl:param name="current"/>
-	<xsl:param name="currentSkin"/>
-	
-	<xsl:variable name="skin">
-		<xsl:value-of select="$currentSkin"/>
-		<!--xsl:call-template name="getSkin">
-			<xsl:with-param name="skin4search"><xsl:value-of select="substring($currentSkin,0,string-length($currentSkin))"/></xsl:with-param>
-		</xsl:call-template-->
-	</xsl:variable>
-	
-	<xsl:template name="getSkin">
-		<xsl:param name="skin4search"/>
-		
-		<xsl:choose>
-			<xsl:when test="contains($skin4search,'/')">
-				<xsl:call-template name="getSkin">
-					<xsl:with-param name="skin4search"><xsl:value-of select="substring-after($skin4search,'/')"/></xsl:with-param>
-				</xsl:call-template>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="$skin4search"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-	
-	
-	<!-- root -->
-	<xsl:template match="/">
-		<div>
-			
-			<xsl:apply-templates/>
-			<br/>
+  <!-- id of the current item -->
+  <xsl:param name="current"/>
+  <xsl:param name="currentSkin"/>
+
+  <xsl:variable name="skin">
+    <xsl:value-of select="$currentSkin"/>
+    <!--xsl:call-template name="getSkin">
+      <xsl:with-param name="skin4search"><xsl:value-of select="substring($currentSkin,0,string-length($currentSkin))"/></xsl:with-param>
+    </xsl:call-template-->
+  </xsl:variable>
+
+  <xsl:template name="getSkin">
+    <xsl:param name="skin4search"/>
+
+    <xsl:choose>
+      <xsl:when test="contains($skin4search,'/')">
+        <xsl:call-template name="getSkin">
+          <xsl:with-param name="skin4search"><xsl:value-of select="substring-after($skin4search,'/')"/></xsl:with-param>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$skin4search"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- root -->
+  <xsl:template match="/">
+    <div>
+      <xsl:apply-templates/>
+      <br/>
 		<table>
 			<tr>
 				<td><i><i18n:text key="copletManagement.actions.title"/>:</i></td>
@@ -59,7 +57,7 @@
 			</tr>
 			<tr>
 			<td>
-				<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$current"/>&amp;action=save</xsl:attribute>Save</a>
+				<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$current"/>&amp;action=save</xsl:attribute>Save</a>
 			</td>
 			</tr>
 			<tr>
@@ -143,7 +141,7 @@
 		    <td bgcolor="#292c63">
 				<div align="left">
 					<xsl:if test="@parent">
-						<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
+						<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
 							<img border="0">
 								<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/goUp.jpg</xsl:attribute>
 							</img>
@@ -182,7 +180,7 @@
 				<td bgcolor="#386c84">
 					<div align="left">
 						<xsl:if test="@parent">
-							<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
+							<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
 								<img border="0">
 									<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/goUp.jpg</xsl:attribute>
 								</img>
@@ -227,7 +225,7 @@
 				<td bgcolor="#295163">
 					<div align="left">
 						<xsl:if test="@parent">
-							<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
+							<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
 								<img border="0">
 									<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/goUp.jpg</xsl:attribute>
 								</img>
@@ -266,7 +264,7 @@
 				<td bgcolor="#3a3fa6">
 					<div align="left">
 						<xsl:if test="@parent">
-							<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
+							<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
 								<img border="0">
 									<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/goUp.jpg</xsl:attribute>
 								</img>
@@ -297,7 +295,7 @@
 										<td bgcolor="#292c63">
 											<div align="left">
 												<xsl:if test="@parent">
-													<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
+													<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
 														<img border="0">
 															<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/goUp.jpg</xsl:attribute>
 														</img>
@@ -340,7 +338,7 @@
 			<td bgcolor="#4e95b6">
 				<div align="left">
 					<xsl:if test="@parent">
-						<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
+						<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="@parent"/></xsl:attribute>
 							<img border="0">
 								<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/goUp.jpg</xsl:attribute>
 							</img>
@@ -378,7 +376,7 @@
 	
 
 	<xsl:template match="help" mode="foo">
-		<a href="tools/plugins/copletManagement/showTab?action=save">Save</a> - <a href="tools/plugins/copletManagement/showTab?action=restore">Restore</a>
+		<a href="plugins/copletManagement/showTab?action=save">Save</a> - <a href="plugins/copletManagement/showTab?action=restore">Restore</a>
 		<table>
 			<tr>
 				<td><i18n:text key="copletManagement.actions.title"/></td>
@@ -492,7 +490,7 @@
 		<xsl:param name="forceEditCopletButton"/>
 		
 		<xsl:if test="$forceEditCopletButton = 'true'">
-			<a><xsl:attribute name="href">tools/plugins/copletManagement/editCoplet?actionitem=<xsl:value-of select="$actionitem"/>&amp;id=<xsl:value-of select="$id"/></xsl:attribute>
+			<a><xsl:attribute name="href">plugins/copletManagement/editCoplet?actionitem=<xsl:value-of select="$actionitem"/>&amp;id=<xsl:value-of select="$id"/></xsl:attribute>
 				<img border="0">
 					<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/edit.jpg</xsl:attribute>
 				</img>
@@ -500,7 +498,7 @@
 		</xsl:if>
 		
 		<xsl:if test="$forceDeleteButton = 'true'">
-			<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=del&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
+			<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=del&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
 				<img border="0">
 					<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/del.jpg</xsl:attribute>
 				</img>
@@ -510,24 +508,24 @@
 		<xsl:if test="count(../../node()) > 1 or $forceMoveButtons = 'true'">
 		<xsl:choose>
 			<xsl:when test="(../../@name) = 'row'">
-				<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=up&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
+				<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=up&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
 					<img border="0">
 						<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/up.jpg</xsl:attribute>
 					</img>
 				</a>
-				<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=down&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
+				<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=down&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
 					<img border="0">
 						<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/down.jpg</xsl:attribute>
 					</img>
 				</a>
 			</xsl:when>
 			<xsl:otherwise>
-				<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=up&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
+				<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=up&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
 					<img border="0">
 						<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/left.jpg</xsl:attribute>
 					</img>
 				</a>
-				<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=down&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
+				<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=down&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
 					<img border="0">
 						<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/right.jpg</xsl:attribute>
 					</img>
@@ -537,7 +535,7 @@
 		</xsl:if>
 		
 		<xsl:if test="$forceAddTabButton = 'true'">
-			<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=addTab&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
+			<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=addTab&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
 				<img border="0">
 					<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/addTab.jpg</xsl:attribute>
 				</img>
@@ -545,30 +543,30 @@
 		</xsl:if>
 		
 		<xsl:if test="$forceAddButtons = 'true'">
-			<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=addRow&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
+			<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=addRow&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
 				<img border="0">
 					<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/addRow.jpg</xsl:attribute>
 				</img>
 			</a>
-			<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=addCol&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
+			<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=addCol&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
 				<img border="0">
 					<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/addCol.jpg</xsl:attribute>
 				</img>
 			</a>
-			<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=addCoplet&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
+			<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$id"/>&amp;action=addCoplet&amp;actionitem=<xsl:value-of select="$actionitem"/></xsl:attribute>
 				<img border="0">
 					<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/addCoplet.jpg</xsl:attribute>
 				</img>
 			</a>
 		</xsl:if>
-		
+
 		<xsl:if test="$forceDrillDownButton = 'true'">
-			<a><xsl:attribute name="href">tools/plugins/copletManagement/showTab?id=<xsl:value-of select="$actionitem"/></xsl:attribute>
+			<a><xsl:attribute name="href">plugins/copletManagement/showTab?id=<xsl:value-of select="$actionitem"/></xsl:attribute>
 				<img border="0">
 					<xsl:attribute name="src">toolImages/<xsl:value-of select="$skin"/>/drillDown.jpg</xsl:attribute>
 				</img>
 			</a>
 		</xsl:if>
-	</xsl:template>
+  </xsl:template>
 
 </xsl:stylesheet>

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalTool.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalTool.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalTool.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalTool.java Thu Jan  5 07:07:01 2006
@@ -17,9 +17,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Represents a PortalTool.
@@ -28,11 +28,11 @@
  */
 public class PortalTool {
 
-    protected final HashMap functions;
+    protected final Map functions;
 
     protected final String toolName;
     protected final String toolId;
-    protected final ArrayList i18n;
+    protected final List i18n;
 
     /**
      * Creates a new Portal Tool
@@ -41,7 +41,7 @@
      * @param functions
      * @param i18n
      */
-    public PortalTool(String toolName, String toolId, HashMap functions, ArrayList i18n) {
+    public PortalTool(String toolName, String toolId, Map functions, List i18n) {
         this.toolName = toolName;
         this.toolId = toolId;
         this.functions = functions;

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolBuilder.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolBuilder.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/PortalToolBuilder.java Thu Jan  5 07:07:01 2006
@@ -61,10 +61,13 @@
 			pTool = new PortalTool(toolName, toolId, functions, i18n);
         } catch (ConfigurationException ece) {
             // TODO
+            ece.printStackTrace();
         } catch (SAXException esax) {
             // TODO
+            esax.printStackTrace();
 		} catch (IOException eio) {
             // TODO
+            eio.printStackTrace();
         }
 		return pTool;
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java Thu Jan  5 07:07:01 2006
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.portal.tools.transformation;
 
-import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.portal.tools.PortalToolManager;
@@ -30,8 +29,7 @@
  *
  * @version $Id$
  */
-public class CheckAccessTransformer extends AbstractSAXTransformer
-                                    implements Disposable {
+public class CheckAccessTransformer extends AbstractSAXTransformer {
 
     public static final String RIGHTS_NAMESPACE_URI =
         "http://apache.org/cocoon/portal/tools/rights/1.0";
@@ -39,16 +37,16 @@
     public static final String ACCESS_TAG = "access";
     public static final String RIGHT_ID = "id";
 
-    private UserRightsService urs;
-    private PortalToolManager ptm;
+    protected UserRightsService urs;
+    protected PortalToolManager ptm;
 
     /**
      * @see org.apache.cocoon.transformation.AbstractSAXTransformer#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
         super.service(manager);
-        ptm = (PortalToolManager) this.manager.lookup(PortalToolManager.ROLE);
-        urs = ptm.getUserRightsService();
+        this.ptm = (PortalToolManager) this.manager.lookup(PortalToolManager.ROLE);
+        this.urs = ptm.getUserRightsService();
     }
 
     /**
@@ -87,8 +85,9 @@
      */
     public void dispose() {
         if (this.manager != null) {
-            this.manager.release(ptm);
+            this.manager.release(this.ptm);
             this.ptm = null;
+            this.urs = null;
         }
         super.dispose();
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/PortalToolsLayoutTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/PortalToolsLayoutTransformer.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/PortalToolsLayoutTransformer.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/transformation/PortalToolsLayoutTransformer.java Thu Jan  5 07:07:01 2006
@@ -20,8 +20,6 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -39,13 +37,12 @@
  *
  * @version $Id$
  */
-public class PortalToolsLayoutTransformer extends AbstractSAXTransformer
-                                          implements Disposable /*, Parameterizable */ {
+public class PortalToolsLayoutTransformer extends AbstractSAXTransformer {
 
 	public static final String ROLE = PortalToolsLayoutTransformer.class.getName();
 
-	private PortalToolManager pm;
-	private String selected;
+	protected PortalToolManager pm;
+    protected String selected;
 
 	/**
 	 * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
@@ -58,15 +55,13 @@
 	/**
      * @see org.apache.cocoon.transformation.AbstractSAXTransformer#setup(org.apache.cocoon.environment.SourceResolver, java.util.Map, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
      */
-    public void setup(SourceResolver resolver, Map objectModel, String src,
-            Parameters par) throws ProcessingException, SAXException,
-            IOException {
+    public void setup(SourceResolver resolver, 
+                      Map objectModel,
+                      String src,
+                      Parameters par)
+    throws ProcessingException, SAXException, IOException {
         super.setup(resolver, objectModel, src, par);
-        try {
-            selected = par.getParameter("selected");
-        } catch (ParameterException e) {
-            // does not matter, default handling
-        }
+        this.selected = par.getParameter("selected", null);
     }
 
 	/**
@@ -85,12 +80,11 @@
 	 */
 	public void startDocument() throws SAXException {
 		super.startDocument();
-		AttributesImpl a = new AttributesImpl();
 
 		// took the div-tag as root, because it does not matter in the output, if it passes the xsl transformation
 		super.startPrefixMapping("i18n", "http://apache.org/cocoon/i18n/2.1");
-		super.startElement("", "div","div", a);
-		super.startElement("", "tab-layout", "tab-layout", a);
+		super.startElement("", "div","div", EMPTY_ATTRIBUTES);
+		super.startElement("", "tab-layout", "tab-layout", EMPTY_ATTRIBUTES);
 			Collection tools = pm.getToolsWithFunctions();
 			for(Iterator it = tools.iterator(); it.hasNext();) {
 				AttributesImpl attr = new AttributesImpl();
@@ -107,10 +101,10 @@
 				super.endElement("", "named-item", "named-item");
 			}
 		super.endElement("", "tab-layout", "tab-layout");
-		if(selected != null) {
+		if (this.selected != null) {
 			PortalTool ct = pm.getTool(selected);
 			if(ct != null) {
-				super.startElement("", "tool-functions", "tool-functions", a);
+				super.startElement("", "tool-functions", "tool-functions", EMPTY_ATTRIBUTES);
 				Collection funs = ct.getFunctions();
 				for(Iterator it = funs.iterator();it.hasNext();) {
 						PortalToolFunction ptf = (PortalToolFunction) it.next();
@@ -131,7 +125,15 @@
 	public void endDocument() throws SAXException {
 		super.endElement("", "div", "div");
 		super.endPrefixMapping("i18n");
-		selected= null;
 		super.endDocument();
 	}
+
+    /**
+     * @see org.apache.cocoon.transformation.AbstractSAXTransformer#recycle()
+     */
+    public void recycle() {
+        this.selected = null;
+        super.recycle();
+    }
+
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/UserBean.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/UserBean.java?rev=366193&r1=366192&r2=366193&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/UserBean.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/UserBean.java Thu Jan  5 07:07:01 2006
@@ -17,6 +17,7 @@
 
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Object storing information of an user context. 
@@ -25,7 +26,7 @@
  */
 public class UserBean {
 
-	private HashMap context = new HashMap ();
+	private Map context = new HashMap ();
 	private String picture = "";
 
     public UserBean () {



Mime
View raw message