From 2d653bba6c2d90b86d7c16c7d2f3c7082624083f Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Thu, 15 May 2008 08:00:54 +0000
Subject: context-param did not work properly, widgetset now added as a
 init-param for each portlet. Fixes #1652

svn changeset:4499/svn branch:trunk
---
 .../toolkit/buildhelpers/PortletConfigurationGenerator.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'build/buildhelpers')

diff --git a/build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java b/build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java
index 01a1c47798..80a6d73031 100644
--- a/build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java
+++ b/build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java
@@ -69,7 +69,7 @@ public class PortletConfigurationGenerator {
             + "                <security-role-ref>\n"
             + "                        <role-name>user</role-name>\n"
             + "                </security-role-ref>\n" + "        </portlet>\n";
-    private static final String PORTLET_XML_FOOT = "        %CONTEXTPARAMS%\n"
+    private static final String PORTLET_XML_FOOT = "\n"
             + "        <container-runtime-option>\n"
             + "                <name>javax.portlet.escapeXml</name>\n"
             + "                <value>false</value>\n"
@@ -120,8 +120,9 @@ public class PortletConfigurationGenerator {
 
         String widgetset = "";
         if (args.length > 1) {
-            widgetset = "<context-param><name>widgetset</name><value>"
-                    + args[1] + "</value></context-param>";
+            widgetset = "\n                "
+                    + "<init-param><name>widgetset</name><value>" + args[1]
+                    + "</value></init-param>";
         }
 
         /*
@@ -220,6 +221,7 @@ public class PortletConfigurationGenerator {
                     style = "<init-param><name>style</name><value>"
                             + m2.group(1) + "</value></init-param>";
                 }
+                style += widgetset;
 
                 String name = m.group(1);
                 // remove leading- and trailing whitespace
@@ -264,8 +266,7 @@ public class PortletConfigurationGenerator {
 
             }
 
-            pstring += PORTLET_XML_FOOT
-                    .replaceAll("%CONTEXTPARAMS%", widgetset);
+            pstring += PORTLET_XML_FOOT;
             lpstring += LIFERAY_PORTLET_XML_FOOT;
             ldstring += LIFERAY_DISPLAY_XML_FOOT;
 
-- 
cgit v1.2.3