Author: DavidK Date: 2010-02-27 15:23:42 +0100 (Sat, 27 Feb 2010) New Revision: 1920 Added: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/File.java Modified: others/xsd/version2/documentConfig.xsd trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/DocumentConfigWorkerImpl.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/DocumentConfig.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Documents.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/DynamicText.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/HtmlDoc.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/None.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/ObjectFactory.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Pages.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/PagesPresentation.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Panel.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Panels.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/PdfDoc.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Presentation.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/StaticText.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Video.java trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/package-info.java trunk/server/dispatcher/JavaSource/cz/elvys/xsd/documentConfig.xsd Log: updated docconf generation Modified: others/xsd/version2/documentConfig.xsd =================================================================== --- others/xsd/version2/documentConfig.xsd 2010-02-27 13:55:33 UTC (rev 1919) +++ others/xsd/version2/documentConfig.xsd 2010-02-27 14:23:42 UTC (rev 1920) @@ -94,13 +94,7 @@ <xs:complexType name="pdf_doc"> <xs:sequence> - <xs:element name="id" type="xs:int" /> - <xs:element name="name"> - <xs:complexType mixed="true" /> - </xs:element> - <xs:element name="orig-name"> - <xs:complexType mixed="true" /> - </xs:element> + <xs:element name="file" type="file"/> <xs:element name="pages" type="pages" /> </xs:sequence> <xs:attribute name="zoomable" type="xs:boolean" use="required" /> @@ -117,13 +111,7 @@ <xs:complexType name="video"> <xs:sequence> - <xs:element name="id" type="xs:int" /> - <xs:element name="name"> - <xs:complexType mixed="true" /> - </xs:element> - <xs:element name="orig-name"> - <xs:complexType mixed="true" /> - </xs:element> + <xs:element name="file" type="file"/> <xs:element name="start_at" type="xs:int" /> <xs:element name="autostart" type="xs:boolean" /> </xs:sequence> @@ -132,15 +120,10 @@ </xs:complexType> + <xs:complexType name="presentation"> <xs:sequence> - <xs:element name="id" type="xs:int" /> - <xs:element name="name"> - <xs:complexType mixed="true" /> - </xs:element> - <xs:element name="orig-name"> - <xs:complexType mixed="true" /> - </xs:element> + <xs:element name="file" type="file"/> <xs:element name="period" type="xs:int"/> <xs:element name="pages" type="pages_presentation" /> </xs:sequence> @@ -149,5 +132,15 @@ </xs:complexType> + <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="origName" type="xs:string" use="required" /> + <xs:attribute name="size" type="xs:int" use="required" /> + <xs:attribute name="hash" type="xs:string" use="required" /> + </xs:complexType> + + </xs:schema> \ No newline at end of file Modified: trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/DocumentConfigWorkerImpl.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/DocumentConfigWorkerImpl.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/DocumentConfigWorkerImpl.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -16,6 +16,7 @@ import cz.elvys.jaxbgen.document.DocumentConfig; import cz.elvys.jaxbgen.document.Documents; import cz.elvys.jaxbgen.document.DynamicText; +import cz.elvys.jaxbgen.document.File; import cz.elvys.jaxbgen.document.HtmlDoc; import cz.elvys.jaxbgen.document.None; import cz.elvys.jaxbgen.document.ObjectFactory; @@ -30,8 +31,6 @@ import cz.elvys.jaxbgen.document.HtmlDoc.Address; import cz.elvys.jaxbgen.document.Pages.Page; import cz.elvys.jaxbgen.document.Pages.PreviewPage; -import cz.elvys.jaxbgen.document.PdfDoc.Name; -import cz.elvys.jaxbgen.document.PdfDoc.OrigName; import cz.elvys.webServer.HIBgen.Category; import cz.elvys.webServer.HIBgen.DocumentContent; import cz.elvys.webServer.HIBgen.DynamicContent; @@ -237,23 +236,36 @@ DocumentContent doc = (DocumentContent) frc; PdfDoc pdf = of.createPdfDoc(); { - // id - int id = doc.getFile().getId(); - pdf.setId(id); + // file + File file = of.createFile(); + { + // id + int id = doc.getFile().getId(); + file.setId(id); + } + { + // name + String name = doc.getFile().getUniqName(); + file.setName(name); + } + { + // orig-name + String origName = doc.getFile().getOrigName(); + file.setOrigName(origName); + } + { + // hash + String hash = doc.getFile().getHashcode(); + file.setHash(hash); + } + { + // size + int size = doc.getFile().getSize(); + file.setSize(size); + } + pdf.setFile(file); } { - //name - Name name = of.createPdfDocName(); - name.setContent(doc.getFile().getUniqName()); - pdf.setName(name); - } - { - //orig-name - OrigName origName = of.createPdfDocOrigName(); - origName.setContent(doc.getFile().getOrigName()); - pdf.setOrigName(origName); - } - { //pages Pages pages = of.createPages(); { @@ -375,22 +387,36 @@ VideoContent vc = (VideoContent) frc; Video vr = of.createVideo(); { - //id - vr.setId(vc.getFile().getId()); + // file + File file = of.createFile(); + { + // id + int id = vc.getFile().getId(); + file.setId(id); + } + { + // name + String name = vc.getFile().getUniqName(); + file.setName(name); + } + { + // orig-name + String origName = vc.getFile().getOrigName(); + file.setOrigName(origName); + } + { + // hash + String hash = vc.getFile().getHashcode(); + file.setHash(hash); + } + { + // size + int size = vc.getFile().getSize(); + file.setSize(size); + } + vr.setFile(file); } { - // name - cz.elvys.jaxbgen.document.Video.Name name = of.createVideoName(); - name.setContent(vc.getFile().getUniqName()); - vr.setName(name); - } - { - // orig-name - cz.elvys.jaxbgen.document.Video.OrigName origName = of.createVideoOrigName(); - origName.setContent(vc.getFile().getOrigName()); - vr.setOrigName(origName); - } - { // start-at vr.setStartAt(vc.getStartPosMs()); } @@ -413,28 +439,36 @@ PdfPresContent pres = (PdfPresContent) frc; Presentation pr = of.createPresentation(); { - // id - int id = pres.getFile().getId(); - pr.setId(id); + // file + File file = of.createFile(); + { + // id + int id = pres.getFile().getId(); + file.setId(id); + } + { + // name + String name = pres.getFile().getUniqName(); + file.setName(name); + } + { + // orig-name + String origName = pres.getFile().getOrigName(); + file.setOrigName(origName); + } + { + // hash + String hash = pres.getFile().getHashcode(); + file.setHash(hash); + } + { + // size + int size = pres.getFile().getSize(); + file.setSize(size); + } + pr.setFile(file); } { - //name - cz.elvys.jaxbgen.document.Presentation.Name name = of.createPresentationName(); - name.setContent(pres.getFile().getUniqName()); - pr.setName(name); - } - { - //orig-name - cz.elvys.jaxbgen.document.Presentation.OrigName origName = of.createPresentationOrigName(); - origName.setContent(pres.getFile().getOrigName()); - pr.setOrigName(origName); - } - { - //orig-name - int interval = pres.getIntervalRfrsh();; - pr.setPeriod(interval); - } - { //pages PagesPresentation pages = of.createPagesPresentation(); String pagesStr = pres.getPageList(); Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/DocumentConfig.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/DocumentConfig.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/DocumentConfig.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Documents.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Documents.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Documents.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // @@ -49,13 +49,13 @@ public class Documents { @XmlElements({ + @XmlElement(name = "dynamic_text", type = DynamicText.class), + @XmlElement(name = "pdf_presentation", type = Presentation.class), + @XmlElement(name = "video", type = Video.class), + @XmlElement(name = "html_doc", type = HtmlDoc.class), @XmlElement(name = "none", type = None.class), - @XmlElement(name = "static_text", type = StaticText.class), - @XmlElement(name = "video", type = Video.class), @XmlElement(name = "pdf_doc", type = PdfDoc.class), - @XmlElement(name = "dynamic_text", type = DynamicText.class), - @XmlElement(name = "html_doc", type = HtmlDoc.class), - @XmlElement(name = "pdf_presentation", type = Presentation.class) + @XmlElement(name = "static_text", type = StaticText.class) }) protected List<Object> pdfDocOrHtmlDocOrStaticText; @@ -77,13 +77,13 @@ * * <p> * Objects of the following type(s) are allowed in the list + * {@link DynamicText } + * {@link Presentation } + * {@link Video } + * {@link HtmlDoc } * {@link None } + * {@link PdfDoc } * {@link StaticText } - * {@link Video } - * {@link PdfDoc } - * {@link DynamicText } - * {@link HtmlDoc } - * {@link Presentation } * * */ Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/DynamicText.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/DynamicText.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/DynamicText.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // Added: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/File.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/File.java (rev 0) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/File.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -0,0 +1,159 @@ +// +// 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.02.27 at 03:16:34 odp. CET +// + + +package cz.elvys.jaxbgen.document; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for file complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="file"> + * <complexContent> + * <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="origName" 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"; /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "file") +public class File { + + @XmlAttribute(required = true) + protected int id; + @XmlAttribute(required = true) + protected String name; + @XmlAttribute(required = true) + protected String origName; + @XmlAttribute(required = true) + protected int size; + @XmlAttribute(required = true) + 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 + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the origName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOrigName() { + return origName; + } + + /** + * Sets the value of the origName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOrigName(String value) { + this.origName = value; + } + + /** + * Gets the value of the size property. + * + */ + public int getSize() { + return size; + } + + /** + * Sets the value of the size property. + * + */ + public void setSize(int value) { + this.size = value; + } + + /** + * Gets the value of the hash property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getHash() { + return hash; + } + + /** + * Sets the value of the hash property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setHash(String value) { + this.hash = value; + } + +} Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/HtmlDoc.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/HtmlDoc.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/HtmlDoc.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/None.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/None.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/None.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/ObjectFactory.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/ObjectFactory.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/ObjectFactory.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // @@ -37,115 +37,115 @@ } /** - * Create an instance of {@link StaticText } + * Create an instance of {@link HtmlDoc } * */ - public StaticText createStaticText() { - return new StaticText(); + public HtmlDoc createHtmlDoc() { + return new HtmlDoc(); } /** - * Create an instance of {@link HtmlDoc.Address } + * Create an instance of {@link File } * */ - public HtmlDoc.Address createHtmlDocAddress() { - return new HtmlDoc.Address(); + public File createFile() { + return new File(); } /** - * Create an instance of {@link Presentation.OrigName } + * Create an instance of {@link HtmlDoc.Address } * */ - public Presentation.OrigName createPresentationOrigName() { - return new Presentation.OrigName(); + public HtmlDoc.Address createHtmlDocAddress() { + return new HtmlDoc.Address(); } /** - * Create an instance of {@link Panel } + * Create an instance of {@link Pages.PreviewPage } * */ - public Panel createPanel() { - return new Panel(); + public Pages.PreviewPage createPagesPreviewPage() { + return new Pages.PreviewPage(); } /** - * Create an instance of {@link None } + * Create an instance of {@link PagesPresentation.Page } * */ - public None createNone() { - return new None(); + public PagesPresentation.Page createPagesPresentationPage() { + return new PagesPresentation.Page(); } /** - * Create an instance of {@link HtmlDoc.Name } + * Create an instance of {@link Panels } * */ - public HtmlDoc.Name createHtmlDocName() { - return new HtmlDoc.Name(); + public Panels createPanels() { + return new Panels(); } /** - * Create an instance of {@link Presentation } + * Create an instance of {@link Pages.Page } * */ - public Presentation createPresentation() { - return new Presentation(); + public Pages.Page createPagesPage() { + return new Pages.Page(); } /** - * Create an instance of {@link Documents } + * Create an instance of {@link PagesPresentation } * */ - public Documents createDocuments() { - return new Documents(); + public PagesPresentation createPagesPresentation() { + return new PagesPresentation(); } /** - * Create an instance of {@link Pages.PreviewPage } + * Create an instance of {@link StaticText } * */ - public Pages.PreviewPage createPagesPreviewPage() { - return new Pages.PreviewPage(); + public StaticText createStaticText() { + return new StaticText(); } /** - * Create an instance of {@link PdfDoc.OrigName } + * Create an instance of {@link DocumentConfig } * */ - public PdfDoc.OrigName createPdfDocOrigName() { - return new PdfDoc.OrigName(); + public DocumentConfig createDocumentConfig() { + return new DocumentConfig(); } /** - * Create an instance of {@link DynamicText } + * Create an instance of {@link Documents } * */ - public DynamicText createDynamicText() { - return new DynamicText(); + public Documents createDocuments() { + return new Documents(); } /** - * Create an instance of {@link PagesPresentation.Page } + * Create an instance of {@link HtmlDoc.Name } * */ - public PagesPresentation.Page createPagesPresentationPage() { - return new PagesPresentation.Page(); + public HtmlDoc.Name createHtmlDocName() { + return new HtmlDoc.Name(); } /** - * Create an instance of {@link Pages } + * Create an instance of {@link DynamicText } * */ - public Pages createPages() { - return new Pages(); + public DynamicText createDynamicText() { + return new DynamicText(); } /** - * Create an instance of {@link Panels } + * Create an instance of {@link None } * */ - public Panels createPanels() { - return new Panels(); + public None createNone() { + return new None(); } /** @@ -157,75 +157,35 @@ } /** - * Create an instance of {@link PdfDoc } + * Create an instance of {@link Panel } * */ - public PdfDoc createPdfDoc() { - return new PdfDoc(); + public Panel createPanel() { + return new Panel(); } /** - * Create an instance of {@link Video.OrigName } + * Create an instance of {@link Presentation } * */ - public Video.OrigName createVideoOrigName() { - return new Video.OrigName(); + public Presentation createPresentation() { + return new Presentation(); } /** - * Create an instance of {@link DocumentConfig } + * Create an instance of {@link Pages } * */ - public DocumentConfig createDocumentConfig() { - return new DocumentConfig(); + public Pages createPages() { + return new Pages(); } /** - * Create an instance of {@link HtmlDoc } + * Create an instance of {@link PdfDoc } * */ - public HtmlDoc createHtmlDoc() { - return new HtmlDoc(); + public PdfDoc createPdfDoc() { + return new PdfDoc(); } - /** - * Create an instance of {@link Pages.Page } - * - */ - public Pages.Page createPagesPage() { - return new Pages.Page(); - } - - /** - * Create an instance of {@link Video.Name } - * - */ - public Video.Name createVideoName() { - return new Video.Name(); - } - - /** - * Create an instance of {@link PdfDoc.Name } - * - */ - public PdfDoc.Name createPdfDocName() { - return new PdfDoc.Name(); - } - - /** - * Create an instance of {@link PagesPresentation } - * - */ - public PagesPresentation createPagesPresentation() { - return new PagesPresentation(); - } - - /** - * Create an instance of {@link Presentation.Name } - * - */ - public Presentation.Name createPresentationName() { - return new Presentation.Name(); - } - } Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Pages.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Pages.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Pages.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/PagesPresentation.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/PagesPresentation.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/PagesPresentation.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Panel.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Panel.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Panel.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Panels.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Panels.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Panels.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/PdfDoc.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/PdfDoc.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/PdfDoc.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // @@ -13,7 +13,6 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; /** @@ -26,23 +25,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> * <sequence> - * <element name="id" type="{http://www.w3.org/2001/XMLSchema}int"/> - * <element name="name"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * <element name="orig-name"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </element> + * <element name="file" type="{cz/elvys/jaxbgen/document}file"/> * <element name="pages" type="{cz/elvys/jaxbgen/document}pages"/> * </sequence> * <attribute name="zoomable" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean"; /> @@ -56,18 +39,13 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "pdf_doc", propOrder = { - "id", - "name", - "origName", + "file", "pages" }) public class PdfDoc { - protected int id; @XmlElement(required = true) - protected PdfDoc.Name name; - @XmlElement(name = "orig-name", required = true) - protected PdfDoc.OrigName origName; + protected File file; @XmlElement(required = true) protected Pages pages; @XmlAttribute(required = true) @@ -76,70 +54,30 @@ protected String toId; /** - * Gets the value of the id property. + * Gets the value of the file 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 * possible object is - * {@link PdfDoc.Name } + * {@link File } * */ - public PdfDoc.Name getName() { - return name; + public File getFile() { + return file; } /** - * Sets the value of the name property. + * Sets the value of the file property. * * @param value * allowed object is - * {@link PdfDoc.Name } + * {@link File } * */ - public void setName(PdfDoc.Name value) { - this.name = value; + public void setFile(File value) { + this.file = value; } /** - * Gets the value of the origName property. - * - * @return - * possible object is - * {@link PdfDoc.OrigName } - * - */ - public PdfDoc.OrigName getOrigName() { - return origName; - } - - /** - * Sets the value of the origName property. - * - * @param value - * allowed object is - * {@link PdfDoc.OrigName } - * - */ - public void setOrigName(PdfDoc.OrigName value) { - this.origName = value; - } - - /** * Gets the value of the pages property. * * @return @@ -203,108 +141,4 @@ this.toId = value; } - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "content" - }) - public static class Name { - - @XmlValue - protected String content; - - /** - * Gets the value of the content property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getContent() { - return content; - } - - /** - * Sets the value of the content property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setContent(String value) { - this.content = value; - } - - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "content" - }) - public static class OrigName { - - @XmlValue - protected String content; - - /** - * Gets the value of the content property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getContent() { - return content; - } - - /** - * Sets the value of the content property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setContent(String value) { - this.content = value; - } - - } - } Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Presentation.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Presentation.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Presentation.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // @@ -13,7 +13,6 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; /** @@ -26,23 +25,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> * <sequence> - * <element name="id" type="{http://www.w3.org/2001/XMLSchema}int"/> - * <element name="name"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * <element name="orig-name"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </element> + * <element name="file" type="{cz/elvys/jaxbgen/document}file"/> * <element name="period" type="{http://www.w3.org/2001/XMLSchema}int"/> * <element name="pages" type="{cz/elvys/jaxbgen/document}pages_presentation"/> * </sequence> @@ -57,19 +40,14 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "presentation", propOrder = { - "id", - "name", - "origName", + "file", "period", "pages" }) public class Presentation { - protected int id; @XmlElement(required = true) - protected Presentation.Name name; - @XmlElement(name = "orig-name", required = true) - protected Presentation.OrigName origName; + protected File file; protected int period; @XmlElement(required = true) protected PagesPresentation pages; @@ -79,70 +57,30 @@ protected String toId; /** - * Gets the value of the id property. + * Gets the value of the file 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 * possible object is - * {@link Presentation.Name } + * {@link File } * */ - public Presentation.Name getName() { - return name; + public File getFile() { + return file; } /** - * Sets the value of the name property. + * Sets the value of the file property. * * @param value * allowed object is - * {@link Presentation.Name } + * {@link File } * */ - public void setName(Presentation.Name value) { - this.name = value; + public void setFile(File value) { + this.file = value; } /** - * Gets the value of the origName property. - * - * @return - * possible object is - * {@link Presentation.OrigName } - * - */ - public Presentation.OrigName getOrigName() { - return origName; - } - - /** - * Sets the value of the origName property. - * - * @param value - * allowed object is - * {@link Presentation.OrigName } - * - */ - public void setOrigName(Presentation.OrigName value) { - this.origName = value; - } - - /** * Gets the value of the period property. * */ @@ -222,108 +160,4 @@ this.toId = value; } - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "content" - }) - public static class Name { - - @XmlValue - protected String content; - - /** - * Gets the value of the content property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getContent() { - return content; - } - - /** - * Sets the value of the content property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setContent(String value) { - this.content = value; - } - - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "content" - }) - public static class OrigName { - - @XmlValue - protected String content; - - /** - * Gets the value of the content property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getContent() { - return content; - } - - /** - * Sets the value of the content property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setContent(String value) { - this.content = value; - } - - } - } Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/StaticText.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/StaticText.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/StaticText.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Video.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Video.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/Video.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // @@ -13,7 +13,6 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; /** @@ -26,23 +25,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> * <sequence> - * <element name="id" type="{http://www.w3.org/2001/XMLSchema}int"/> - * <element name="name"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * <element name="orig-name"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </element> + * <element name="file" type="{cz/elvys/jaxbgen/document}file"/> * <element name="start_at" type="{http://www.w3.org/2001/XMLSchema}int"/> * <element name="autostart" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * </sequence> @@ -57,19 +40,14 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "video", propOrder = { - "id", - "name", - "origName", + "file", "startAt", "autostart" }) public class Video { - protected int id; @XmlElement(required = true) - protected Video.Name name; - @XmlElement(name = "orig-name", required = true) - protected Video.OrigName origName; + protected File file; @XmlElement(name = "start_at") protected int startAt; protected boolean autostart; @@ -79,70 +57,30 @@ protected String toId; /** - * Gets the value of the id property. + * Gets the value of the file 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 * possible object is - * {@link Video.Name } + * {@link File } * */ - public Video.Name getName() { - return name; + public File getFile() { + return file; } /** - * Sets the value of the name property. + * Sets the value of the file property. * * @param value * allowed object is - * {@link Video.Name } + * {@link File } * */ - public void setName(Video.Name value) { - this.name = value; + public void setFile(File value) { + this.file = value; } /** - * Gets the value of the origName property. - * - * @return - * possible object is - * {@link Video.OrigName } - * - */ - public Video.OrigName getOrigName() { - return origName; - } - - /** - * Sets the value of the origName property. - * - * @param value - * allowed object is - * {@link Video.OrigName } - * - */ - public void setOrigName(Video.OrigName value) { - this.origName = value; - } - - /** * Gets the value of the startAt property. * */ @@ -214,108 +152,4 @@ this.toId = value; } - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "content" - }) - public static class Name { - - @XmlValue - protected String content; - - /** - * Gets the value of the content property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getContent() { - return content; - } - - /** - * Sets the value of the content property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setContent(String value) { - this.content = value; - } - - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType";> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "content" - }) - public static class OrigName { - - @XmlValue - protected String content; - - /** - * Gets the value of the content property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getContent() { - return content; - } - - /** - * Sets the value of the content property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setContent(String value) { - this.content = value; - } - - } - } Modified: trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/package-info.java =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/package-info.java 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/jaxbgen/document/package-info.java 2010-02-27 14:23:42 UTC (rev 1920) @@ -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.02.21 at 10:40:45 dop. CET +// Generated on: 2010.02.27 at 03:16:34 odp. CET // @javax.xml.bind.annotation.XmlSchema(namespace = "cz/elvys/jaxbgen/document") Modified: trunk/server/dispatcher/JavaSource/cz/elvys/xsd/documentConfig.xsd =================================================================== --- trunk/server/dispatcher/JavaSource/cz/elvys/xsd/documentConfig.xsd 2010-02-27 13:55:33 UTC (rev 1919) +++ trunk/server/dispatcher/JavaSource/cz/elvys/xsd/documentConfig.xsd 2010-02-27 14:23:42 UTC (rev 1920) @@ -94,13 +94,7 @@ <xs:complexType name="pdf_doc"> <xs:sequence> - <xs:element name="id" type="xs:int" /> - <xs:element name="name"> - <xs:complexType mixed="true" /> - </xs:element> - <xs:element name="orig-name"> - <xs:complexType mixed="true" /> - </xs:element> + <xs:element name="file" type="file"/> <xs:element name="pages" type="pages" /> </xs:sequence> <xs:attribute name="zoomable" type="xs:boolean" use="required" /> @@ -117,13 +111,7 @@ <xs:complexType name="video"> <xs:sequence> - <xs:element name="id" type="xs:int" /> - <xs:element name="name"> - <xs:complexType mixed="true" /> - </xs:element> - <xs:element name="orig-name"> - <xs:complexType mixed="true" /> - </xs:element> + <xs:element name="file" type="file"/> <xs:element name="start_at" type="xs:int" /> <xs:element name="autostart" type="xs:boolean" /> </xs:sequence> @@ -132,15 +120,10 @@ </xs:complexType> + <xs:complexType name="presentation"> <xs:sequence> - <xs:element name="id" type="xs:int" /> - <xs:element name="name"> - <xs:complexType mixed="true" /> - </xs:element> - <xs:element name="orig-name"> - <xs:complexType mixed="true" /> - </xs:element> + <xs:element name="file" type="file"/> <xs:element name="period" type="xs:int"/> <xs:element name="pages" type="pages_presentation" /> </xs:sequence> @@ -149,5 +132,15 @@ </xs:complexType> + <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="origName" type="xs:string" use="required" /> + <xs:attribute name="size" type="xs:int" use="required" /> + <xs:attribute name="hash" type="xs:string" use="required" /> + </xs:complexType> + + </xs:schema> \ No newline at end of file