Author: julien_viet Date: 2010-02-23 09:50:43 -0500 (Tue, 23 Feb 2010) New Revision: 1820 Added: portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd Removed: portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein_resources_1_0.xsd Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml Log: GTNPORTAL-722 : fix incorrect gatein-resources.xsd GTNPORTAL-501 : gatein_resources_1_0.xsd has incorrect target namespace Copied: portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd (from rev 1808, portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein_resources_1_0.xsd) =================================================================== --- portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd (rev 0) +++ portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd 2010-02-23 14:50:43 UTC (rev 1820) @@ -0,0 +1,117 @@ +<?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_resources_1_0.x... + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0.xsd" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <!-- The root element type that contains the various resource declarations --> + <xs:element name="gatein-resources"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="portal-skin" type="portal-skin" /> + <xs:element name="portlet-skin" type="portlet-skin" /> + <xs:element name="window-style" type="window-style" /> + <xs:element name="javascript" type="javascript" /> + <xs:element name="resource-bundle" type="resource-bundle" /> + </xs:choice> + </xs:complexType> + </xs:element> + + <!-- Declares a portal skin resource --> + <xs:complexType name="portal-skin"> + <xs:sequence> + <xs:element name="skin-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="css-path" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="overwrite" type="xs:string" minOccurs="0" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + + <!-- Declares a portlet skin resource --> + <xs:complexType name="portlet-skin"> + <xs:sequence> + <!-- The portlet application name --> + <xs:element name="application-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + + <!-- The portlet name --> + <xs:element name="portlet-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + + <!-- The name of the skin to load --> + <xs:element name="skin-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + + <!-- The css path of the skin relative to the application context --> + <xs:element name="css-path" type="xs:string" minOccurs="1" maxOccurs="1"/> + + <!-- Overwrite --> + <xs:element name="overwrite" type="xs:string" minOccurs="0" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + + <!-- Declares a window style --> + <xs:complexType name="window-style" mixed="true"> + <xs:sequence> + + <!-- The window style name --> + <xs:element name="style-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + + <!-- The window style theme --> + <xs:element name="style-theme" type="style-theme" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + + <!-- The window style theme --> + <xs:complexType name="style-theme"> + <xs:sequence> + <!-- The theme name --> + <xs:element name="theme-name" type="xs:string" minOccurs="1" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + + <!-- Declares a javascript resource --> + <xs:complexType name="javascript"> + <xs:sequence> + <xs:element name="param" type="param" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="param"> + <xs:sequence> + <!-- The javascript module --> + <xs:element name="js-module" type="xs:string" minOccurs="1" maxOccurs="1"/> + + <!-- The javascript path --> + <xs:element name="js-path" type="xs:string" minOccurs="1" maxOccurs="1"/> + + <!-- The javascript priority --> + <xs:element name="js-priority" type="xs:string" minOccurs="0" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + + <!-- Declares a resource bundle --> + <xs:complexType name="resource-bundle"> + </xs:complexType> + +</xs:schema> \ No newline at end of file Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-23 14:50:07 UTC (rev 1819) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-23 14:50:43 UTC (rev 1820) @@ -28,9 +28,9 @@ <application-name>web</application-name> <portlet-name>HomePagePortlet</portlet-name> <skin-name>Default</skin-name> - <overwrite>false</overwrite> <css-path>/templates/skin/webui/component/UIHomePagePortlet/DefaultStylesheet.css</css-path> - </portlet-skin> + <overwrite>false</overwrite> + </portlet-skin> </gatein-resources> Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein_resources_1_0.xsd =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein_resources_1_0.xsd 2010-02-23 14:50:07 UTC (rev 1819) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/gatein_resources_1_0.xsd 2010-02-23 14:50:43 UTC (rev 1820) @@ -1,86 +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 xmlns:xs="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.w3schools.com" - xmlns="http://www.w3schools.com" - elementFormDefault="qualified"> - - <xs:element name="gatein-resources"> - <xs:complexType> - <xs:sequence> - <xs:element name="portal-skin" type="portal-skin" /> - <xs:element name="portlet-skin" type="portlet-skin" /> - <xs:element name="window-style" type="window-style" /> - <xs:element name="javascript" type="javascript" /> - <xs:element name="resource-bundle" type="resource-bundle" /> - </xs:sequence> - </xs:complexType> - </xs:element> - - <xs:complexType name="portal-skin"> - <xs:sequence> - <xs:element name="skin-name" type="xs:string" /> - <xs:element name="css-path" type="xs:string" /> - <xs:element name="overwrite" type="xs:string" /> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="portlet-skin"> - <xs:sequence> - <xs:element name="application-name" type="xs:string" /> - <xs:element name="portlet-name" type="xs:string" /> - <xs:element name="skin-name" type="xs:string" /> - <xs:element name="css-path" type="xs:string" /> - <xs:element name="overwrite" type="xs:string" /> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="window-style" mixed="true"> - <xs:sequence> - <xs:element name="style-name" type="xs:string" /> - <xs:element name="style-theme" type="style-theme" /> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="style-theme"> - <xs:sequence> - <xs:element name="theme-name" type="xs:string" /> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="javascript"> - <xs:sequence> - <xs:element name="param" type="xs:param" /> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="param"> - <xs:sequence> - <xs:element name="js-module" type="xs:string" /> - <xs:element name="js-path" type="xs:string" /> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="resource-bundle"> - </xs:complexType> -</xs:schema> \ No newline at end of file