Author: julien_viet Date: 2010-02-24 08:04:51 -0500 (Wed, 24 Feb 2010) New Revision: 1845 Removed: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/portlet-preferences.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/portlet-preferences.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/portlet-preferences.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/portlet-preferences.xml Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml Log: now update the samples descriptors Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,9 +20,10 @@ --> -<node-navigation> - <owner-type>group</owner-type> - <owner-id>/platform/users</owner-id> +<node-navigation + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <priority>8</priority> <page-nodes> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/pages.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -19,7 +19,10 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<page-set> +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <page> <name>sitemap</name> <title>Site Map</title> Deleted: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/portlet-preferences.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/portlet-preferences.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/group/platform/users/portlet-preferences.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> - -<portlet-preferences-set/> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,9 +20,10 @@ --> -<node-navigation> - <owner-type>portal</owner-type> - <owner-id>classic</owner-id> +<node-navigation + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <priority>1</priority> <page-nodes> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/pages.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,23 +20,34 @@ --> -<page-set> +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <page> - <owner-type>portal</owner-type> - <owner-id>classic</owner-id> <name>samplePage</name> <title>Sample Page</title> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <application> - <instance-id>portal#classic:/web/IFramePortlet/samplePage</instance-id> - <title>Sample Page portlet</title> - <access-permissions>Everyone</access-permissions> - <show-info-bar>false</show-info-bar> - <show-application-state>false</show-application-state> - <show-application-mode>false</show-application-mode> - </application> + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>IFramePortlet</portlet-ref> + <preferences> + <preference> + <name>url</name> + <value>http://blog.gatein.org</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <title>Sample Page portlet</title> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + <show-application-state>false</show-application-state> + <show-application-mode>false</show-application-mode> + </portlet-application> </page> </page-set> Deleted: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/portlet-preferences.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/portlet-preferences.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/portlet-preferences.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> - -<portlet-preferences-set> - <portlet-preferences> - <owner-type>portal</owner-type> - <owner-id>classic</owner-id> - <window-id>portal#classic:/web/IFramePortlet/samplePage</window-id> - <preference> - <name>url</name> - <value>http://blog.gatein.org</value> - <read-only>false</read-only> - </preference> - </portlet-preferences> -</portlet-preferences-set> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,9 +20,10 @@ --> -<node-navigation> - <owner-type>user</owner-type> - <owner-id>root</owner-id> +<node-navigation + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <priority>3</priority> <page-nodes> Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/user/root/pages.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,7 +20,10 @@ --> -<page-set> +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <page> <name>sales</name> <title>Sales BI</title> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,9 +20,10 @@ --> -<node-navigation> - <owner-type>group</owner-type> - <owner-id>/platform/users</owner-id> +<node-navigation + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <priority>8</priority> <page-nodes> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/pages.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,7 +20,10 @@ --> -<page-set> +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <page> <name>sitemap</name> <title>Site Map</title> Deleted: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/portlet-preferences.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/portlet-preferences.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/group/platform/users/portlet-preferences.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> - -<portlet-preferences-set/> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,9 +20,10 @@ --> -<node-navigation> - <owner-type>portal</owner-type> - <owner-id>classic</owner-id> +<node-navigation + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <priority>1</priority> <page-nodes> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/pages.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,23 +20,34 @@ --> -<page-set> +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <page> - <owner-type>portal</owner-type> - <owner-id>classic</owner-id> <name>samplePage</name> <title>Sample Page</title> <access-permissions>Everyone</access-permissions> <edit-permission>*:/platform/administrators</edit-permission> - <application> - <instance-id>portal#classic:/web/IFramePortlet/samplePage</instance-id> - <title>Sample Page portlet</title> - <access-permissions>Everyone</access-permissions> - <show-info-bar>false</show-info-bar> - <show-application-state>false</show-application-state> - <show-application-mode>false</show-application-mode> - </application> + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>IFramePortlet</portlet-ref> + <preferences> + <preference> + <name>url</name> + <value>http://blog.gatein.org</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <title>Sample Page portlet</title> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + <show-application-state>false</show-application-state> + <show-application-mode>false</show-application-mode> + </portlet-application> </page> </page-set> Deleted: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/portlet-preferences.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/portlet-preferences.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/portlet-preferences.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> - -<portlet-preferences-set> - <portlet-preferences> - <owner-type>portal</owner-type> - <owner-id>classic</owner-id> - <window-id>portal#classic:/web/IFramePortlet/samplePage</window-id> - <preference> - <name>url</name> - <value>http://blog.gatein.org</value> - <read-only>false</read-only> - </preference> - </portlet-preferences> -</portlet-preferences-set> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/navigation.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,9 +20,10 @@ --> -<node-navigation> - <owner-type>user</owner-type> - <owner-id>root</owner-id> +<node-navigation + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <priority>3</priority> <page-nodes> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2010-02-24 13:00:58 UTC (rev 1844) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/user/root/pages.xml 2010-02-24 13:04:51 UTC (rev 1845) @@ -20,7 +20,10 @@ --> -<page-set> +<page-set + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"> <page> <name>sales</name> <title>Sales BI</title>