Author: JirkaH Date: 2010-02-28 21:45:26 +0100 (Sun, 28 Feb 2010) New Revision: 1946 Added: others/xsd/version2/statsData.xsd Removed: others/xsd/version2/stats-data.xsd Modified: others/xsd/version2/examples/appConfig.xml others/xsd/version2/examples/categoryConfig.xml others/xsd/version2/examples/documentConfig.xml Log: xsd renamed Modified: others/xsd/version2/examples/appConfig.xml =================================================================== --- others/xsd/version2/examples/appConfig.xml 2010-02-28 19:56:36 UTC (rev 1945) +++ others/xsd/version2/examples/appConfig.xml 2010-02-28 20:45:26 UTC (rev 1946) @@ -1 +1,31 @@ -< \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<a:app_config elvysVersion="1.0-b1" xmlns:a="cz/elvys/jaxbgen/app"> + <a:machine_id>13</a:machine_id> + <a:data_url> + <a:http_address>http://elvys.farm.particle.cz/dataIntegrationNew/4</a:http_address> + </a:data_url> + <a:statistics> + <a:http_address>http://elvys.farm.particle.cz:8081/dispatcher/statistic</a:http_address> + <a:period>30000</a:period> + </a:statistics> + <a:screenshot> + <a:http_address>http://elvys.farm.particle.cz:8081/dispatcher/img</a:http_address> + <a:period>30000</a:period> + </a:screenshot> + <a:category_config> + <a:http_address>http://elvys.farm.particle.cz:8081/dispatcher/categoryConfig</a:http_address> + <a:period>30000</a:period> + </a:category_config> + <a:document_config> + <a:http_address>http://elvys.farm.particle.cz:8081/dispatcher/documentConfig</a:http_address> + <a:period>30000</a:period> + </a:document_config> + <a:filecache_config> + <a:http_address>http://elvys.farm.particle.cz:8081/dispatcher/filecacheConfig</a:http_address> + <a:period>30000</a:period> + </a:filecache_config> + <a:night_mode enabled="false"/> + <a:app_config_source> + <a:http_address>http://elvys.farm.particle.cz:8081/dispatcher/appConfig</a:http_address> + </a:app_config_source> +</a:app_config> Modified: others/xsd/version2/examples/categoryConfig.xml =================================================================== --- others/xsd/version2/examples/categoryConfig.xml 2010-02-28 19:56:36 UTC (rev 1945) +++ others/xsd/version2/examples/categoryConfig.xml 2010-02-28 20:45:26 UTC (rev 1946) @@ -3,7 +3,7 @@ <category-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="../categoryConfig.xsd" elvysVersion="0.6"> - <category id="5" order="1" name="Prvni kategorie"> + <category id="1" order="1" name="Prvni kategorie"> <layout name="layout-prezentace" revision="1" id="1"> <aspect-ratio aspect-ratio="1.77778" /> <doc id="3"> @@ -57,7 +57,7 @@ </layout> </category> - <category id="12" order="2" name="Druha kategorie"> + <category id="2" order="2" name="Druha kategorie"> <layout name="layout-prezentace" revision="1" id="1"> <aspect-ratio aspect-ratio="1.77778" /> <doc id="3"> @@ -95,7 +95,7 @@ </layout> </category> - <category id="8" order="3" name="Treti kategorie"> + <category id="3" order="3" name="Treti kategorie"> <layout name="layout-prezentace" revision="1" id="1"> <aspect-ratio aspect-ratio="1.77778" /> <doc id="3"> @@ -132,4 +132,4 @@ </doc> </layout> </category> -</category-config> \ No newline at end of file +</category-config> Modified: others/xsd/version2/examples/documentConfig.xml =================================================================== --- others/xsd/version2/examples/documentConfig.xml 2010-02-28 19:56:36 UTC (rev 1945) +++ others/xsd/version2/examples/documentConfig.xml 2010-02-28 20:45:26 UTC (rev 1946) @@ -6,7 +6,7 @@ elvysId="1" elvysVersion="0.6"> - <panels layoutId="5" categoryId="1"> + <panels layoutId="1" categoryId="1"> <panel id="1"> <documents> <dynamic_text to_id="1"/> @@ -37,7 +37,7 @@ </panel> </panels> - <panels layoutId="10" categoryId="3"> + <panels layoutId="1" categoryId="3"> <panel id="1"> <documents> <dynamic_text to_id="1"/> @@ -78,7 +78,7 @@ </panel> </panels> - <panels layoutId="11" categoryId="2"> + <panels layoutId="222" categoryId="2"> <panel id="1"> <documents> <none to_id="1"/> @@ -93,4 +93,4 @@ </panels> -</document-config> \ No newline at end of file +</document-config> Deleted: others/xsd/version2/stats-data.xsd =================================================================== --- others/xsd/version2/stats-data.xsd 2010-02-28 19:56:36 UTC (rev 1945) +++ others/xsd/version2/stats-data.xsd 2010-02-28 20:45:26 UTC (rev 1946) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";> - <xs:element name="elvys_stats"> - <xs:complexType> - <xs:sequence> - <xs:element ref="elvys_event" /> - </xs:sequence> - </xs:complexType> - </xs:element> - - - <xs:element name="elvys_event"> - <xs:complexType> - <xs:sequence> - <xs:element name="elvys" type="xs:integer"></xs:element> - <xs:element name="layout" type="xs:integer"></xs:element> - <xs:element name="document" type="xs:integer"> - </xs:element> - <xs:element name="position" type="xs:unsignedShort"></xs:element> - <xs:element name="action_start" type="xs:integer"></xs:element> - <xs:element name="action_end" type="xs:integer"></xs:element> - <xs:element name="action_type"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="download" /> - <xs:enumeration value="exhibit" /> - <xs:enumeration value="detail" /> - <xs:enumeration value="other" /> - </xs:restriction> - </xs:simpleType> - </xs:element> - <xs:element name="mode_type"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="day" /> - <xs:enumeration value="night" /> - </xs:restriction> - </xs:simpleType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> -</xs:schema> \ No newline at end of file Copied: others/xsd/version2/statsData.xsd (from rev 1945, others/xsd/version2/stats-data.xsd) =================================================================== --- others/xsd/version2/statsData.xsd (rev 0) +++ others/xsd/version2/statsData.xsd 2010-02-28 20:45:26 UTC (rev 1946) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";> + <xs:element name="elvys_stats"> + <xs:complexType> + <xs:sequence> + <xs:element ref="elvys_event" /> + </xs:sequence> + </xs:complexType> + </xs:element> + + + <xs:element name="elvys_event"> + <xs:complexType> + <xs:sequence> + <xs:element name="elvys" type="xs:integer"></xs:element> + <xs:element name="layout" type="xs:integer"></xs:element> + <xs:element name="document" type="xs:integer"> + </xs:element> + <xs:element name="position" type="xs:unsignedShort"></xs:element> + <xs:element name="action_start" type="xs:integer"></xs:element> + <xs:element name="action_end" type="xs:integer"></xs:element> + <xs:element name="action_type"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="download" /> + <xs:enumeration value="exhibit" /> + <xs:enumeration value="detail" /> + <xs:enumeration value="other" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="mode_type"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="day" /> + <xs:enumeration value="night" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> +</xs:schema> \ No newline at end of file