[richfaces-svn-commits] JBoss Rich Faces SVN: r5516 - trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Mon Jan 21 18:09:09 EST 2008


Author: alexsmirnov
Date: 2008-01-21 18:09:09 -0500 (Mon, 21 Jan 2008)
New Revision: 5516

Added:
   trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/ajaxrepeaterportlet-object.xml
Removed:
   trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/ajaxportlet-object.xml
Modified:
   trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml
   trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/portlet.xml
Log:
rename portlet to avod name collosion with richfaces demo

Deleted: trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/ajaxportlet-object.xml
===================================================================
--- trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/ajaxportlet-object.xml	2008-01-21 23:07:45 UTC (rev 5515)
+++ trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/ajaxportlet-object.xml	2008-01-21 23:09:09 UTC (rev 5516)
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-	<deployment>
-		<parent-ref>default</parent-ref>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>AjaxRepeaterPortletInstance</instance-name>
-			<component-ref>ajaxRepeaterPortletApp.ajaxRepeaterPortlet</component-ref>
-		</instance>
-	</deployment>
-	<deployment>
-		<parent-ref>default</parent-ref>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>RichfacesPortletInstance</instance-name>
-			<component-ref>ajaxRepeaterPortletApp.richfacesPortlet</component-ref>
-		</instance>
-	</deployment>
-	<deployment>
-		<parent-ref>default</parent-ref>
-		<if-exists>overwrite</if-exists>
-		<page>
-			<page-name>ajaxRepeaterPortlet</page-name>
-			<window>
-				<window-name>ajaxportletWindow</window-name>
-				<instance-ref>AjaxRepeaterPortletInstance</instance-ref>
-				<default>true</default>
-				<region>center</region>
-				<height>0</height>
-			</window>
-		</page>
-	</deployment>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<parent-ref>default.default</parent-ref>
-		<window>
-			<window-name>otherAjaxportletWindow</window-name>
-			<instance-ref>AjaxRepeaterPortletInstance</instance-ref>
-			<default>true</default>
-			<region>center</region>
-			<height>0</height>
-		</window>
-	</deployment>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<parent-ref>default.default</parent-ref>
-		<window>
-			<window-name>richfacesPortletWindow</window-name>
-			<instance-ref>RichfacesPortletInstance</instance-ref>
-			<default>true</default>
-			<region>center</region>
-			<height>0</height>
-		</window>
-	</deployment>
-	<!--
-		<deployment>
-		<parent-ref>default</parent-ref>
-		<if-exists>overwrite</if-exists>
-		<instance>
-		<instance-name>AjaxRepeaterPortletSecondInstance</instance-name>
-		<component-ref>ajaxRepeaterPortletApp.ajaxRepeaterPortlet</component-ref>
-		</instance>
-		</deployment>
-	-->
-</deployments>

Copied: trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/ajaxrepeaterportlet-object.xml (from rev 5508, trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/ajaxportlet-object.xml)
===================================================================
--- trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/ajaxrepeaterportlet-object.xml	                        (rev 0)
+++ trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/ajaxrepeaterportlet-object.xml	2008-01-21 23:09:09 UTC (rev 5516)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+	<deployment>
+		<parent-ref>default</parent-ref>
+		<if-exists>overwrite</if-exists>
+		<instance>
+			<instance-name>AjaxRepeaterPortletInstance</instance-name>
+			<component-ref>ajaxRepeaterPortletApp.ajaxRepeaterPortlet</component-ref>
+		</instance>
+	</deployment>
+	<deployment>
+		<parent-ref>default</parent-ref>
+		<if-exists>overwrite</if-exists>
+		<instance>
+			<instance-name>RichfacesPortletInstance</instance-name>
+			<component-ref>ajaxRepeaterPortletApp.richfacesPortlet</component-ref>
+		</instance>
+	</deployment>
+	<deployment>
+		<parent-ref>default</parent-ref>
+		<if-exists>overwrite</if-exists>
+		<page>
+			<page-name>ajaxRepeaterPortlet</page-name>
+			<window>
+				<window-name>ajaxRepeaterPortletWindow</window-name>
+				<instance-ref>AjaxRepeaterPortletInstance</instance-ref>
+				<default>true</default>
+				<region>center</region>
+				<height>0</height>
+			</window>
+		</page>
+	</deployment>
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<parent-ref>default.default</parent-ref>
+		<window>
+			<window-name>otherAjaxPortletWindow</window-name>
+			<instance-ref>AjaxRepeaterPortletInstance</instance-ref>
+			<default>true</default>
+			<region>center</region>
+			<height>0</height>
+		</window>
+	</deployment>
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<parent-ref>default.default</parent-ref>
+		<window>
+			<window-name>richfacesPortletWindow</window-name>
+			<instance-ref>RichfacesPortletInstance</instance-ref>
+			<default>true</default>
+			<region>center</region>
+			<height>0</height>
+		</window>
+	</deployment>
+	<!--
+		<deployment>
+		<parent-ref>default</parent-ref>
+		<if-exists>overwrite</if-exists>
+		<instance>
+		<instance-name>AjaxRepeaterPortletSecondInstance</instance-name>
+		<component-ref>ajaxRepeaterPortletApp.ajaxRepeaterPortlet</component-ref>
+		</instance>
+		</deployment>
+	-->
+</deployments>

Modified: trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml	2008-01-21 23:07:45 UTC (rev 5515)
+++ trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/jboss-portlet.xml	2008-01-21 23:09:09 UTC (rev 5516)
@@ -14,5 +14,10 @@
 	</portlet>
 	<portlet>
 		<portlet-name>richfacesPortlet</portlet-name>
+		<header-content>
+			<script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script>
+			<script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script>
+			<link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> 
+		</header-content>
 	</portlet>
 </portlet-app>

Modified: trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/portlet.xml	2008-01-21 23:07:45 UTC (rev 5515)
+++ trunk/samples/ajaxPortlet/src/main/webapp/WEB-INF/portlet.xml	2008-01-21 23:09:09 UTC (rev 5516)
@@ -24,7 +24,7 @@
 
     <expiration-cache>-0</expiration-cache>
     <portlet-info>
-       <title>Ajax Portlet</title>
+       <title>Ajax Repeater Portlet</title>
     </portlet-info>
     <supports>
       <mime-type>text/html</mime-type>




More information about the richfaces-svn-commits mailing list