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

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

Author: unibrew
Date: 2008-05-19 08:03:25 -0400 (Mon, 19 May 2008)
New Revision: 20022

Modified:
   labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
svn merge -r 19932:19972 https://svn.labs.jboss.org/labs/jbosslabs/trunk/portal-extensions .

Modified: labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml	2008-05-19 11:44:30 UTC (rev 20021)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml	2008-05-19 12:03:25 UTC (rev 20022)
@@ -115,7 +115,7 @@
                 </preference>
                 <preference>
                     <name>page</name>
-                    <value>community_main.html</value>
+                    <value>redirect.html</value>
                 </preference>
             </preferences>
         </instance>
@@ -154,6 +154,57 @@
             </preferences>
         </instance>
     </deployment>
+    <deployment>
+        <if-exists>overwrite</if-exists>
+        <instance>
+            <instance-id>FreezoneCommunityHomePageInstance</instance-id>
+            <portlet-ref>FreezonePortlet</portlet-ref>
+            <preferences>
+                <preference>
+                    <name>projectId</name>
+                    <value>default</value>
+                </preference>
+                <preference>
+                    <name>page</name>
+                    <value>communityHome.html</value>
+                </preference>
+            </preferences>
+        </instance>
+    </deployment>
+    <deployment>
+        <if-exists>overwrite</if-exists>
+        <instance>
+            <instance-id>FreezoneCommunityHomePageRightTopInstance</instance-id>
+            <portlet-ref>FreezonePortlet</portlet-ref>
+            <preferences>
+                <preference>
+                    <name>projectId</name>
+                    <value>default</value>
+                </preference>
+                <preference>
+                    <name>page</name>
+                    <value>communityProposeABlog.html</value>
+                </preference>
+            </preferences>
+        </instance>
+    </deployment>
+    <deployment>
+        <if-exists>overwrite</if-exists>
+        <instance>
+            <instance-id>FreezoneCommunityHomePageRightBottomInstance</instance-id>
+            <portlet-ref>FreezonePortlet</portlet-ref>
+            <preferences>
+                <preference>
+                    <name>projectId</name>
+                    <value>default</value>
+                </preference>
+                <preference>
+                    <name>page</name>
+                    <value>communityjbug.html</value>
+                </preference>
+            </preferences>
+        </instance>
+    </deployment>
 
     <deployment>
         <if-exists>overwrite</if-exists>

Modified: labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2008-05-19 11:44:30 UTC (rev 20021)
+++ labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2008-05-19 12:03:25 UTC (rev 20022)
@@ -310,6 +310,52 @@
 		</page>
 	</deployment>
 
+        <deployment>
+                <if-exists>overwrite</if-exists>
+                <parent-ref>default</parent-ref>
+                <page>
+                        <page-name>communityhome</page-name>
+                 <properties>
+                                <!-- Set the emptyRenderer for this page -->
+                                <property>
+                                        <name>theme.renderSetId</name>
+                                        <value>emptyRenderer</value>
+                                </property>
+                        </properties>
+
+            <window>
+                                <window-name>FreezoneCommunityTitleWindow</window-name>
+                                <instance-ref>FreezoneCommunityTitlePageInstance</instance-ref>
+                                <region>triple</region>
+                                <height>0</height>
+                        </window>
+            <window>
+                                <window-name>FreezoneCommunityNavWindow</window-name>
+                                <instance-ref>FreezoneCommunityNavPageInstance</instance-ref>
+                                <region>left1_6</region>
+                                <height>0</height>
+                        </window>
+            <window>
+                                <window-name>FreezoneCommunityHomeWindow</window-name>
+                                <instance-ref>FreezoneCommunityHomePageInstance</instance-ref>
+                                <region>center4_6</region>
+                                <height>0</height>
+                        </window>
+            <window>
+                                <window-name>FreezoneCommunityHomeRightTopWindow</window-name>
+                                <instance-ref>FreezoneCommunityHomePageRightTopInstance</instance-ref>
+                                <region>right1_6</region>
+                                <height>0</height>
+                        </window>
+            <window>
+                                <window-name>FreezoneCommunityHomeRightBottomWindow</window-name>
+                                <instance-ref>FreezoneCommunityHomePageRightBottomInstance</instance-ref>
+                                <region>right1_6</region>
+                                <height>2</height>
+                        </window>
+                </page>
+        </deployment>
+
 	<deployment>
 		<if-exists>overwrite</if-exists>
 		<parent-ref>default</parent-ref>