From 7d6f5207275778350bff8f23087fe1c905210e2b Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Tue, 11 Aug 2015 13:38:53 +0200 Subject: accepted complex attributes xsd --- .../tc/stork/_1_0/assertion/ObjectFactory.java | 26 --- .../resources/schema/StorkcomplexAttributes.xsd | 240 ++++++++++----------- 2 files changed, 113 insertions(+), 153 deletions(-) (limited to 'id/server/stork2-commons/src') diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java index c656f81ee..02db708c6 100644 --- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java +++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java @@ -31,7 +31,6 @@ public class ObjectFactory { private final static QName _QualityAuthenticationAssuranceLevel_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "QualityAuthenticationAssuranceLevel"); private final static QName _IsAcademicStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAcademicStaff"); private final static QName _MandateContent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandateContent"); - private final static QName _IsHealthCareProfessionalDeprecated_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional_deprecated"); private final static QName _CanonicalRegisteredAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalRegisteredAddress"); private final static QName _SpCountry_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spCountry"); private final static QName _IsAdminStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAdminStaff"); @@ -118,14 +117,6 @@ public class ObjectFactory { return new CanonicalAddressType(); } - /** - * Create an instance of {@link IsHealthCareProfessionalDeprecatedType } - * - */ - public IsHealthCareProfessionalDeprecatedType createIsHealthCareProfessionalDeprecatedType() { - return new IsHealthCareProfessionalDeprecatedType(); - } - /** * Create an instance of {@link MandateContentType } * @@ -230,14 +221,6 @@ public class ObjectFactory { return new TransactionLimitRestrictionType(); } - /** - * Create an instance of {@link IsHCPType } - * - */ - // public IsHCPType createIsHCPType() { - // return new IsHCPType(); - // } - /** * Create an instance of {@link JAXBElement }{@code <}{@link HabilitationType }{@code >} * @@ -301,15 +284,6 @@ public class ObjectFactory { return new JAXBElement(_MandateContent_QNAME, MandateContentType.class, null, value); } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalDeprecatedType }{@code >} - * - */ - @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional_deprecated") - public JAXBElement createIsHealthCareProfessionalDeprecated(IsHealthCareProfessionalDeprecatedType value) { - return new JAXBElement(_IsHealthCareProfessionalDeprecated_QNAME, IsHealthCareProfessionalDeprecatedType.class, null, value); - } - /** * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >} * diff --git a/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd index d1c782f52..6db304388 100644 --- a/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd +++ b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd @@ -1,15 +1,9 @@ - - - + + + - + @@ -21,10 +15,8 @@ - - + + @@ -35,11 +27,8 @@ - - + @@ -120,15 +109,12 @@ - + - - + + @@ -137,18 +123,15 @@ - + - - + + @@ -156,43 +139,37 @@ - + - + - + - + - + - + @@ -200,8 +177,7 @@ - + @@ -233,42 +209,39 @@ - - - - - - - - - - + + + + + + + + + + - + - - + - + - + - + @@ -291,24 +264,44 @@ - + - + - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + @@ -319,8 +312,7 @@ - + @@ -332,30 +324,57 @@ - + - + @@ -363,37 +382,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file -- cgit v1.2.3