context-param did not work properly, widgetset now added as a init-param for each...

Fixes #1652

svn changeset:4499/svn branch:trunk

diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 6ac4cddcdc30d7e0102443b91d93fdd17f683dc2..73de82d8f988d1829de5ffea1628f1602625aeff 100644 (file)
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -12,6 +12,7 @@
                         <value>PortletDemo</value>
                 </init-param>
                 
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -45,6 +46,7 @@
                         <value>SimpleReserver</value>
                 </init-param>
                 <init-param><name>style</name><value>style=height:400px</value></init-param>
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -78,6 +80,7 @@
                         <value>SelectDemo</value>
                 </init-param>
                 
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -111,6 +114,7 @@
                         <value>TableDemo</value>
                 </init-param>
                 
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -144,6 +148,7 @@
                         <value>FilterSelect</value>
                 </init-param>
                 
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -177,6 +182,7 @@
                         <value>FeatureBrowser</value>
                 </init-param>
                 <init-param><name>style</name><value>style=height:650px</value></init-param>
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -210,6 +216,7 @@
                         <value>ModalWindow</value>
                 </init-param>
                 
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -243,6 +250,7 @@
                         <value>Calc</value>
                 </init-param>
                 
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -276,6 +284,7 @@
                         <value>NotificationDemo</value>
                 </init-param>
                 
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -309,6 +318,7 @@
                         <value>chat</value>
                 </init-param>
                 
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -342,6 +352,7 @@
                         <value>BrowserDemo</value>
                 </init-param>
                 <init-param><name>style</name><value>style=height:650px</value></init-param>
+                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -366,7 +377,7 @@
                         <role-name>user</role-name>
                 </security-role-ref>
         </portlet>
-        <context-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></context-param>
+
         <container-runtime-option>
                 <name>javax.portlet.escapeXml</name>
                 <value>false</value>

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