[jboss-svn-commits] JBL Code SVN: r11292 - in labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src: web/WEB-INF and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2007-04-24 07:58:43 -0400 (Tue, 24 Apr 2007)
New Revision: 11292

Modified:
   labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
   labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
Log:
dev to qa merge
 svn merge -r 11273:11290 https://svn.labs.jboss.org/labs/jbosslabs/trunk/portal-extensions


Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java	2007-04-24 11:55:07 UTC (rev 11291)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java	2007-04-24 11:58:43 UTC (rev 11292)
@@ -123,6 +123,10 @@
 
     public void labsDoView(JBossRenderRequest request,
                            JBossRenderResponse response) throws IOException, PortletException {
+        String title = request.getPreferences().getValue("title", null);
+        if (!Tools.isEmpty(title)) {
+            response.setTitle(title);
+        }
 
         // Getting the path requested by the user.
         String requestedPath;

Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml	2007-04-24 11:55:07 UTC (rev 11291)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml	2007-04-24 11:58:43 UTC (rev 11292)
@@ -196,6 +196,10 @@
                     <name>page</name>
                     <value>knowledge/forums.html</value>
                 </preference>
+                <preference>
+                    <name>title</name>
+                    <value>Forums</value>
+                </preference>
             </preferences>
         </instance>
     </deployment>
@@ -213,6 +217,10 @@
                     <name>page</name>
                     <value>knowledge/docs.html</value>
                 </preference>
+                <preference>
+                    <name>title</name>
+                    <value>Documentation</value>
+                </preference>
             </preferences>
         </instance>
     </deployment>
@@ -230,6 +238,10 @@
                     <name>page</name>
                     <value>knowledge/webinars.html</value>
                 </preference>
+                <preference>
+                    <name>title</name>
+                    <value>Webinars</value>
+                </preference>
             </preferences>
         </instance>
     </deployment>
@@ -247,6 +259,10 @@
                     <name>page</name>
                     <value>knowledge/wiki.html</value>
                 </preference>
+                <preference>
+                    <name>title</name>
+                    <value>Wiki</value>
+                </preference>
             </preferences>
         </instance>
     </deployment>
@@ -264,6 +280,10 @@
                     <name>page</name>
                     <value>knowledge/archlib.html</value>
                 </preference>
+                <preference>
+                    <name>title</name>
+                    <value>Architect's library</value>
+                </preference>
             </preferences>
         </instance>
     </deployment>