[Jboss-svn-commits] JBL Code SVN: r2548 - in branches/forge/adam/portal-extensions-2.2: . forge-kosmos/conf/portlet portal-default/src/web/WEB-INF

[<jbo...@li...>]

Author: wrzep
Date: 2006-02-20 06:51:17 -0500 (Mon, 20 Feb 2006)
New Revision: 2548

Added:
   branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/kosmos-object.xml
Removed:
   branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/kosmos-pages.xml
   branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/portlet-instances.xml
Modified:
   branches/forge/adam/portal-extensions-2.2/maven.xml
   branches/forge/adam/portal-extensions-2.2/portal-default/src/web/WEB-INF/default-object.xml
Log:
Migrated Kosmos to Portal 2.2.
http://jira.jboss.com/jira/browse/JBLAB-611
Pawel


Added: branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/kosmos-object.xml
===================================================================
--- branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/kosmos-object.xml	2006-02-20 06:19:51 UTC (rev 2547)
+++ branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/kosmos-object.xml	2006-02-20 11:51:17 UTC (rev 2548)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Configuration for JBoss Portal 2.2 -->
+<deployments>
+  <deployment>
+    <if-exists>overwrite</if-exists>
+    <instance>
+      <instance-name>JBossJiraMonitoringPortletInstance</instance-name>
+      <component-ref>kosmos-portal.JBossJiraMonitoringPortlet</component-ref>
+    </instance>
+    </deployment>
+    <deployment>
+    <if-exists>overwrite</if-exists>
+    <instance>
+      <instance-name>JBossSvnMonitoringPortletInstance</instance-name>
+      <component-ref>kosmos-portal.JBossSvnMonitoringPortlet</component-ref>
+    </instance>
+  </deployment>
+</deployments>

Deleted: branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/kosmos-pages.xml
===================================================================
--- branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/kosmos-pages.xml	2006-02-20 06:19:51 UTC (rev 2547)
+++ branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/kosmos-pages.xml	2006-02-20 11:51:17 UTC (rev 2548)
@@ -1,56 +0,0 @@
-<pages>
-	<portal-name>default</portal-name>
-	<page>
-		<page-name>kosmos-jira</page-name>
-		<window>
-			<window-name>NavigationPortletWindowDefaultKosmosJira</window-name>
-			<instance-ref>navigation.NavigationPortlet.NavigationPortletInstance</instance-ref>
-			<region>left</region>
-			<height>0</height>
-			<window-state>normal</window-state>
-		</window>
-
-		<window>
-			<window-name>AdsPortletWindowDefaultKosmosJira</window-name>
-			<instance-ref>ads.AdsPortlet.AdsPortletInstance</instance-ref>
-			<region>left</region>
-			<height>2</height>
-			<window-state>normal</window-state>
-		</window>
-																	
-		<window>
-			<window-name>JBossJiraMonitoring</window-name>
-			<instance-ref>kosmos-portal.JBossJiraMonitoringPortlet.JBossJiraMonitoringPortletInstance</instance-ref>
-			<default>false</default>
-			<region>center</region>
-			<height>0</height>
-		</window>
-	</page>
-	
-	<page>
-		<page-name>kosmos-svn</page-name>
-		<window>
-			<window-name>NavigationPortletWindowDefaultKosmosSvn</window-name>
-			<instance-ref>navigation.NavigationPortlet.NavigationPortletInstance</instance-ref>
-			<region>left</region>
-			<height>0</height>
-			<window-state>normal</window-state>
-		</window>
-
-		<window>
-			<window-name>AdsPortletWindowDefaultKosmosSvn</window-name>
-			<instance-ref>ads.AdsPortlet.AdsPortletInstance</instance-ref>
-			<region>left</region>
-			<height>2</height>
-			<window-state>normal</window-state>
-		</window>
-																	
-		<window>
-			<window-name>JBossSvnMonitoringPortlet</window-name>
-			<instance-ref>kosmos-portal.JBossSvnMonitoringPortlet.JBossSvnMonitoringPortletInstance</instance-ref>
-			<default>false</default>
-			<region>center</region>
-			<height>0</height>
-		</window>
-	</page>
-</pages>

