svn commit: r736662 - /lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/IconUrlTransformer.java

Author: andreas
Date: Thu Jan 22 07:03:45 2009
New Revision: 736662

URL: http://svn.apache.org/viewvc?rev=736662&view=rev
Log:
Resolve webapp URL for icon URL transformer correctly.

Modified:
    lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/IconUrlTransformer.java

Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/IconUrlTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/IconUrlTransformer.java?rev=736662&r1=736661&r2=736662&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/IconUrlTransformer.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/IconUrlTransformer.java Thu Jan 22 07:03:45 2009
@@ -72,8 +72,6 @@
         public String rewrite(String url) {
             String pubId = IconUrlTransformer.this.pubId;
             String area = IconUrlTransformer.this.area;
-            StringBuffer iconUrl = new StringBuffer();
-            iconUrl.append("/").append(pubId).append("/").append(area).append("/");
             String name = "default";
             if (url.length() > PROTOCOL.length()) {
                 String suffix = url.substring(PROTOCOL.length());
@@ -93,8 +91,7 @@
                     throw new RuntimeException(e);
                 }
             }
-            iconUrl.append(name).append(".gif?lenya.module=sitetree");
-            return iconUrl.toString();
+            return "/modules/sitetree/" + name + ".gif";
         }
 
         protected Link getLink(String linkUri, String pubId, String area)
@@ -119,7 +116,7 @@
             this.factory = DocumentUtil.getDocumentFactory(this.manager, request);
             this.linkResolver = (LinkResolver) this.manager.lookup(LinkResolver.ROLE);
 
-            String webappUrl = ServletHelper.getWebappURI(request);
+            String webappUrl = getWebappUrl(params, objectModel);
             URLInformation url = new URLInformation(webappUrl);
             this.pubId = url.getPublicationId();
             this.area = url.getArea();