From 0eec376bb3c272eb3872d306ba35e5a52d51fc2b Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 1 Oct 2014 10:52:19 +0200 Subject: update PVP 1.9 Header schema --- .../java/at/gv/util/xsd/szr/pvp/ObjectFactory.java | 58 +++++++++++----------- .../java/at/gv/util/xsd/szr/pvp/PvpTokenType.java | 32 ++++++------ src/main/java/at/gv/util/xsd/szr/pvp/Role.java | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-) (limited to 'src/main/java/at/gv/util/xsd/szr') 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(); } /** @@ -121,6 +113,14 @@ public class ObjectFactory { return new PvpTokenType.Accounting.GvChargeCode(); } + /** + * 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 otherAttributes = new HashMap(); @@ -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 { * *

* 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; protected Object dummy; - @XmlAttribute(required = true) + @XmlAttribute(name = "value", required = true) protected String value; /** -- cgit v1.2.3