[gatein-commits] gatein SVN: r6750 - in portal/trunk: component/portal/src/test/java/org/exoplatform/portal and 1 other directories.

Author: julien_viet Date: 2011-06-26 16:39:45 -0400 (Sun, 26 Jun 2011) New Revision: 6750 Removed: portal/trunk/component/portal/src/main/java/gatein_objects_1_2_1.xsd Modified: portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml Log: GTNPORTAL-1946 : no need for 1.2.1 XSD, 1.2 is still in development and not final Modified: portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd =================================================================== --- portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-06-25 12:30:48 UTC (rev 6749) +++ portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-06-26 20:39:45 UTC (rev 6750) @@ -18,6 +18,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> +<!-- + DISCLAIMER : + - THIS FILE IS NOT YET FINAL AND IS SUBJECT TO CHANGES + - IT WILL BE CONSIDERED AS AN API (I.E FINAL) WHEN GATEIN 3.2 WILL BE RELEASED + --> + <xs:schema targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_2" xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2" @@ -160,8 +166,10 @@ <xs:complexType name="portletApplicationType"> <xs:sequence> - <xs:element name="portlet" type="portletType" minOccurs="1" maxOccurs="1"/> - <xs:element name="theme" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:choice> + <xs:element name="portlet" type="portletType"/> + <xs:element name="wsrp" type="xs:string"/> + </xs:choice> <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"/> Deleted: portal/trunk/component/portal/src/main/java/gatein_objects_1_2_1.xsd =================================================================== --- portal/trunk/component/portal/src/main/java/gatein_objects_1_2_1.xsd 2011-06-25 12:30:48 UTC (rev 6749) +++ portal/trunk/component/portal/src/main/java/gatein_objects_1_2_1.xsd 2011-06-26 20:39:45 UTC (rev 6750) @@ -1,222 +0,0 @@ -<?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_2_1&q... - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2_1" - 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="visibility" type="visibility" default="DISPLAYED" 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:simpleType name="visibility"> - <xs:restriction base='xs:string'> - <xs:enumeration value="DISPLAYED"/> - <xs:enumeration value="HIDDEN"/> - <xs:enumeration value="TEMPORAL"/> - <xs:enumeration value="SYSTEM"/> - </xs:restriction> - </xs:simpleType> - - <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="label" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="description" type="xs:string" minOccurs="0" 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="portlet-application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/> - <xs:element name="gadget-application" type="gadgetApplicationType" 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: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:attribute name="width" type="xs:string"/> - <xs:attribute name="height" type="xs:string"/> - </xs:complexType> - - <xs:complexType name="portletApplicationType"> - <xs:sequence> - <xs:choice> - <xs:element name="portlet" type="portletType"/> - <xs:element name="wsrp" type="xs:string"/> - </xs:choice> - <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:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="icon" 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:sequence> - </xs:complexType> - - <xs:complexType name="gadgetApplicationType"> - <xs:sequence> - <xs:element name="gadget" type="gadgetType" minOccurs="1" maxOccurs="1"/> - <xs:element name="theme" type="xs:string" minOccurs="0" 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:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/> - <xs:element name="icon" 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: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="gadgetType"> - <xs:sequence> - <xs:element name="gadget-ref" type="xs:string" minOccurs="1" 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="unbounded"/> - <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/test/java/org/exoplatform/portal/TestXSDCorruption.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-06-25 12:30:48 UTC (rev 6749) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-06-26 20:39:45 UTC (rev 6750) @@ -59,6 +59,6 @@ { assertHash("d0591b0a022a0c2929e1aed8979857cd", "gatein_objects_1_0.xsd"); assertHash("99ae24c9bbfe1b59e066756a29ab6c79", "gatein_objects_1_1.xsd"); - assertHash("616e7a91a5a841009f672af484f4861e", "gatein_objects_1_2.xsd"); + assertHash("9a031c15ce0e2b4dd1e283458f590581", "gatein_objects_1_2.xsd"); } } Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-06-25 12:30:48 UTC (rev 6749) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/portal/group/platform/administrators/pages.xml 2011-06-26 20:39:45 UTC (rev 6750) @@ -24,8 +24,8 @@ <page-set xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2_1 http://www.gatein.org/xml/ns/gatein_objects_1_2_1" - xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2_1"> + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_2 http://www.gatein.org/xml/ns/gatein_objects_1_2" + xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_2"> <page> <name>wsrpConfiguration</name>