Deleted: branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/portlet-instances.xml
===================================================================
--- branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/portlet-instances.xml	2006-02-20 06:19:51 UTC (rev 2547)
+++ branches/forge/adam/portal-extensions-2.2/forge-kosmos/conf/portlet/portlet-instances.xml	2006-02-20 11:51:17 UTC (rev 2548)
@@ -1,11 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<instances>
-  <instance>
-    <instance-name>JBossJiraMonitoringPortletInstance</instance-name>
-    <component-ref>JBossJiraMonitoringPortlet</component-ref>
-  </instance>
-  <instance>
-    <instance-name>JBossSvnMonitoringPortletInstance</instance-name>
-    <component-ref>JBossSvnMonitoringPortlet</component-ref>
-  </instance>
-</instances>

Modified: branches/forge/adam/portal-extensions-2.2/maven.xml
===================================================================
--- branches/forge/adam/portal-extensions-2.2/maven.xml	2006-02-20 06:19:51 UTC (rev 2547)
+++ branches/forge/adam/portal-extensions-2.2/maven.xml	2006-02-20 11:51:17 UTC (rev 2548)
@@ -128,7 +128,7 @@
 2. forge-common/src/etc/org/jboss/forge/common/forge.properties
 3. blojsom/to-copy/blojsom.war/WEB-INF/blojsom.properties
 4. forge-login/to-copy/portal-login-ds.xml
-5. federation-register/src/web/WEB-INF/faces-config (only for the JOSF portal).
+5. federation-register/src/web/WEB-INF/faces-config.xml (only for the JOSF portal).
 6. jbosswiki/wiki-common/src/etc/org/jboss/wiki/filedatasource.properties
 7. shotoku/shotoku-base/src/etc/shotoku.properties
 

Modified: branches/forge/adam/portal-extensions-2.2/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- branches/forge/adam/portal-extensions-2.2/portal-default/src/web/WEB-INF/default-object.xml	2006-02-20 06:19:51 UTC (rev 2547)
+++ branches/forge/adam/portal-extensions-2.2/portal-default/src/web/WEB-INF/default-object.xml	2006-02-20 11:51:17 UTC (rev 2548)
@@ -528,4 +528,62 @@
 			<component-ref>portal.RolePortlet</component-ref>
 		</instance>
 	</deployment>
+	<deployment>
+	        <if-exists>overwrite</if-exists>
+		<parent-ref>default</parent-ref>
+		<properties/>
+		<page>
+		        <page-name>kosmos-jira</page-name>
+			<properties/>
+			<window>
+			        <window-name>NavigationPortletWindowDefaultKosmosJira</window-name>
+				<instance-ref>NavigationPortletInstance</instance-ref>
+				<region>left</region>
+				<height>0</height>
+				<window-state>normal</window-state>
+			</window>
+			<window>
+			        <window-name>AdsPortletWindowDefaultKosmosJira</window-name>
+				<instance-ref>AdsPortletInstance</instance-ref>
+				<region>left</region>
+				<height>2</height>
+				<window-state>normal</window-state>
+			</window>
+			<window>
+			        <window-name>JBossJiraMonitoring</window-name>
+				<instance-ref>JBossJiraMonitoringPortletInstance</instance-ref>
+				<region>center</region>
+				<height>0</height>
+			</window>
+		</page>
+	</deployment>
+	<deployment>
+	        <if-exists>overwrite</if-exists>
+		<parent-ref>default</parent-ref>
+		<properties/>
+		<page>
+		        <page-name>kosmos-svn</page-name>
+			<properties/>
+			<window>
+			        <window-name>NavigationPortletWindowDefaultKosmosSvn</window-name>
+				<instance-ref>NavigationPortletInstance</instance-ref>
+				<region>left</region>
+				<height>0</height>
+				<window-state>normal</window-state>
+			</window>
+			<window>
+			        <window-name>AdsPortletWindowDefaultKosmosSvn</window-name>
+				<instance-ref>AdsPortletInstance</instance-ref>
+				<region>left</region>
+				<height>2</height>
+				<window-state>normal</window-state>
+			</window>
+			<window>
+			        <window-name>JBossSvnMonitoringPortlet</window-name>
+				<instance-ref>JBossSvnMonitoringPortletInstance</instance-ref>
+				<region>center</region>
+				<height>0</height>
+			</window>		
+		</page>
+	</deployment>
 </deployments>