Author: theute Date: 2011-09-06 05:51:17 -0400 (Tue, 06 Sep 2011) New Revision: 7309 Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/gatein_objects_1_2.xsd epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java Log: JBEPP-1147 factor out the common XML elements as applicationGroup in gatein object 1.2 XSD Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/gatein_objects_1_2.xsd =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-09-06 08:34:43 UTC (rev 7308) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-09-06 09:51:17 UTC (rev 7309) @@ -176,25 +176,23 @@ <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:choice> + <xs:element name="portlet" type="portletType"/> + <xs:element name="wsrp" type="xs:string"/> + </xs:choice> + <xs:group ref="applicationGroup"/> </xs:sequence> </xs:complexType> <xs:complexType name="gadgetApplicationType"> <xs:sequence> <xs:element name="gadget" type="gadgetType" minOccurs="1" maxOccurs="1"/> + <xs:group ref="applicationGroup"/> + </xs:sequence> + </xs:complexType> + + <xs:group name="applicationGroup"> + <xs:sequence> <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"/> @@ -206,7 +204,7 @@ <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:group> <xs:complexType name="portletType"> <xs:sequence> @@ -235,4 +233,4 @@ <xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> -</xs:schema> \ No newline at end of file +</xs:schema> Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-09-06 08:34:43 UTC (rev 7308) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-09-06 09:51:17 UTC (rev 7309) @@ -60,6 +60,6 @@ { assertHash("d0591b0a022a0c2929e1aed8979857cd", "gatein_objects_1_0.xsd"); assertHash("99ae24c9bbfe1b59e066756a29ab6c79", "gatein_objects_1_1.xsd"); - assertHash("4aab6cc6bf86236de80deaed72170c5f", "gatein_objects_1_2.xsd"); + assertHash("b0e79a35641cccf49c8796a99a5a91a3", "gatein_objects_1_2.xsd"); } }