Author: DavidK Date: 2010-02-05 17:16:12 +0100 (Fri, 05 Feb 2010) New Revision: 1678 Modified: others/xsd/version2/filecacheConfig.xsd trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/AppConfigWorkerImpl.java trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/FilecacheConfigWorkerImpl.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/File.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/FileCacheConfig.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/ObjectFactory.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/package-info.java trunk/server/dispatcher/JavaSource/cz/elvys/xsd/filecacheConfig.xsd Log: filecacheConfig upgraded - newly, files contain id.. Modified: others/xsd/version2/filecacheConfig.xsd =================================================================== --- others/xsd/version2/filecacheConfig.xsd 2010-02-05 10:25:02 UTC (rev 1677) +++ others/xsd/version2/filecacheConfig.xsd 2010-02-05 16:16:12 UTC (rev 1678) @@ -17,6 +17,7 @@ <xs:complexType name="file"> <xs:choice></xs:choice> + <xs:attribute name="id" type="xs:int" use="required" /> <xs:attribute name="name" type="xs:string" use="required"/> <xs:attribute name="size" type="xs:int" use="required"/> <xs:attribute name="hash" type="xs:string" use="required"/> Modified: trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/AppConfigWorkerImpl.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/AppConfigWorkerImpl.java 2010-02-05 10:25:02 UTC (rev 1677) +++ trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/AppConfigWorkerImpl.java 2010-02-05 16:16:12 UTC (rev 1678) @@ -200,12 +200,12 @@ nightMode.setEnabled(isEnabled); if (isEnabled && elvys.getElvysSetting().getNightStart() != null && elvys.getElvysSetting().getNightStart() != null) { - // night layout start + // night mode start Start start = of.createStart(); start.setContent(elvys.getElvysSetting().getNightStart()); nightMode.setStart(start); - // night layout end + // night mode end End end = of.createEnd(); end.setContent(elvys.getElvysSetting().getNightEnd()); nightMode.setEnd(end); Modified: trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/FilecacheConfigWorkerImpl.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/FilecacheConfigWorkerImpl.java 2010-02-05 10:25:02 UTC (rev 1677) +++ trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/FilecacheConfigWorkerImpl.java 2010-02-05 16:16:12 UTC (rev 1678) @@ -116,6 +116,7 @@ // list of files for(File file: files) { cz.elvys.jaxbgen.filecache.File jaxbFile = of.createFile(); + jaxbFile.setId(file.getId()); jaxbFile.setHash(file.getHashcode()); jaxbFile.setName(file.getUniqName()); jaxbFile.setSize(file.getSize()); Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/File.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/File.java 2010-02-05 10:25:02 UTC (rev 1677) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/File.java 2010-02-05 16:16:12 UTC (rev 1678) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1-b02-fcs // See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.01.29 at 01:26:47 odp. CET +// Generated on: 2010.02.05 at 05:09:42 odp. CET // @@ -25,6 +25,7 @@ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> * <choice> * </choice> + * <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}int"; /> * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string"; /> * <attribute name="size" use="required" type="{http://www.w3.org/2001/XMLSchema}int"; /> * <attribute name="hash" use="required" type="{http://www.w3.org/2001/XMLSchema}string"; /> @@ -40,6 +41,8 @@ public class File { @XmlAttribute(required = true) + protected int id; + @XmlAttribute(required = true) protected String name; @XmlAttribute(required = true) protected int size; @@ -47,6 +50,22 @@ protected String hash; /** + * Gets the value of the id property. + * + */ + public int getId() { + return id; + } + + /** + * Sets the value of the id property. + * + */ + public void setId(int value) { + this.id = value; + } + + /** * Gets the value of the name property. * * @return Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/FileCacheConfig.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/FileCacheConfig.java 2010-02-05 10:25:02 UTC (rev 1677) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/FileCacheConfig.java 2010-02-05 16:16:12 UTC (rev 1678) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1-b02-fcs // See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.01.29 at 01:26:47 odp. CET +// Generated on: 2010.02.05 at 05:09:42 odp. CET // Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/ObjectFactory.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/ObjectFactory.java 2010-02-05 10:25:02 UTC (rev 1677) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/ObjectFactory.java 2010-02-05 16:16:12 UTC (rev 1678) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1-b02-fcs // See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.01.29 at 01:26:47 odp. CET +// Generated on: 2010.02.05 at 05:09:42 odp. CET // @@ -37,19 +37,19 @@ } /** - * Create an instance of {@link File } + * Create an instance of {@link FileCacheConfig } * */ - public File createFile() { - return new File(); + public FileCacheConfig createFileCacheConfig() { + return new FileCacheConfig(); } /** - * Create an instance of {@link FileCacheConfig } + * Create an instance of {@link File } * */ - public FileCacheConfig createFileCacheConfig() { - return new FileCacheConfig(); + public File createFile() { + return new File(); } } Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/package-info.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/package-info.java 2010-02-05 10:25:02 UTC (rev 1677) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/filecache/package-info.java 2010-02-05 16:16:12 UTC (rev 1678) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1-b02-fcs // See <a href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.01.29 at 01:26:47 odp. CET +// Generated on: 2010.02.05 at 05:09:42 odp. CET // @javax.xml.bind.annotation.XmlSchema(namespace = "cz/elvys/jaxbgen/filecache") Modified: trunk/server/dispatcher/JavaSource/cz/elvys/xsd/filecacheConfig.xsd =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/xsd/filecacheConfig.xsd 2010-02-05 10:25:02 UTC (rev 1677) +++ trunk/server/dispatcher/JavaSource/cz/elvys/xsd/filecacheConfig.xsd 2010-02-05 16:16:12 UTC (rev 1678) @@ -17,6 +17,7 @@ <xs:complexType name="file"> <xs:choice></xs:choice> + <xs:attribute name="id" type="xs:int" use="required"/> <xs:attribute name="name" type="xs:string" use="required"/> <xs:attribute name="size" type="xs:int" use="required"/> <xs:attribute name="hash" type="xs:string" use="required"/>