diff options
13 files changed, 103 insertions, 112 deletions
diff --git a/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java b/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java index 25ee2c2..711376e 100644 --- a/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java +++ b/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java @@ -62,7 +62,7 @@ public class AbstractPersonType { @XmlElement(name = "Identification") protected List<IdentificationType> identification; - @XmlElementRef(name = "AbstractSimpleIdentification", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "AbstractSimpleIdentification", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class) protected List<JAXBElement<? extends AbstractSimpleIdentificationType>> abstractSimpleIdentification; @XmlAttribute(name = "Id") @XmlJavaTypeAdapter(CollapsedStringAdapter.class) diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java b/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java index 16b0a22..a8b7caf 100644 --- a/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java +++ b/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java @@ -63,7 +63,7 @@ public class CompactPersonDataType @XmlElementRef(name = "Person", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class) protected JAXBElement<? extends AbstractPersonType> person; - @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class) protected List<JAXBElement<? extends AbstractAddressType>> address; @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#") protected List<SignatureType> signature; diff --git a/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java b/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java index 5d0ea67..94f21e8 100644 --- a/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java +++ b/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java @@ -63,7 +63,7 @@ public class PersonDataType @XmlElementRef(name = "Person", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class) protected JAXBElement<? extends AbstractPersonType> person; - @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class) protected List<JAXBElement<? extends AbstractAddressType>> address; @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#") protected List<SignatureType> signature; diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/ObjectFactory.java b/src/main/java/at/gv/util/xsd/szr/pvp/ObjectFactory.java index b7d4820..d0e577b 100644 --- a/src/main/java/at/gv/util/xsd/szr/pvp/ObjectFactory.java +++ b/src/main/java/at/gv/util/xsd/szr/pvp/ObjectFactory.java @@ -34,19 +34,11 @@ public class ObjectFactory { } /** - * Create an instance of {@link PvpTokenType.Accounting.GvCostCenterId } - * - */ - public PvpTokenType.Accounting.GvCostCenterId createPvpTokenTypeAccountingGvCostCenterId() { - return new PvpTokenType.Accounting.GvCostCenterId(); - } - - /** - * Create an instance of {@link Role } + * Create an instance of {@link PvpTokenType } * */ - public Role createRole() { - return new Role(); + public PvpTokenType createPvpTokenType() { + return new PvpTokenType(); } /** @@ -58,27 +50,27 @@ public class ObjectFactory { } /** - * Create an instance of {@link PvpTokenType } + * Create an instance of {@link PvpTokenType.Authenticate } * */ - public PvpTokenType createPvpTokenType() { - return new PvpTokenType(); + public PvpTokenType.Authenticate createPvpTokenTypeAuthenticate() { + return new PvpTokenType.Authenticate(); } /** - * Create an instance of {@link PvpTokenType.Authenticate.UserPrincipal } + * Create an instance of {@link Param } * */ - public PvpTokenType.Authenticate.UserPrincipal createPvpTokenTypeAuthenticateUserPrincipal() { - return new PvpTokenType.Authenticate.UserPrincipal(); + public Param createParam() { + return new Param(); } /** - * Create an instance of {@link PvpTokenType.Authenticate } + * Create an instance of {@link Role } * */ - public PvpTokenType.Authenticate createPvpTokenTypeAuthenticate() { - return new PvpTokenType.Authenticate(); + public Role createRole() { + return new Role(); } /** @@ -90,27 +82,27 @@ public class ObjectFactory { } /** - * Create an instance of {@link PvpTokenType.PvpExtension } + * Create an instance of {@link PvpTokenType.Authorize } * */ - public PvpTokenType.PvpExtension createPvpTokenTypePvpExtension() { - return new PvpTokenType.PvpExtension(); + public PvpTokenType.Authorize createPvpTokenTypeAuthorize() { + return new PvpTokenType.Authorize(); } /** - * Create an instance of {@link PvpTokenType.Authorize } + * Create an instance of {@link PvpTokenType.PvpExtension } * */ - public PvpTokenType.Authorize createPvpTokenTypeAuthorize() { - return new PvpTokenType.Authorize(); + public PvpTokenType.PvpExtension createPvpTokenTypePvpExtension() { + return new PvpTokenType.PvpExtension(); } /** - * Create an instance of {@link Param } + * Create an instance of {@link PvpTokenType.Accounting.GvCostCenterId } * */ - public Param createParam() { - return new Param(); + public PvpTokenType.Accounting.GvCostCenterId createPvpTokenTypeAccountingGvCostCenterId() { + return new PvpTokenType.Accounting.GvCostCenterId(); } /** @@ -122,6 +114,14 @@ public class ObjectFactory { } /** + * Create an instance of {@link PvpTokenType.Authenticate.UserPrincipal } + * + */ + public PvpTokenType.Authenticate.UserPrincipal createPvpTokenTypeAuthenticateUserPrincipal() { + return new PvpTokenType.Authenticate.UserPrincipal(); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link PvpTokenType }{@code >}} * */ diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java b/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java index 0c1e55f..3e3910a 100644 --- a/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java +++ b/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java @@ -32,8 +32,8 @@ import org.w3c.dom.Element; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="participantId" type="{http://www.w3.org/2001/XMLSchema}anyType"/> - * <element name="gvOuDomain" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/> + * <element name="participantId" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="gvOuDomain" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <choice> * <element name="userPrincipal"> * <complexType> @@ -134,7 +134,7 @@ public class PvpTokenType { protected PvpTokenType.Accounting accounting; protected PvpTokenType pvpChainedToken; protected PvpTokenType.PvpExtension pvpExtension; - @XmlAttribute(required = true) + @XmlAttribute(name = "version", required = true) protected String version; @XmlAnyAttribute private Map<QName, String> otherAttributes = new HashMap<QName, String>(); @@ -615,8 +615,8 @@ public class PvpTokenType { * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="participantId" type="{http://www.w3.org/2001/XMLSchema}anyType"/> - * <element name="gvOuDomain" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/> + * <element name="participantId" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="gvOuDomain" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <choice> * <element name="userPrincipal"> * <complexType> @@ -651,8 +651,8 @@ public class PvpTokenType { public static class Authenticate { @XmlElement(required = true) - protected Object participantId; - protected Object gvOuDomain; + protected String participantId; + protected String gvOuDomain; protected PvpTokenType.Authenticate.UserPrincipal userPrincipal; protected PvpPrincipalType systemPrincipal; @@ -661,10 +661,10 @@ public class PvpTokenType { * * @return * possible object is - * {@link Object } + * {@link String } * */ - public Object getParticipantId() { + public String getParticipantId() { return participantId; } @@ -673,10 +673,10 @@ public class PvpTokenType { * * @param value * allowed object is - * {@link Object } + * {@link String } * */ - public void setParticipantId(Object value) { + public void setParticipantId(String value) { this.participantId = value; } @@ -685,10 +685,10 @@ public class PvpTokenType { * * @return * possible object is - * {@link Object } + * {@link String } * */ - public Object getGvOuDomain() { + public String getGvOuDomain() { return gvOuDomain; } @@ -697,10 +697,10 @@ public class PvpTokenType { * * @param value * allowed object is - * {@link Object } + * {@link String } * */ - public void setGvOuDomain(Object value) { + public void setGvOuDomain(String value) { this.gvOuDomain = value; } @@ -973,8 +973,8 @@ public class PvpTokenType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } * {@link Object } + * {@link Element } * * */ diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/Role.java b/src/main/java/at/gv/util/xsd/szr/pvp/Role.java index edf84f0..624347b 100644 --- a/src/main/java/at/gv/util/xsd/szr/pvp/Role.java +++ b/src/main/java/at/gv/util/xsd/szr/pvp/Role.java @@ -43,7 +43,7 @@ public class Role { @XmlElement(required = true) protected List<Param> param; protected Object dummy; - @XmlAttribute(required = true) + @XmlAttribute(name = "value", required = true) protected String value; /** diff --git a/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java b/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java index 1cea66e..6e6603d 100644 --- a/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java +++ b/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java @@ -53,13 +53,13 @@ import org.w3c.dom.Element; public class KeyInfoType { @XmlElementRefs({ - @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlMixed @XmlAnyElement(lax = true) diff --git a/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java b/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java index 73d0b30..922ac74 100644 --- a/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java +++ b/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java @@ -42,8 +42,8 @@ import org.w3c.dom.Element; public class KeyValueType { @XmlElementRefs({ - @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlMixed @XmlAnyElement(lax = true) diff --git a/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java b/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java index 582db74..b07ad11 100644 --- a/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java +++ b/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java @@ -47,8 +47,8 @@ import org.w3c.dom.Element; public class PGPDataType { @XmlElementRefs({ - @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlAnyElement(lax = true) protected List<Object> content; diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java b/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java index 70695af..45d08b6 100644 --- a/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java +++ b/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java @@ -42,7 +42,7 @@ import javax.xml.bind.annotation.XmlType; }) public class SignatureMethodType { - @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) @XmlMixed @XmlAnyElement(lax = true) protected List<Object> content; diff --git a/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java b/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java index f968ff2..7499065 100644 --- a/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java +++ b/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java @@ -42,7 +42,7 @@ import org.w3c.dom.Element; }) public class TransformType { - @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) @XmlMixed @XmlAnyElement(lax = true) protected List<Object> content; diff --git a/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java b/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java index 05c0081..3adef12 100644 --- a/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java +++ b/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java @@ -46,11 +46,11 @@ import org.w3c.dom.Element; public class X509DataType { @XmlElementRefs({ - @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlAnyElement(lax = true) protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName; diff --git a/src/main/resources/wsdl/szr/szr_pvp.xsd b/src/main/resources/wsdl/szr/szr_pvp.xsd index accb9dd..a536c47 100644 --- a/src/main/resources/wsdl/szr/szr_pvp.xsd +++ b/src/main/resources/wsdl/szr/szr_pvp.xsd @@ -1,30 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<xs:schema targetNamespace="http://egov.gv.at/pvp1.xsd" xmlns="http://egov.gv.at/pvp1.xsd" - xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - attributeFormDefault="unqualified"> - <xs:element name="pvpToken" type="pvpTokenType" /> +<xs:schema xmlns="http://egov.gv.at/pvp1.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://egov.gv.at/pvp1.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified"> + <xs:element name="pvpToken" type="pvpTokenType"/> <xs:complexType name="pvpTokenType"> <xs:sequence> <xs:element name="authenticate"> <xs:complexType> <xs:sequence> - <xs:element name="participantId" /> - <xs:element name="gvOuDomain" minOccurs="0" /> + <xs:element name="participantId" type="xs:string"/> + <xs:element name="gvOuDomain" minOccurs="0" type="xs:string"/> <xs:choice> <xs:element name="userPrincipal"> <xs:complexType> <xs:complexContent> <xs:extension base="pvpPrincipalType"> <xs:sequence> - <xs:element name="gvGid" type="xs:string" /> - <xs:element name="gvFunction" type="xs:string" - minOccurs="0" /> + <xs:element name="gvGid" type="xs:string"/> + <xs:element name="gvFunction" type="xs:string" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> </xs:complexType> </xs:element> - <xs:element name="systemPrincipal" type="pvpPrincipalType" /> + <xs:element name="systemPrincipal" type="pvpPrincipalType"/> </xs:choice> </xs:sequence> </xs:complexType> @@ -32,21 +29,20 @@ <xs:element name="authorize" minOccurs="0"> <xs:complexType> <xs:sequence> - <xs:element ref="role" maxOccurs="unbounded" /> - <xs:element name="dummy" minOccurs="0" /> + <xs:element ref="role" maxOccurs="unbounded"/> + <xs:element name="dummy" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="accounting" minOccurs="0"> <xs:complexType> <xs:sequence> - <xs:element name="invoiceRecptId" type="xs:string" /> + <xs:element name="invoiceRecptId" type="xs:string"/> <xs:element name="gvCostCenterId" maxOccurs="unbounded"> <xs:complexType> <xs:simpleContent> <xs:extension base="xs:string"> - <xs:attribute name="default" type="xs:boolean" - use="optional" default="false" /> + <xs:attribute name="default" type="xs:boolean" use="optional" default="false"/> </xs:extension> </xs:simpleContent> </xs:complexType> @@ -55,8 +51,7 @@ <xs:complexType> <xs:simpleContent> <xs:extension base="xs:string"> - <xs:attribute name="default" type="xs:boolean" - use="optional" default="false" /> + <xs:attribute name="default" type="xs:boolean" use="optional" default="false"/> </xs:extension> </xs:simpleContent> </xs:complexType> @@ -64,63 +59,59 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="pvpChainedToken" type="pvpTokenType" - minOccurs="0" /> - <xs:element name="pvpExtension" block="extension" - minOccurs="0"> + <xs:element name="pvpChainedToken" type="pvpTokenType" minOccurs="0"/> + <xs:element name="pvpExtension" block="extension" minOccurs="0"> <xs:complexType> <xs:sequence> - <xs:any namespace="##any" processContents="lax" maxOccurs="unbounded" /> + <xs:any namespace="##any" processContents="lax" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> </xs:element> </xs:sequence> - <xs:attribute name="version" type="gvVersionType" use="required" /> - <xs:anyAttribute namespace="##any" processContents="lax" /> + <xs:attribute name="version" type="gvVersionType" use="required"/> + <xs:anyAttribute namespace="##any" processContents="lax"/> </xs:complexType> <xs:complexType name="pvpPrincipalType"> <xs:sequence> - <xs:element name="userId" type="xs:string" /> - <xs:element name="cn" type="xs:string" /> - <xs:element name="gvOuId" type="xs:string" /> - <xs:element name="ou" type="xs:string" /> - <xs:element name="gvSecClass" type="gvSecClassType" - minOccurs="0" /> + <xs:element name="userId" type="xs:string"/> + <xs:element name="cn" type="xs:string"/> + <xs:element name="gvOuId" type="xs:string"/> + <xs:element name="ou" type="xs:string"/> + <xs:element name="gvSecClass" type="gvSecClassType" minOccurs="0"/> </xs:sequence> - <xs:anyAttribute namespace="##any" processContents="lax" /> + <xs:anyAttribute namespace="##any" processContents="lax"/> </xs:complexType> <xs:simpleType name="gvSecClassType"> <xs:restriction base="xs:integer"> - <xs:enumeration value="0" /> - <xs:enumeration value="1" /> - <xs:enumeration value="2" /> - <xs:enumeration value="3" /> + <xs:enumeration value="0"/> + <xs:enumeration value="1"/> + <xs:enumeration value="2"/> + <xs:enumeration value="3"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="gvVersionType"> <xs:restriction base="xs:string"> - <xs:enumeration value="1.0" /> - <xs:enumeration value="1.1" /> - <xs:enumeration value="1.2" /> - <xs:enumeration value="1.8" /> + <xs:enumeration value="1.0"/> + <xs:enumeration value="1.1"/> + <xs:enumeration value="1.2"/> + <xs:enumeration value="1.8"/> </xs:restriction> </xs:simpleType> <xs:element name="role"> <xs:complexType> <xs:sequence> - <xs:element ref="param" maxOccurs="unbounded" /> - <xs:element name="dummy" minOccurs="0" /> + <xs:element ref="param" maxOccurs="unbounded"/> + <xs:element name="dummy" minOccurs="0"/> </xs:sequence> - <xs:attribute name="value" type="xs:string" use="required" /> + <xs:attribute name="value" type="xs:string" use="required"/> </xs:complexType> </xs:element> <xs:element name="param"> <xs:complexType> <xs:sequence> - <xs:element name="key" type="xs:string" /> - <xs:element name="value" type="xs:string" /> + <xs:element name="key" type="xs:string"/> + <xs:element name="value" type="xs:string"/> </xs:sequence> </xs:complexType> </xs:element> </xs:schema> - |