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

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

Author: szimano
Date: 2007-04-24 08:26:00 -0400 (Tue, 24 Apr 2007)
New Revision: 11294

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


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 12:20:27 UTC (rev 11293)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml	2007-04-24 12:26:00 UTC (rev 11294)
@@ -290,7 +290,7 @@
     <deployment>
         <if-exists>overwrite</if-exists>
         <instance>
-            <instance-id>FreezoneAnnoucementInstance</instance-id>
+            <instance-id>FreezoneAnnouncementInstance</instance-id>
             <portlet-ref>FreezonePortlet</portlet-ref>
             <preferences>
                 <preference>
@@ -299,7 +299,7 @@
                 </preference>
                 <preference>
                     <name>page</name>
-                    <value>annoucements/jbossOrgCommunityDriven.html</value>
+                    <value>announcements/jbossOrgCommunityDriven.html</value>
                 </preference>
             </preferences>
         </instance>

Modified: labs/jbosslabs/branches/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-04-24 12:20:27 UTC (rev 11293)
+++ labs/jbosslabs/branches/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-04-24 12:26:00 UTC (rev 11294)
@@ -418,7 +418,7 @@
 		<if-exists>overwrite</if-exists>
 		<parent-ref>default</parent-ref>
 		<page>
-			<page-name>annoucement</page-name>
+			<page-name>announcement</page-name>
 			<properties>
 				<!-- Set the emptyRenderer for this page -->
 				<property>
@@ -428,9 +428,9 @@
 			</properties>
 			<window>
 				<window-name>
-					FreezoneAnnoucementPageWindow
+					FreezoneAnnouncementPageWindow
 				</window-name>
-				<instance-ref>FreezoneAnnoucementInstance</instance-ref>
+				<instance-ref>FreezoneAnnouncementInstance</instance-ref>
 				<region>triple</region>
 				<height>0</height>
 			</window>