gatein SVN: r1844 - portal/trunk/component/portal/src/main/java.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 08:00:58 -0500 (Wed, 24 Feb 2010)
New Revision: 1844
Modified:
portal/trunk/component/portal/src/main/java/gatein-objects.xsd
Log:
we don't support the <application> tag officially
Modified: portal/trunk/component/portal/src/main/java/gatein-objects.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein-objects.xsd 2010-02-24 12:44:30 UTC (rev 1843)
+++ portal/trunk/component/portal/src/main/java/gatein-objects.xsd 2010-02-24 13:00:58 UTC (rev 1844)
@@ -112,7 +112,6 @@
<xs:group name="containerChildrenGroup">
<xs:sequence>
<xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
<xs:element name="portlet-application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
<xs:element name="container" type="containerType" minOccurs="1" maxOccurs="1"/>
<xs:element name="page-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
@@ -150,13 +149,6 @@
<xs:attribute name="attribute" type="xs:string"/>
</xs:complexType>
- <xs:complexType name="applicationType">
- <xs:sequence>
- <xs:element name="instance-id" type="xs:string" minOccurs="1" maxOccurs="1"/>
- <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
- </xs:sequence>
- </xs:complexType>
-
<xs:complexType name="portletApplicationType">
<xs:sequence>
<xs:element name="portlet" type="portletType" minOccurs="1" maxOccurs="1"/>
14 years, 10 months
- 1
- 0
gatein SVN: r1843 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 07:44:30 -0500 (Wed, 24 Feb 2010)
New Revision: 1843
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
Log:
minor
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2010-02-24 11:54:34 UTC (rev 1842)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2010-02-24 12:44:30 UTC (rev 1843)
@@ -20,12 +20,12 @@
-->
-<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
- 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>
<access-permissions>*:/platform/guests</access-permissions>
14 years, 10 months
- 1
- 0
gatein SVN: r1842 - in portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal: group/platform/administrators and 15 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 06:54:34 -0500 (Wed, 24 Feb 2010)
New Revision: 1842
Removed:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/portlet-preferences.xml
Log:
remove useless portlet-preferences.xml
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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 />
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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 />
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -1,24 +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-set>
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -1,24 +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-set>
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -1,24 +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-set>
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -1,24 +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-set>
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -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/>
\ No newline at end of file
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/portlet-preferences.xml 2010-02-24 11:47:22 UTC (rev 1841)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/portlet-preferences.xml 2010-02-24 11:54:34 UTC (rev 1842)
@@ -1,24 +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-set>
\ No newline at end of file
14 years, 10 months
- 1
- 0
gatein SVN: r1841 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 06:47:22 -0500 (Wed, 24 Feb 2010)
New Revision: 1841
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java
Log:
fix xml unmarshalling
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2010-02-24 11:39:32 UTC (rev 1840)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2010-02-24 11:47:22 UTC (rev 1841)
@@ -51,6 +51,7 @@
import org.jibx.runtime.BindingDirectory;
import org.jibx.runtime.IBindingFactory;
import org.jibx.runtime.IUnmarshallingContext;
+import org.jibx.runtime.impl.UnmarshallingContext;
import java.io.ByteArrayInputStream;
import java.util.Comparator;
@@ -294,8 +295,9 @@
String out = IOUtil.getStreamContentAsString(confManager_.getInputStream(path));
ByteArrayInputStream is = new ByteArrayInputStream(out.getBytes("UTF-8"));
IBindingFactory bfact = BindingDirectory.getFactory(Container.class);
- IUnmarshallingContext uctx = bfact.createUnmarshallingContext();
- Container container = Container.class.cast(uctx.unmarshalDocument(is, null));
+ UnmarshallingContext uctx = (UnmarshallingContext)bfact.createUnmarshallingContext();
+ uctx.setDocument(is, null, "UTF-8", false);
+ Container container = (Container)uctx.unmarshalElement();
generateStorageName(container);
return container;
}
14 years, 10 months
- 1
- 0
gatein SVN: r1840 - portal/trunk/component/portal/src/main/resources.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 06:39:32 -0500 (Wed, 24 Feb 2010)
New Revision: 1840
Modified:
portal/trunk/component/portal/src/main/resources/binding.xml
Log:
minor removed commented xml
Modified: portal/trunk/component/portal/src/main/resources/binding.xml
===================================================================
--- portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-24 11:35:16 UTC (rev 1839)
+++ portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-24 11:39:32 UTC (rev 1840)
@@ -21,8 +21,6 @@
<binding>
- <!--<namespace uri="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" default="none" prefix=""/>-->
-
<format type="java.lang.String[]"
serializer="org.exoplatform.portal.config.serialize.JibxArraySerialize.serializeStringArray"
deserializer="org.exoplatform.portal.config.serialize.JibxArraySerialize.deserializeStringArray"/>
14 years, 10 months
- 1
- 0
gatein SVN: r1839 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/config and 28 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-24 06:35:16 -0500 (Wed, 24 Feb 2010)
New Revision: 1839
Added:
portal/trunk/component/portal/src/main/java/gatein-objects.xsd
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
portal/trunk/component/portal/src/main/resources/binding.xml
portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml
portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/portlet-preferences.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml
Log:
GTNPORTAL-643 : GateIn portal object schema
Added: portal/trunk/component/portal/src/main/java/gatein-objects.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein-objects.xsd (rev 0)
+++ portal/trunk/component/portal/src/main/java/gatein-objects.xsd 2010-02-24 11:35:16 UTC (rev 1839)
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<!--
+
+ 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.
+
+-->
+
+<xs:schema
+ targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <!-- A top page element -->
+ <xs:element name="page" type="pageType"/>
+
+ <!-- A top page-set element -->
+ <xs:element name="page-set" type="pageSetType"/>
+
+ <!-- A top portal-config element -->
+ <xs:element name="portal-config" type="portalConfigType"/>
+
+ <!-- A top container element -->
+ <xs:element name="container" type="containerType"/>
+
+ <!-- A top node-navigation element -->
+ <xs:element name="node-navigation" type="nodeNavigationType"/>
+
+ <!-- The type of a top navigation node -->
+ <xs:complexType name="nodeNavigationType">
+ <xs:sequence>
+ <xs:element name="priority" type="xs:positiveInteger"/>
+ <xs:element name="page-nodes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- The type of a navigation node -->
+ <xs:complexType name="nodeType">
+ <xs:sequence>
+ <xs:element name="uri" type="xs:string"/>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="start-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="end-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-publication-date" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="visible" type="xs:boolean" default="true" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="page-reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="pageSetType">
+ <xs:sequence>
+ <xs:element name="page" type="pageType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portalConfigType">
+ <xs:sequence>
+ <xs:element name="portal-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="locale" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="skin" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="properties" type="propertiesType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="portal-layout" minOccurs="1" maxOccurs="1">
+ <xs:complexType>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="entry" type="propertiesEntryType" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesEntryType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="key" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:group name="containerChildrenGroup">
+ <xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="portlet-application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="container" type="containerType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="page-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="site-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:group>
+
+ <xs:complexType name="pageType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-max-window" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="containerType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:string"/>
+ <xs:attribute name="template" type="xs:string"/>
+ <xs:attribute name="attribute" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="applicationType">
+ <xs:sequence>
+ <xs:element name="instance-id" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletApplicationType">
+ <xs:sequence>
+ <xs:element name="portlet" type="portletType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-application-state" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-application-mode" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletType">
+ <xs:sequence>
+ <xs:element name="application-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="portlet-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="preferences" type="portletPreferencesType" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferencesType">
+ <xs:sequence>
+ <xs:element name="preference" type="portletPreferenceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferenceType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2010-02-24 11:35:16 UTC (rev 1839)
@@ -36,14 +36,17 @@
import org.exoplatform.portal.config.model.Page.PageSet;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
-import org.jibx.runtime.BindingDirectory;
-import org.jibx.runtime.IBindingFactory;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.JiBXException;
+import org.jibx.runtime.*;
+import org.jibx.runtime.impl.IXMLReaderFactory;
+import org.jibx.runtime.impl.RuntimeSupport;
+import org.jibx.runtime.impl.UnmarshallingContext;
+import org.jibx.runtime.impl.XMLPullReaderFactory;
+import org.xmlpull.v1.XmlPullParserFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -525,8 +528,9 @@
{
ByteArrayInputStream is = new ByteArrayInputStream(xml.getBytes("UTF-8"));
IBindingFactory bfact = BindingDirectory.getFactory(clazz);
- IUnmarshallingContext uctx = bfact.createUnmarshallingContext();
- T o = clazz.cast(uctx.unmarshalDocument(is, "UTF-8"));
+ UnmarshallingContext uctx = (UnmarshallingContext)bfact.createUnmarshallingContext();
+ uctx.setDocument(is, null, "UTF-8", false);
+ T o = clazz.cast(uctx.unmarshalElement());
if (o instanceof PageNavigation)
{
PageNavigation nav = (PageNavigation)o;
Modified: portal/trunk/component/portal/src/main/resources/binding.xml
===================================================================
--- portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,6 +20,9 @@
-->
<binding>
+
+ <!--<namespace uri="http://www.gatein.org/xml/ns/gatein_objects_1_0.xsd" default="none" prefix=""/>-->
+
<format type="java.lang.String[]"
serializer="org.exoplatform.portal.config.serialize.JibxArraySerialize.serializeStringArray"
deserializer="org.exoplatform.portal.config.serialize.JibxArraySerialize.deserializeStringArray"/>
@@ -65,8 +68,8 @@
<structure map-as="org.exoplatform.portal.config.model.Container" usage="optional"/>
<structure map-as="org.exoplatform.portal.config.model.Application" usage="optional"/>
<structure map-as="org.exoplatform.portal.config.model.PageBody" usage="optional"/>
- <structure map-as="org.exoplatform.portal.config.model.SiteBody" usage="optional"/>
- <structure map-as="org.exoplatform.portal.config.serialize.PortletApplication" usage="optional"/>
+ <structure map-as="org.exoplatform.portal.config.model.SiteBody" usage="optional"/>
+ <structure map-as="org.exoplatform.portal.config.serialize.PortletApplication" usage="optional"/>
</collection>
</mapping>
@@ -146,5 +149,6 @@
<collection field="preferences"
item-type="org.exoplatform.portal.application.Preference"/>
<structure name="preferences-validator" usage="optional"/>
- </mapping>
+ </mapping>
+
</binding>
Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/group.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<portal-config>
+<portal-config
+ 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">
<portal-name>platform/administrators</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/component/portal/src/test/resources/portal/group/template/group/group.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -18,7 +18,10 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<portal-config>
+<portal-config
+ 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">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/navigation.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<node-navigation>
+<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>5</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/organization/management/executive-board/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,8 +20,11 @@
-->
-<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>newStaff</name>
<title>New Staff</title>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<node-navigation>
+<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>2</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,8 +20,11 @@
-->
-<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>newAccount</name>
<title>New Account</title>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/navigation.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<node-navigation>
+<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>9</priority>
<page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/guests/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -22,7 +22,10 @@
<page-set>
- <page>
+ <page
+ 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">
<name>sitemap</name>
<title>Site Map</title>
<access-permissions>*:/platform/guests</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/navigation.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<node-navigation>
+<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/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/users/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,8 +20,11 @@
-->
-<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>mylink-blog</name>
<title>Blog</title>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/template/group/group.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<portal-config>
+<portal-config
+ 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">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,9 +20,11 @@
-->
-<node-navigation>
+<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>
<node>
<uri>home</uri>
@@ -30,14 +32,14 @@
<label>#{portal.classic.home}</label>
<page-reference>portal::classic::homepage</page-reference>
</node>
+ <node>
+ <uri>sitemap</uri>
+ <name>sitemap</name>
+ <label>#{portal.classic.sitemap}</label>
+ <visible>true</visible>
+ <page-reference>portal::classic::sitemap</page-reference>
+ </node>
<node>
- <uri>sitemap</uri>
- <name>sitemap</name>
- <label>#{portal.classic.sitemap}</label>
- <visible>true</visible>
- <page-reference>portal::classic::sitemap</page-reference>
- </node>
- <node>
<uri>groupnavigation</uri>
<name>groupnavigation</name>
<label>#{portal.classic.groupnavigation}</label>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -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>homepage</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/portal.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<portal-config>
+<portal-config
+ 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">
<portal-name>classic</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/sharedlayout.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
+<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"
+ 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">
<container template="system:/groovy/portal/webui/container/UIToolbarContainer.gtmpl">
<access-permissions>*:/platform/users</access-permissions>
<container id="StarToolBarPortlet" template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<node-navigation>
+<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/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -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>homepage</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<portal-config>
+<portal-config
+ 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">
<portal-name>@owner@</portal-name>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portlet-preferences.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portlet-preferences.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -21,37 +21,4 @@
-->
<portlet-preferences-set>
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>@owner@</owner-id>
- <window-id>portal#portalclassic:/web/BannerPortlet/banner</window-id>
- <preference>
- <name>template</name>
- <value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>@owner@</owner-id>
- <window-id>portal#portalclassic:/web/FooterPortlet/footer</window-id>
- <preference>
- <name>template</name>
- <value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-
-
- <portlet-preferences>
- <owner-type>portal</owner-type>
- <owner-id>@owner@</owner-id>
- <window-id>portal#portalclassic:/web/GroovyPortlet/groovyportlet</window-id>
- <preference>
- <name>template</name>
- <value>par:/groovy/groovy/webui/component/UIGroovyPortlet.gtmpl</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
</portlet-preferences-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/containers/four-columns/container.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,29 +20,16 @@
-->
-<container template="classpath:groovy/dashboard/webui/component/UIColumnContainer.gtmpl">
+<container template="classpath:groovy/dashboard/webui/component/UIColumnContainer.gtmpl"
+ 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">
<container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl">
- <application>
- <instance-id>/eXoGadgets/Calendar</instance-id>
- <application-type>eXoGadget</application-type>
- </application>
</container>
<container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl">
- <application>
- <instance-id>/eXoGadgets/Calculator</instance-id>
- <application-type>eXoGadget</application-type>
- </application>
</container>
<container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl">
- <application>
- <instance-id>/eXoGadgets/Todo</instance-id>
- <application-type>eXoGadget</application-type>
- </application>
</container>
<container template="classpath:groovy/dashboard/webui/component/UIContainer.gtmpl">
- <application>
- <instance-id>/eXoGadgets/rssAggregator</instance-id>
- <application-type>eXoGadget</application-type>
- </application>
</container>
</container>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/dashboard/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<page>
+<page
+ 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">
<name></name>
<portlet-application>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/empty/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,6 +20,9 @@
-->
-<page>
+<page
+ 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">
<name></name>
</page>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/one-row-two-columns/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<page>
+<page
+ 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">
<name></name>
<container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'></container>
<container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-columns/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<page>
+<page
+ 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">
<name></name>
<container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl">
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<page>
+<page
+ 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">
<name></name>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-rows-two-columns/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<page>
+<page
+ 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">
<name></name>
<container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'>
<container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/three-tabs/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<page>
+<page
+ 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">
<name></name>
<title></title>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<page>
+<page
+ 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">
<name></name>
<container template="system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl">
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-columns-one-row/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<page>
+<page
+ 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">
<name></name>
<container template='system:/groovy/portal/webui/container/UITableColumnContainer.gtmpl'>
<container template='system:/groovy/portal/webui/container/UIContainer.gtmpl'></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-rows/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,7 +20,10 @@
-->
-<page>
+<page
+ 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">
<name></name>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl"></container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/page.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,51 +20,18 @@
-->
-<page>
+<page
+ 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">
<name></name>
<title></title>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
<container template="system:/groovy/portal/webui/container/UITabContainer.gtmpl">
<factory-id>TabContainer</factory-id>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
- <!--
- <portlet-application>
- <portlet>
- <application-ref>exoadmin</application-ref>
- <portlet-ref>AccountPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>NewAccountPreference</name>
- <value>Preference value for Account portlet</value>
- <read-only>false</read-only>
- </preference>
- </preferences>
- </portlet>
- <title>New Account</title>
- <show-info-bar>true</show-info-bar>
- <show-application-state>true</show-application-state>
- </portlet-application>
- -->
</container>
<container template="system:/groovy/portal/webui/container/UIContainer.gtmpl">
- <!--
- <portlet-application>
- <portlet>
- <application-ref>web</application-ref>
- <portlet-ref>SiteMapPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>SitemapPreference</name>
- <value>Preference value for Sitemap portlet</value>
- <read-only>false</read-only>
- </preference>
- </preferences>
- </portlet>
- <title>Sitemap Portlet</title>
- <show-info-bar>true</show-info-bar>
- <show-application-state>true</show-application-state>
- </portlet-application>
- -->
</container>
</container>
</container>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/portlet-preferences.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/portlet-preferences.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/template/pages/two-tabs/portlet-preferences.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -21,25 +21,4 @@
-->
<portlet-preferences-set>
- <portlet-preferences>
- <owner-type></owner-type>
- <owner-id></owner-id>
- <window-id>/exoadmin/AccountPortlet</window-id>
- <preference>
- <name>NewAccountPreference</name>
- <value>Preference value for Account portlet</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
-
- <portlet-preferences>
- <owner-type></owner-type>
- <owner-id></owner-id>
- <window-id>/web/SiteMapPortlet</window-id>
- <preference>
- <name>SitemapPreference</name>
- <value>Preference value for Sitemap portlet</value>
- <read-only>false</read-only>
- </preference>
- </portlet-preferences>
</portlet-preferences-set>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/demo/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,4 +20,8 @@
-->
-<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-set>
\ No newline at end of file
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/john/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,4 +20,8 @@
-->
-<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-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/marry/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,4 +20,8 @@
-->
-<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-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/root/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,6 +20,9 @@
-->
-<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-set>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2010-02-24 11:02:44 UTC (rev 1838)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/user/template/user/pages.xml 2010-02-24 11:35:16 UTC (rev 1839)
@@ -20,55 +20,9 @@
-->
-<page-set>
- <!--
- <page>
- <name>sales</name>
- <title>Sales BI</title>
- <access-permissions>*:/platform/users</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <portlet-application>
- <portlet>
- <application-ref>dashboard</application-ref>
- <portlet-ref>DashboardPortlet</portlet-ref>
- </portlet>
- <title>Dashboard</title>
- <access-permissions>*:/platform/users</access-permissions>
- <show-info-bar>false</show-info-bar>
- </portlet-application>
- </page>
-
- <page>
- <name>scrum</name>
- <title>Scrum</title>
- <access-permissions>*:/platform/users</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <portlet-application>
- <portlet>
- <application-ref>dashboard</application-ref>
- <portlet-ref>DashboardPortlet</portlet-ref>
- </portlet>
- <title>Dashboard</title>
- <access-permissions>*:/platform/users</access-permissions>
- <show-info-bar>false</show-info-bar>
- </portlet-application>
- </page>
-
- <page>
- <name>development</name>
- <title>Development</title>
- <access-permissions>*:/platform/users</access-permissions>
- <edit-permission>*:/platform/administrators</edit-permission>
- <portlet-application>
- <portlet>
- <application-ref>dashboard</application-ref>
- <portlet-ref>DashboardPortlet</portlet-ref>
- </portlet>
- <title>Dashboard</title>
- <access-permissions>*:/platform/users</access-permissions>
- <show-info-bar>false</show-info-bar>
- </portlet-application>
- </page>
- -->
+<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-set>
14 years, 10 months
- 1
- 0
gatein SVN: r1838 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-02-24 06:02:44 -0500 (Wed, 24 Feb 2010)
New Revision: 1838
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIWorkspace.js
Log:
GTNPORTAL-715: implement enhancement permission for container and portlet
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIWorkspace.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIWorkspace.js 2010-02-24 10:58:16 UTC (rev 1837)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIWorkspace.js 2010-02-24 11:02:44 UTC (rev 1838)
@@ -30,7 +30,6 @@
};
eXo.portal.UIWorkingWorkspace.onResize = function() {
- throw new Error("Test");
var uiWorkspace = document.getElementById(eXo.portal.UIWorkingWorkspace.id) ;
if(eXo.core.Browser.isIE6()) {
var tabs = eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkspace, "div", "UIHorizontalTabs") ;
14 years, 10 months
- 1
- 0
gatein SVN: r1837 - in portal/trunk/web: eXoResources/src/main/webapp/javascript/eXo/portal and 4 other directories.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-02-24 05:58:16 -0500 (Wed, 24 Feb 2010)
New Revision: 1837
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIWorkspace.js
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UITree.gtmpl
Log:
GTNPORTAL-715: implement enhancement permission for container and portlet
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js 2010-02-24 10:58:16 UTC (rev 1837)
@@ -331,13 +331,11 @@
* and clean the array
*/
Browser.prototype.onLoad = function() {
- try {
- var callback = eXo.core.Browser.onLoadCallback ;
- for(var name in callback.properties) {
- var method = callback.get(name) ;
- if (typeof(method) == "function") method() ;
- }
- } catch(e) {}
+ var callback = eXo.core.Browser.onLoadCallback ;
+ for(var name in callback.properties) {
+ var method = callback.get(name) ;
+ if (typeof(method) == "function") try{method()}catch(e){};
+ }
this.onLoadCallback = new eXo.core.HashMap();
} ;
/**
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-02-24 10:58:16 UTC (rev 1837)
@@ -196,12 +196,12 @@
if(dndEvent.foundTargetObject != null || (dndEvent.backupMouseEvent && dndEvent.backupMouseEvent.keyCode != 27)) {
eXo.portal.PortalDragDrop.doDropCallback(dndEvent) ;
} else {
+ if(dndEvent.dragObject.parentNode.nodeName.toLowerCase() == "td") {
+ dndEvent.dragObject.parentNode.style.width = "auto";
+ }
if(!dndEvent.dragObject.isComponent) {
dndEvent.dragObject.parentNode.removeChild(dndEvent.dragObject) ;
}
- if(dndEvent.dragObject.parentNode.nodeName.toLowerCase() == "td") {
- dndEvent.dragObject.parentNode.style.width = "auto";
- }
// fix bug WEBOS-196
dndEvent.dragObject.style.width = "auto" ;
}
@@ -288,19 +288,22 @@
/* Find components in dropable target */
PortalDragDrop.prototype.findDropableTargets = function(dragBlock) {
+ var DOMUtil = eXo.core.DOMUtil;
var dropableTargets = new Array() ;
var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ;
- var uiPortal = eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPortal") ;
+
+ var uiPortal = DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPortal") ;
var pagebody = document.getElementById("UIPageBody");
- var uiContainers = eXo.core.DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIContainer") ;
+ var uiContainers = DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "UIContainer") ;
if(eXo.portal.portalMode && pagebody) {
dropableTargets.push(uiPortal) ;
} else {
- var uiPage = eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPage") ;
+ var uiPage = DOMUtil.findFirstDescendantByClass(uiWorkingWorkspace, "div", "UIPage") ;
if(uiPage) dropableTargets.push(uiPage) ;
}
for(var i = 0; i < uiContainers.length; i++) {
- if (eXo.core.DOMUtil.hasAncestor(uiContainers[i], dragBlock)) continue;
+ if (DOMUtil.hasAncestor(uiContainers[i], dragBlock)) continue;
+ if(DOMUtil.hasClass(uiContainers[i], "ProtectedContainer")) continue;
dropableTargets.push(uiContainers[i]) ;
}
return dropableTargets ;
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-02-24 10:58:16 UTC (rev 1837)
@@ -22,7 +22,7 @@
this.node = node ;
this.type = node.className ;
var DOMUtil = eXo.core.DOMUtil;
- componentBlock = DOMUtil.findFirstDescendantByClass(node, "div", "UIComponentBlock");
+ var componentBlock = DOMUtil.findFirstDescendantByClass(node, "div", "UIComponentBlock");
var children = DOMUtil.getChildrenByTagName(componentBlock, "div") ;
for(var i=0; i<children.length; i++) {
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIWorkspace.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIWorkspace.js 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIWorkspace.js 2010-02-24 10:58:16 UTC (rev 1837)
@@ -30,6 +30,7 @@
};
eXo.portal.UIWorkingWorkspace.onResize = function() {
+ throw new Error("Test");
var uiWorkspace = document.getElementById(eXo.portal.UIWorkingWorkspace.id) ;
if(eXo.core.Browser.isIE6()) {
var tabs = eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkspace, "div", "UIHorizontalTabs") ;
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ar.xml 2010-02-24 10:58:16 UTC (rev 1837)
@@ -1333,6 +1333,7 @@
<UIPortlet>
<label>
<portletContent>وصف المدخل</portletContent>
+ <protectedContent>Protected Content</protectedContent>
<View>عرض</View>
</label>
<lable>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -781,6 +781,7 @@
#############################################################################
UIPortlet.label.portlet=Portlet
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.title=Portlet
UIPortlet.label.description=GateIn portlet
UIPortlet.label.portletContent=Portlet-Beschreibung
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -775,6 +775,7 @@
#############################################################################
UIPortlet.label.portletContent=Portlet Description
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=View
UIPortlet.lable.information=Done
UIPortlet.deletePortlet=Are you sure you want to delete this portlet?
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -769,6 +769,7 @@
#############################################################################
UIPortlet.label.portletContent=Descripci\u00f3n del Portlet
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Ver
UIPortlet.lable.information=Hecho
UIPortlet.deletePortlet=\u00bfEst\u00e1s seguro de que deseas borrar este Portlet?
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -754,6 +754,7 @@
#############################################################################
UIPortlet.label.portletContent=Description de portlet
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Visualiser
UIPortlet.lable.information=Terminé
UIPortlet.deletePortlet=Confirmez-vous la suppression de cette portlet ?
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -770,6 +770,7 @@
#############################################################################
UIPortlet.label.portletContent=Descrizione della Portlet
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Visualizza
UIPortlet.lable.information=Fatto
UIPortlet.deletePortlet=Sicuro di voler eliminare questa portlet?
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -771,6 +771,7 @@
#############################################################################
UIPortlet.label.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.title=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
UIPortlet.label.description=GateIn \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
UIPortlet.label.portletContent=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u8aac\u660e
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ko.xml 2010-02-24 10:58:16 UTC (rev 1837)
@@ -1187,6 +1187,7 @@
<UIPortlet>
<label>
<portletContent>포틀릿 설명</portletContent>
+ <protectedContent>Protected Content</protectedContent>
<View>보기</View>
</label>
<lable>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -771,6 +771,7 @@
#############################################################################
UIPortlet.label.portlet=\u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.title=\u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f
UIPortlet.label.description=\u0917\u0947\u091f \u0907\u0928 \u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f
UIPortlet.label.portletContent=\u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f \u0935\u092f\u093e\u0928
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -771,6 +771,7 @@
#############################################################################
UIPortlet.label.portletContent=Portlet omschrijving
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Tonen
UIPortlet.lable.information=#{word.done}
UIPortlet.deletePortlet=Weet U zeker dat U deze portlet wilt verwijderen?
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ru.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -759,6 +759,7 @@
#############################################################################
UIPortlet.label.portletContent=Описание портлета
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Показать
UIPortlet.lable.information=Готово
UIPortlet.deletePortlet=Вы действительно хотите удалить этот портлет?
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_uk.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -750,6 +750,7 @@
#############################################################################
UIPortlet.label.portletContent=Опис портлету
+UIPortlet.label.protectedContent=Protected Content
UIPortlet.label.View=Перегляд
UIPortlet.lable.information=Виконано
UIPortlet.deletePortlet=Ви впевнені, що бажаєте видалити цей портлет?
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-02-24 10:58:16 UTC (rev 1837)
@@ -753,6 +753,7 @@
#############################################################################
UIPortlet.label.portletContent=Mô tả Portlet
+UIPortlet.label.protectedContent=Nội dung bị hạn chế
UIPortlet.label.View=Xem
UIPortlet.lable.information=Thực hiện
UIPortlet.deletePortlet=Bạn có chắc chắn muốn xóa Portlet này?
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh.xml 2010-02-24 10:58:16 UTC (rev 1837)
@@ -1136,6 +1136,7 @@
<UIPortlet>
<label>
<portletContent>Portlet描述</portletContent>
+ <protectedContent>Protected Content</protectedContent>
<View>查看</View>
</label>
<lable>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_zh_TW.xml 2010-02-24 10:58:16 UTC (rev 1837)
@@ -1287,6 +1287,7 @@
<UIPortlet>
<label>
<portletContent>Portlet描述</portletContent>
+ <protectedContent>Protected Content</protectedContent>
<View>查看</View>
</label>
<lable>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-02-24 10:58:16 UTC (rev 1837)
@@ -7,7 +7,8 @@
def rcontext = _ctx.getRequestContext();
UIPortalApplication uiPortalApp = rcontext.getUIApplication();
- if(!uiPortalApp.isEditing() && !uicomponent.hasPermission()) return;
+ boolean hasPermission = uicomponent.hasPermission();
+ if(!uiPortalApp.isEditing() && !hasPermission) return;
int portalMode = uiPortalApp.getModeState();
JavascriptManager jsmanager = rcontext.getJavascriptManager();
@@ -47,12 +48,15 @@
<div class="CenterBackground">
<div class="GardientBackground">
<%
- try {
- String portletName = uicomponent.getProducedOfferedPortlet().getInfo().getName();
- print _ctx.getRequestContext().getApplicationResourceBundle().getString("UIPortlet.description." + portletName);
- } catch(Exception e){
- print uicomponent.getDisplayName();
- }%>
+ if(hasPermission) {
+ try {
+ String portletName = uicomponent.getProducedOfferedPortlet().getInfo().getName();
+ print _ctx.getRequestContext().getApplicationResourceBundle().getString("UIPortlet.description." + portletName);
+ } catch(Exception e){
+ print uicomponent.getDisplayName();
+ }
+ } else print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>";
+ %>
</div>
</div>
</div>
@@ -230,7 +234,12 @@
<div class="MiddleDecoratorCenter">
<div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>" style="width: 100%">
<div class="PORTLET-FRAGMENT UIResizableBlock UIApplication" style="width: 100%; height: $windowHeight;">
- <% if(windowState != WindowState.MINIMIZED) out.println(portletContent) %>
+ <%
+ if(windowState != WindowState.MINIMIZED) {
+ if(hasPermission) println portletContent;
+ else println _ctx.appRes("UIPortlet.label.protectedContent");
+ }
+ %>
</div>
</div>
</div>
@@ -264,7 +273,10 @@
%>
<div id="<%=portalMode == UIPortalApplication.NORMAL_MODE ? portletId : "EditMode-"+ portletId%>">
<div class="PORTLET-FRAGMENT" ${cssStyle}>
- <% out.println(portletContent); %>
+ <%
+ if(hasPermission) println portletContent;
+ else println _ctx.appRes("UIPortlet.label.protectedContent");
+ %>
</div>
</div>
<%
@@ -298,9 +310,11 @@
String title = uicomponent.getDisplayTitle();
if(title.length() > 30) title = title.substring(0,27) + "...";
%>
- <div class="PortletIcon $portletIcon">$title</div>
- <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeletePortletIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a>
- <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditPortletPropertiesIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a>
+ <div class="PortletIcon $portletIcon"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
+ <%if(hasPermission) {%>
+ <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeletePortletIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a>
+ <a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditPortletPropertiesIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a>
+ <%}%>
</div>
</div>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2010-02-24 10:58:16 UTC (rev 1837)
@@ -7,7 +7,8 @@
ResourceBundle res = rcontext.getApplicationResourceBundle();
UIPortalApplication uiPortalApp = rcontext.getUIApplication();
- if(!uiPortalApp.isEditing() && !uicomponent.hasPermission()) return;
+ boolean hasPermission = uicomponent.hasPermission();
+ if(!uiPortalApp.isEditing() && !hasPermission) return;
String cssStyle = "";
String uiComponentWidth = uicomponent.getWidth();
@@ -24,7 +25,10 @@
}
%>
-<div class="UIContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" ${cssStyle} onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
+<div class="UIContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%> <%=hasPermission?"": "ProtectedContainer"%>"
+ id="UIContainer-${uicomponent.id}" ${cssStyle}
+ onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);"
+ onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
<div class="NormalContainerBlock">
<div class="LeftContainerBlock">
<div class="RightContainerBlock UIComponentBlock">
@@ -38,7 +42,11 @@
<div class="VIEW-CONTAINER VIEW-BLOCK">
<%} %>
<div id="$uicomponent.id">
- <div class="UIRowContainer"><%uicomponent.renderChildren()%></div>
+ <%if(hasPermission) {%>
+ <div class="UIRowContainer">
+ <%uicomponent.renderChildren();%>
+ </div>
+ <%} else out.print("<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>");%>
</div>
</div>
@@ -57,17 +65,16 @@
<div class="MiddleBar">
<div class="FixHeight">
<div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.title.DragControlArea")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div>
- <div class="ContainerIcon">
- <%
- if(uicomponent.getTitle() != null) {
- println(ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()));
- } else {
- %>
- <%=_ctx.appRes("UIContainer.title.Container")%>
- <%}%>
- </div>
- <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <%
+ String strTitle = uicomponent.getTitle() != null ?
+ ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) :
+ _ctx.appRes("UIContainer.title.Container");
+ %>
+ <div class="ContainerIcon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
+ <%if(hasPermission) {%>
+ <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <%}%>
<div class="ClearBoth"><span></span></div>
</div>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2010-02-24 10:58:16 UTC (rev 1837)
@@ -6,7 +6,8 @@
ResourceBundle res = rcontext.getApplicationResourceBundle();
UIPortalApplication uiPortalApp = rcontext.getUIApplication();
- if(!uiPortalApp.isEditing() && !uicomponent.hasPermission()) return;
+ boolean hasPermission = uicomponent.hasPermission();
+ if(!uiPortalApp.isEditing() && !hasPermission) return;
/** Trim the prefix UIContainer- if any, this hardcoded part is needed to update nested container via Ajax */
String componentId = uicomponent.getId();
@@ -15,7 +16,10 @@
}
%>
-<div class="UIContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
+<div class="UIContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%> <%=hasPermission?"":"ProtectedContainer"%>"
+ id="UIContainer-${uicomponent.id}"
+ onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);"
+ onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
<div class="NormalContainerBlock">
<div class="LeftContainerBlock">
<div class="RightContainerBlock UIComponentBlock">
@@ -33,7 +37,8 @@
<%} else {%>
<div class="VIEW-CONTAINER VIEW-BLOCK">
<%} %>
- <div id="$uicomponent.id">
+ <div id="$uicomponent.id">
+ <%if(hasPermission) {%>
<table class="UITableColumnContainer" style="table-layout: fixed; margin: 0px auto; $style">
<tr class="TRContainer">
<% for(uiChild in uicomponent.getChildren()) {%>
@@ -41,6 +46,7 @@
<% } %>
</tr>
</table>
+ <%} else {print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>";}%>
</div>
</div>
<%/*Debug On IE -----For DND */%>
@@ -60,18 +66,16 @@
<div class="MiddleBar">
<div class="FixHeight">
<div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div>
- <div class="ContainerIcon DefaultContainer16x16Icon">
- <%
- if(uicomponent.getTitle() != null) {
- println(ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()));
- } else {
- %>
- <%=_ctx.appRes("UIContainer.title.Container")%>
- <%}%>
- </div>
-
- <a href="<%=uicomponent.event('DeleteComponent', uicomponent.id); %>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
+ <%
+ String strTitle = uicomponent.getTitle() != null ?
+ ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) :
+ _ctx.appRes("UIContainer.title.Container");
+ %>
+ <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
+ <%if(hasPermission) {%>
+ <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <%}%>
<div class="ClearBoth"><span></span></div>
</div>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2010-02-24 10:58:16 UTC (rev 1837)
@@ -5,13 +5,17 @@
def rcontext = _ctx.getRequestContext();
UIPortalApplication uiPortalApp = rcontext.getUIApplication();
- if(!uiPortalApp.isEditing() && !uicomponent.hasPermission()) return;
+ boolean hasPermission = uicomponent.hasPermission();
+ if(!uiPortalApp.isEditing() && !hasPermission) return;
JavascriptManager jsmanager = rcontext.getJavascriptManager();
jsmanager.importJavascript('eXo.portal.PortalDragDrop');
%>
-<div class="UIContainer UIToolbarContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
+<div class="UIContainer UIToolbarContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%> <%=hasPermission?"": "ProtectedContainer"%>"
+ id="UIContainer-${uicomponent.id}"
+ onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);"
+ onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
<div class="NormalContainerBlock">
<div class="LeftContainerBlock">
<div class="RightContainerBlock UIComponentBlock">
@@ -29,7 +33,8 @@
<%} else {%>
<div class="VIEW-CONTAINER ToolbarContainer VIEW-BLOCK">
<%} %>
- <div id="$uicomponent.id">
+ <div id="$uicomponent.id">
+ <%if(hasPermission) {%>
<div class="UITableColumnContainer" style="margin: 0px auto; $style">
<div class="TRContainer" style="zoom: 100%;">
<% for(uiChild in uicomponent.getChildren()) {%>
@@ -38,6 +43,7 @@
<div class="ClearLeft" style="width: 0px; height: 0px;"><span></span></div>
</div>
</div>
+ <%}%>
</div>
</div>
<%/*Debug On IE -----For DND */%>
@@ -57,18 +63,16 @@
<div class="MiddleBar">
<div class="FixHeight">
<div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div>
- <div class="ContainerIcon DefaultContainer16x16Icon">
- <%
- if(uicomponent.getTitle() != null) {
- println(uicomponent.getTitle());
- } else {
- %>
- <%=_ctx.appRes("UIContainer.title.Container")%>
- <%}%>
- </div>
-
- <a href="<%=uicomponent.event('DeleteComponent', uicomponent.id);%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
- <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
+ <%
+ String strTitle = uicomponent.getTitle() != null ?
+ ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) :
+ _ctx.appRes("UIContainer.title.Container");
+ %>
+ <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
+ <%if(hasPermission) {%>
+ <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <%}%>
<div class="ClearBoth"><span></span></div>
</div>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UITree.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UITree.gtmpl 2010-02-24 10:30:50 UTC (rev 1836)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UITree.gtmpl 2010-02-24 10:58:16 UTC (rev 1837)
@@ -12,7 +12,6 @@
rcontext.getJavascriptManager().importJavascript('eXo.webui.UIRightClickPopupMenu');
rcontext.getJavascriptManager().addJavascript("eXo.webui.UIRightClickPopupMenu.disableContextMenu('"+id+"');");
- rcontext.getJavascriptManager().addOnLoadJavascript('eXo.portal.UIPortalControl.fixHeight');
uicomponent.renderUIComponent(uiPopupMenu);
}
%>
14 years, 10 months
- 1
- 0
gatein SVN: r1836 - portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-02-24 05:30:50 -0500 (Wed, 24 Feb 2010)
New Revision: 1836
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
Log:
GTNPORTAL-554: IE: Error UI in Dashboard workspace in Dashboard page
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-02-24 10:25:27 UTC (rev 1835)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-02-24 10:30:50 UTC (rev 1836)
@@ -145,9 +145,6 @@
/*----------------------UIGadgetsSelectorForm-------------------*/
.UIDashboardSelectContainer {
- float: left; /* orientation=lt */
- float: right; /* orientation=rt */
- width: 209px;
height: 100%;
}
@@ -184,10 +181,10 @@
}
.UIDashboardSelectContainer .DashboardItemContainer .InputContainer input {
- margin: 0 3px 0 10px;
+ margin: 0 3px 0 0px;
border: 1px solid #b8babf;
font-size: 11px;
- width: 160px;
+ width: 165px;
}
.UIDashboardSelectContainer .DashboardItemContainer .GadgetItemsContainer {
@@ -430,6 +427,10 @@
margin: 3px 3px 0px 0px; /* orientation=rt */
}
+.UIDashboard .UIPopupWindow {
+ width: 240px;
+}
+
#UIAddGadgetPopup {
width: 225px;
}
14 years, 10 months
- 1
- 0
gatein SVN: r1835 - in portal/trunk/component/portal/src: test/java/org/exoplatform/portal/config and 1 other directory.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-24 05:25:27 -0500 (Wed, 24 Feb 2010)
New Revision: 1835
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java
Log:
GTNPORTAL-717 Navigation Groups should be ordered alphabetically
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java 2010-02-24 10:08:10 UTC (rev 1834)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/DataStorageImpl.java 2010-02-24 10:25:27 UTC (rev 1835)
@@ -42,7 +42,10 @@
import org.exoplatform.services.listener.ListenerService;
import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.List;
/**
@@ -175,12 +178,22 @@
final Query<O> q;
final Class<D> dataType;
+
+ final Comparator<O> cp;
Bilto(Query<O> q, Class<D> dataType)
{
this.q = q;
this.dataType = dataType;
+ this.cp = null;
}
+
+ Bilto(Query<O> q, Class<D> dataType, Comparator<O> cp)
+ {
+ this.q = q;
+ this.dataType = dataType;
+ this.cp = cp;
+ }
protected abstract O create(D d);
@@ -188,7 +201,9 @@
{
Query<D> delegateQ = new Query<D>(q, dataType);
LazyPageList<D> r = delegate.find(delegateQ, null);
- final List<D> list = r.getAll();
+ List<D> tmp = r.getAll();
+ tmp = sort(tmp, this.cp);
+ final List<D> list = tmp;
return new ListAccess<O>()
{
public int getSize() throws Exception
@@ -206,8 +221,30 @@
return pages;
}
};
+ }
+
+
+ private List<D> sort(List<D> list, final Comparator<O> comparator) {
+ List<D> tmpList = new ArrayList<D>();
+ for (int i=0; i<list.size();i++) {
+ tmpList.add(list.get(i));
+ }
+ Collections.sort(tmpList, new Comparator<D>() {
+
+ @Override
+ public int compare(D d1, D d2)
+ {
+ if (comparator == null) {
+ return d1.getStorageId().compareTo(d2.getStorageId());
+ }
+ O o1 = create(d1);
+ O o2 = create(d2);
+ return comparator.compare(o1, o2);
+ }
+
+ });
+ return tmpList;
}
-
}
public <T> ListAccess<T> find2(Query<T> q) throws Exception
@@ -225,7 +262,7 @@
Class<T> type = q.getClassType();
if (type == Page.class)
{
- Bilto<Page, PageData> bilto = new Bilto<Page, PageData>((Query<Page>)q, PageData.class)
+ Bilto<Page, PageData> bilto = new Bilto<Page, PageData>((Query<Page>)q, PageData.class, (Comparator<Page>)sortComparator)
{
@Override
protected Page create(PageData pageData)
@@ -237,7 +274,7 @@
}
else if (type == PageNavigation.class)
{
- Bilto<PageNavigation, NavigationData> bilto = new Bilto<PageNavigation, NavigationData>((Query<PageNavigation>)q, NavigationData.class)
+ Bilto<PageNavigation, NavigationData> bilto = new Bilto<PageNavigation, NavigationData>((Query<PageNavigation>)q, NavigationData.class, (Comparator<PageNavigation>)sortComparator)
{
@Override
protected PageNavigation create(NavigationData page)
@@ -249,7 +286,7 @@
}
else if (type == PortalConfig.class)
{
- Bilto<PortalConfig, PortalData> bilto = new Bilto<PortalConfig, PortalData>((Query<PortalConfig>)q, PortalData.class)
+ Bilto<PortalConfig, PortalData> bilto = new Bilto<PortalConfig, PortalData>((Query<PortalConfig>)q, PortalData.class, (Comparator<PortalConfig>)sortComparator)
{
@Override
protected PortalConfig create(PortalData portalData)
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-02-24 10:08:10 UTC (rev 1834)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-02-24 10:25:27 UTC (rev 1835)
@@ -20,8 +20,7 @@
package org.exoplatform.portal.config;
import org.exoplatform.container.PortalContainer;
-import org.exoplatform.container.component.ComponentRequestLifecycle;
-import org.exoplatform.container.component.RequestLifeCycle;
+import org.exoplatform.portal.config.model.PageNavigation;
import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMSessionManager;
@@ -31,6 +30,9 @@
import org.exoplatform.services.organization.User;
import org.exoplatform.services.organization.UserHandler;
+import java.util.Comparator;
+import java.util.List;
+
/**
* Author : TrongTT
*/
@@ -136,4 +138,27 @@
PortalConfig pConfig = storage.getPortalConfig(PortalConfig.USER_TYPE, "testing");
assertNotNull("the User's PortalConfig is not null", pConfig);
}
+
+ public void testGetAllOrder() throws Exception
+ {
+ // Query with comparator to make sure returned list is ordered
+ Query<PageNavigation> query = new Query<PageNavigation>(PortalConfig.GROUP_TYPE, null, PageNavigation.class);
+ Comparator<PageNavigation> sortComparator = new Comparator<PageNavigation>()
+ {
+ public int compare(PageNavigation pconfig1, PageNavigation pconfig2)
+ {
+ return pconfig1.getOwnerId().compareTo(pconfig2.getOwnerId());
+ }
+ };
+
+ // First query
+ List<PageNavigation> navis = storage.find(query, sortComparator).getAll();
+ storage.save(navis.get(0)); // Modify
+ // Second query
+ List<PageNavigation> navis2 = storage.find(query, sortComparator).getAll();
+ for (int i = 0; i < navis.size(); i++)
+ {
+ assertEquals(true, navis.get(i).getOwnerId().equals(navis2.get(i).getOwnerId()));
+ }
+ }
}
14 years, 10 months
- 1
- 0