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>