From 0ba96b399d70eac60ece03f4e438125736169d5b Mon Sep 17 00:00:00 2001 From: Tobias Kellner Date: Tue, 27 Oct 2015 20:12:12 +0100 Subject: JavaDoc fixes --- .../gv/egiz/bku/online/applet/AppletBKUWorker.java | 2 +- .../egiz/bku/online/applet/AppletSecureViewer.java | 6 +- .../at/gv/egiz/bku/online/applet/BKUApplet.java | 4 - .../bku/online/applet/viewer/URLFontLoader.java | 4 +- .../egiz/bku/online/applet/ActivationApplet.java | 2 +- .../bku/online/applet/GetCertificateApplet.java | 2 +- .../bku/online/applet/GetCertificateBKUWorker.java | 2 +- .../egiz/bku/online/applet/HardwareInfoApplet.java | 2 +- .../bku/online/applet/HardwareInfoBKUWorker.java | 2 +- .../egiz/bku/online/applet/IdentityLinkApplet.java | 2 +- .../bku/online/applet/PINManagementApplet.java | 2 +- .../bku/online/applet/PINManagementBKUWorker.java | 2 +- .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java | 4 +- .../src/main/java/at/gv/egiz/bku/gui/BKUIcons.java | 2 +- .../at/gv/egiz/bku/gui/HashDataTableModel.java | 2 +- .../at/gv/egiz/bku/gui/HelpLinkFocusManager.java | 2 +- .../java/at/gv/egiz/bku/gui/HelpURLProvider.java | 2 +- .../main/java/at/gv/egiz/bku/gui/HelpViewer.java | 3 +- .../java/at/gv/egiz/bku/gui/HyperlinkRenderer.java | 2 +- .../main/java/at/gv/egiz/bku/gui/ImagePanel.java | 2 +- .../at/gv/egiz/bku/gui/SecureViewerDialog.java | 5 +- .../at/gv/egiz/bku/gui/WindowCloseAdapter.java | 2 +- .../egiz/bku/gui/html/RestrictedHTMLEditorKit.java | 2 +- .../gv/egiz/bku/gui/html/RestrictedImageView.java | 2 +- .../at/gv/egiz/bku/gui/viewer/FontProvider.java | 5 +- .../egiz/bku/gui/viewer/FontProviderException.java | 2 +- .../java/at/gv/egiz/bku/gui/DummyFontLoader.java | 2 +- .../java/at/gv/egiz/bku/gui/SimplePinInfo.java | 2 +- .../java/at/gv/egiz/bku/gui/ActivationGUI.java | 2 +- .../at/gv/egiz/bku/gui/ActivationGUIFacade.java | 2 +- .../main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java | 2 +- .../java/at/gv/egiz/bku/gui/GetCertificateGUI.java | 2 +- .../gv/egiz/bku/gui/GetCertificateGUIFacade.java | 2 +- .../at/gv/egiz/bku/gui/GetHardwareInfoGUI.java | 2 +- .../gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java | 2 +- .../java/at/gv/egiz/bku/gui/IdentityLinkGUI.java | 2 +- .../at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java | 2 +- .../java/at/gv/egiz/bku/gui/PINManagementGUI.java | 2 +- .../at/gv/egiz/bku/gui/PINManagementGUIFacade.java | 2 +- .../java/at/gv/egiz/bku/gui/PINStatusRenderer.java | 2 +- .../at/gv/egiz/bku/gui/PINStatusTableModel.java | 2 +- .../java/at/gv/egiz/bku/gui/DummyFontLoader.java | 2 +- .../java/at/gv/egiz/bku/gui/SimplePinInfo.java | 2 +- .../java/at/gv/egiz/bku/local/gui/GUIProxy.java | 2 +- .../gv/egiz/bku/local/gui/LocalHelpListener.java | 2 +- .../at/gv/egiz/bku/local/stal/LocalBKUWorker.java | 2 +- .../local/stal/LocalGetCertificateSTALFactory.java | 2 +- .../stal/LocalGetHardwareInfoSTALFactory.java | 2 +- .../gv/egiz/bku/local/stal/LocalSecureViewer.java | 6 +- .../bku/local/stal/LocalSignRequestHandler.java | 2 +- .../bku/local/webapp/GetCertificateServlet.java | 2 +- .../bku/local/webapp/GetHardwareInfoServlet.java | 2 +- .../egiz/bku/local/webapp/IdentityLinkServlet.java | 2 +- .../bku/local/webapp/PINManagementServlet.java | 2 +- .../stal/service/impl/STALRequestBrokerImpl.java | 6 +- .../stal/service/impl/STALXJAXBContextFactory.java | 2 +- .../java/at/gv/egiz/bku/webstart/Configurator.java | 3 +- .../java/at/gv/egiz/bku/webstart/Container.java | 12 +- .../egiz/bku/webstart/GetCertificateInvoker.java | 2 +- .../gv/egiz/bku/webstart/HardwareInfoInvoker.java | 2 +- .../gv/egiz/bku/webstart/IdentityLinkInvoker.java | 2 +- .../gv/egiz/bku/webstart/PINManagementInvoker.java | 2 +- .../main/java/at/gv/egiz/stal/ErrorResponse.java | 20 +- .../java/at/gv/egiz/stal/InfoboxReadRequest.java | 20 +- .../java/at/gv/egiz/stal/InfoboxReadResponse.java | 18 +- .../src/main/java/at/gv/egiz/stal/QuitRequest.java | 12 +- .../src/main/java/at/gv/egiz/stal/STALRequest.java | 12 +- .../main/java/at/gv/egiz/stal/STALResponse.java | 14 +- .../src/main/java/at/gv/egiz/stal/SignRequest.java | 102 +++++---- .../main/java/at/gv/egiz/stal/SignResponse.java | 18 +- .../main/java/at/gv/egiz/stal/StatusRequest.java | 12 +- .../main/java/at/gv/egiz/stal/StatusResponse.java | 14 +- .../signedinfo/CanonicalizationMethodType.java | 20 +- .../gv/egiz/stal/signedinfo/DigestMethodType.java | 20 +- .../at/gv/egiz/stal/signedinfo/ObjectFactory.java | 2 +- .../at/gv/egiz/stal/signedinfo/ReferenceType.java | 28 +-- .../egiz/stal/signedinfo/SignatureMethodType.java | 20 +- .../at/gv/egiz/stal/signedinfo/SignedInfoType.java | 24 +-- .../at/gv/egiz/stal/signedinfo/TransformsType.java | 18 +- .../at/gv/egiz/stal/ext/GetCertificateRequest.java | 2 +- .../gv/egiz/stal/ext/GetCertificateResponse.java | 2 +- .../gv/egiz/stal/ext/GetHardwareInfoRequest.java | 2 +- .../gv/egiz/stal/ext/GetHardwareInfoResponse.java | 2 +- .../at/gv/egiz/stal/ext/IdentityLinkRequest.java | 2 +- .../at/gv/egiz/stal/ext/IdentityLinkResponse.java | 2 +- .../at/gv/egiz/stal/ext/PINManagementRequest.java | 2 +- .../at/gv/egiz/stal/ext/PINManagementResponse.java | 2 +- .../stal/service/translator/STALTranslator.java | 6 +- .../service/translator/TranslationException.java | 6 +- .../egiz/stal/service/types/ErrorResponseType.java | 20 +- .../service/types/GetHashDataInputFaultType.java | 20 +- .../types/GetHashDataInputResponseType.java | 62 +++--- .../stal/service/types/GetHashDataInputType.java | 50 ++--- .../service/types/GetNextRequestResponseType.java | 29 ++- .../stal/service/types/GetNextRequestType.java | 29 ++- .../stal/service/types/InfoboxReadRequestType.java | 36 ++-- .../service/types/InfoboxReadResponseType.java | 18 +- .../egiz/stal/service/types/QuitRequestType.java | 12 +- .../at/gv/egiz/stal/service/types/RequestType.java | 12 +- .../gv/egiz/stal/service/types/ResponseType.java | 12 +- .../egiz/stal/service/types/SignRequestType.java | 104 ++++----- .../egiz/stal/service/types/SignResponseType.java | 18 +- .../egiz/stal/service/types/StatusRequestType.java | 12 +- .../stal/service/types/StatusResponseType.java | 14 +- .../namespaces/cardchannel/service/ATRType.java | 14 +- .../cardchannel/service/AttributeList.java | 18 +- .../cardchannel/service/AttributeType.java | 32 +-- .../cardchannel/service/CommandAPDUType.java | 18 +- .../namespaces/cardchannel/service/ResetType.java | 14 +- .../cardchannel/service/ResponseAPDUType.java | 18 +- .../cardchannel/service/ResponseType.java | 20 +- .../namespaces/cardchannel/service/ScriptType.java | 22 +- .../cardchannel/service/VerifyAPDUType.java | 26 +-- .../translator/STALXTranslationHandler.java | 2 +- .../stalx/service/ClientJAXBContextFactory.java | 2 +- .../bku/accesscontrol/config/AccessControl.java | 18 +- .../gv/egiz/bku/accesscontrol/config/Action.java | 34 +-- .../at/gv/egiz/bku/accesscontrol/config/Chain.java | 20 +- .../gv/egiz/bku/accesscontrol/config/Chains.java | 18 +- .../gv/egiz/bku/accesscontrol/config/Command.java | 20 +- .../at/gv/egiz/bku/accesscontrol/config/Param.java | 14 +- .../at/gv/egiz/bku/accesscontrol/config/Rule.java | 36 ++-- .../at/gv/egiz/bku/accesscontrol/config/Rules.java | 18 +- .../egiz/bku/binding/BindingProcessorManager.java | 2 - .../bku/binding/BindingProcessorManagerImpl.java | 4 +- .../at/gv/egiz/bku/binding/DataUrlResponse.java | 2 +- .../at/gv/egiz/bku/binding/FormParameterStore.java | 8 - .../egiz/bku/binding/HTTPBindingProcessorImpl.java | 2 +- .../egiz/bku/binding/HttpsDataURLConnection.java | 2 - .../java/at/gv/egiz/bku/binding/IdFactory.java | 2 +- .../gv/egiz/bku/slcommands/GetStatusCommand.java | 2 +- .../at/gv/egiz/bku/slcommands/GetStatusResult.java | 2 +- .../egiz/bku/slcommands/SLMarshallerFactory.java | 1 - .../java/at/gv/egiz/bku/slcommands/SLResult.java | 2 +- .../impl/CreateCMSSignatureResultImpl.java | 4 +- .../slcommands/impl/DataObjectHashDataInput.java | 2 +- .../bku/slcommands/impl/GetStatusCommandImpl.java | 2 +- .../bku/slcommands/impl/GetStatusResultImpl.java | 2 +- .../egiz/bku/slcommands/impl/InfoboxFactory.java | 2 +- .../at/gv/egiz/bku/slcommands/impl/STALHelper.java | 2 +- .../egiz/bku/slcommands/impl/xsect/DataObject.java | 2 +- .../slcommands/impl/xsect/IdValueFactoryImpl.java | 8 +- .../bku/slcommands/impl/xsect/STALPrivateKey.java | 7 +- .../egiz/bku/spring/ConfigurationFactoryBean.java | 2 +- .../at/gv/egiz/bku/viewer/ResourceFontLoader.java | 2 +- .../java/moaspss/generated/AllSignatoriesType.java | 10 +- .../java/moaspss/generated/AnyChildrenType.java | 18 +- .../java/moaspss/generated/CMSContentBaseType.java | 18 +- .../generated/CMSDataObjectOptionalMetaType.java | 20 +- .../generated/CanonicalizationMethodType.java | 20 +- .../java/moaspss/generated/CheckResultType.java | 20 +- .../java/moaspss/generated/ContentBaseType.java | 22 +- .../moaspss/generated/ContentExLocRefBaseType.java | 20 +- .../moaspss/generated/ContentOptionalRefType.java | 14 +- .../moaspss/generated/ContentRequiredRefType.java | 24 +-- .../CreateSignatureEnvironmentProfile.java | 20 +- .../generated/CreateSignatureLocationType.java | 14 +- .../generated/CreateTransformsInfoProfile.java | 20 +- .../generated/CreateXMLSignatureRequest.java | 12 +- .../generated/CreateXMLSignatureRequestType.java | 194 ++++++++--------- .../generated/CreateXMLSignatureResponseType.java | 58 ++--- .../java/moaspss/generated/DSAKeyValueType.java | 38 ++-- .../java/moaspss/generated/DataObjectInfoType.java | 68 +++--- .../java/moaspss/generated/DigestMethodType.java | 20 +- .../java/moaspss/generated/ErrorResponseType.java | 20 +- .../moaspss/generated/FinalDataMetaInfoType.java | 18 +- .../test/java/moaspss/generated/InputDataType.java | 30 +-- .../test/java/moaspss/generated/KeyInfoType.java | 34 +-- .../java/moaspss/generated/KeyStorageType.java | 12 +- .../test/java/moaspss/generated/KeyValueType.java | 22 +- .../generated/ManifestRefsCheckResultInfoType.java | 22 +- .../generated/ManifestRefsCheckResultType.java | 20 +- .../test/java/moaspss/generated/ManifestType.java | 20 +- .../test/java/moaspss/generated/MetaInfoType.java | 22 +- .../test/java/moaspss/generated/ObjectType.java | 24 +-- .../test/java/moaspss/generated/PGPDataType.java | 34 +-- .../moaspss/generated/PublicAuthorityType.java | 18 +- .../java/moaspss/generated/RSAKeyValueType.java | 20 +- .../test/java/moaspss/generated/ReferenceType.java | 28 +-- .../generated/ReferencesCheckResultInfoType.java | 20 +- .../generated/ReferencesCheckResultType.java | 20 +- .../moaspss/generated/RetrievalMethodType.java | 22 +- .../test/java/moaspss/generated/SPKIDataType.java | 20 +- .../moaspss/generated/SignatureMethodType.java | 22 +- .../moaspss/generated/SignaturePropertiesType.java | 20 +- .../moaspss/generated/SignaturePropertyType.java | 22 +- .../test/java/moaspss/generated/SignatureType.java | 26 +-- .../java/moaspss/generated/SignatureValueType.java | 14 +- .../java/moaspss/generated/SignedInfoType.java | 24 +-- .../moaspss/generated/TransformParameterType.java | 64 +++--- .../test/java/moaspss/generated/TransformType.java | 22 +- .../java/moaspss/generated/TransformsInfoType.java | 20 +- .../java/moaspss/generated/TransformsType.java | 18 +- .../generated/VerifyCMSSignatureRequest.java | 14 +- .../generated/VerifyCMSSignatureRequestType.java | 24 +-- .../generated/VerifyCMSSignatureResponseType.java | 22 +- .../generated/VerifyTransformsDataType.java | 20 +- .../generated/VerifyTransformsInfoProfile.java | 20 +- .../generated/VerifyXMLSignatureRequestType.java | 118 +++++----- .../generated/VerifyXMLSignatureResponseType.java | 30 +-- .../test/java/moaspss/generated/X509DataType.java | 32 +-- .../moaspss/generated/X509IssuerSerialType.java | 20 +- .../java/moaspss/generated/XMLContentType.java | 14 +- .../generated/XMLDataObjectAssociationType.java | 20 +- .../at/gv/egiz/smcc/PINConfirmationException.java | 2 +- .../java/at/gv/egiz/smcc/PINFormatException.java | 2 +- .../gv/egiz/smcc/PINOperationAbortedException.java | 2 +- .../main/java/at/gv/egiz/smcc/SignatureCard.java | 4 +- .../at/gv/egiz/smcc/conf/SMCCConfiguration.java | 2 +- .../at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java | 4 +- .../main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java | 3 +- .../java/at/gv/egiz/smcc/pin/gui/PINProvider.java | 4 +- .../java/at/gv/egiz/smcc/reader/CardReader.java | 2 +- .../at/gv/egiz/smcc/reader/DefaultCardReader.java | 2 +- .../at/gv/egiz/smcc/reader/PinpadCardReader.java | 2 +- .../java/at/gv/egiz/smcc/reader/ReaderFactory.java | 2 +- .../at/gv/egiz/smcc/util/LinuxLibraryFinder.java | 4 +- .../java/org/openecard/scio/osx/PlatformPCSC.java | 4 +- .../java/org/openecard/scio/osx/SunOSXPCSC.java | 8 +- .../java/org/openecard/scio/osx/package-info.java | 2 +- .../gv/egiz/bku/pin/gui/AbstractPINProvider.java | 2 +- .../java/at/gv/egiz/bku/pin/gui/SignPINGUI.java | 2 +- .../at/gv/egiz/bku/pin/gui/SignPINProvider.java | 2 +- .../java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java | 2 +- .../at/gv/egiz/bku/pin/gui/VerifyPINProvider.java | 2 +- .../at/gv/egiz/bku/smccstal/AbstractBKUWorker.java | 4 +- .../java/at/gv/egiz/bku/smccstal/SecureViewer.java | 6 +- .../gv/egiz/bku/smccstal/StatusRequestHandler.java | 2 +- .../bku/smccstal/GetCertificateRequestHandler.java | 2 +- .../smccstal/GetHardwareInfoRequestHandler.java | 2 +- .../bku/smccstal/IdentityLinkRequestHandler.java | 2 +- .../bku/smccstal/PINManagementRequestHandler.java | 2 +- .../namespaces/cardchannel/ATRType.java | 14 +- .../namespaces/cardchannel/AttributeList.java | 18 +- .../namespaces/cardchannel/AttributeType.java | 32 +-- .../namespaces/cardchannel/CommandAPDUType.java | 18 +- .../namespaces/cardchannel/ObjectFactory.java | 4 +- .../namespaces/cardchannel/ResetType.java | 14 +- .../namespaces/cardchannel/ResponseAPDUType.java | 18 +- .../namespaces/cardchannel/ResponseType.java | 20 +- .../namespaces/cardchannel/ScriptType.java | 22 +- .../namespaces/cardchannel/VerifyAPDUType.java | 26 +-- .../_20020506_/CompressedIdentityLinkType.java | 34 +-- .../securitylayer/_1_2_3/APDUATRType.java | 14 +- .../securitylayer/_1_2_3/APDUResponseElement.java | 20 +- .../_1_2_3/AccessAuthorizationType.java | 20 +- .../securitylayer/_1_2_3/AllSignatoriesType.java | 10 +- .../securitylayer/_1_2_3/AnyChildrenType.java | 18 +- .../securitylayer/_1_2_3/AnyMixedChildrenType.java | 18 +- .../_1_2_3/ApplicationIdentifierType.java | 14 +- .../_1_2_3/AuthenticationClassType.java | 16 +- .../securitylayer/_1_2_3/Base64ContentType.java | 18 +- .../_1_2_3/Base64OptRefContentType.java | 14 +- .../securitylayer/_1_2_3/Base64XMLContentType.java | 20 +- .../_1_2_3/Base64XMLLocRefContentType.java | 22 +- .../_1_2_3/Base64XMLLocRefOptRefContentType.java | 14 +- .../_1_2_3/Base64XMLLocRefReqRefContentType.java | 14 +- .../_1_2_3/Base64XMLOptRefContentType.java | 14 +- .../securitylayer/_1_2_3/BindingType.java | 14 +- .../securitylayer/_1_2_3/BulkRequestType.java | 224 +++++++++---------- .../securitylayer/_1_2_3/BulkResponseType.java | 224 +++++++++---------- .../_1_2_3/CMSDataObjectOptionalMetaType.java | 22 +- .../_1_2_3/CMSDataObjectRequiredMetaType.java | 22 +- .../_1_2_3/CMSEncryptedContentType.java | 20 +- .../_1_2_3/CMSRecipientPublicKeyType.java | 18 +- .../securitylayer/_1_2_3/CMSToBeEncryptedType.java | 20 +- .../securitylayer/_1_2_3/CardActionElement.java | 18 +- .../_1_2_3/CardActionResponseType.java | 18 +- .../securitylayer/_1_2_3/CardActionType.java | 16 +- .../securitylayer/_1_2_3/CardChannelRequest.java | 18 +- .../securitylayer/_1_2_3/CardChannelResponse.java | 18 +- .../_1_2_3/CardManagementRequest.java | 18 +- .../_1_2_3/CardManagementResponse.java | 18 +- .../securitylayer/_1_2_3/CheckResultType.java | 20 +- .../securitylayer/_1_2_3/CommandAPDUType.java | 18 +- .../_1_2_3/CreateCMSSignatureRequestType.java | 38 ++-- .../_1_2_3/CreateCMSSignatureResponseType.java | 18 +- .../_1_2_3/CreateHashInfoRequestType.java | 24 +-- .../_1_2_3/CreateHashInfoResponseType.java | 24 +-- .../_1_2_3/CreateHashRequestType.java | 18 +- .../_1_2_3/CreateHashResponseType.java | 18 +- .../_1_2_3/CreateXMLSignatureRequestType.java | 22 +- .../_1_2_3/CreateXMLSignatureResponseType.java | 18 +- .../_1_2_3/DataObjectAssociationType.java | 20 +- .../securitylayer/_1_2_3/DataObjectInfoType.java | 38 ++-- .../_1_2_3/DecryptCMSRequestType.java | 22 +- .../_1_2_3/DecryptCMSResponseType.java | 18 +- .../_1_2_3/DecryptXMLRequestType.java | 24 +-- .../_1_2_3/DecryptXMLResponseType.java | 58 ++--- .../_1_2_3/EncryptCMSRequestType.java | 22 +- .../_1_2_3/EncryptCMSResponseType.java | 18 +- .../securitylayer/_1_2_3/EncryptXMLRequest.java | 12 +- .../_1_2_3/EncryptXMLRequestType.java | 22 +- .../_1_2_3/EncryptXMLResponseType.java | 58 ++--- .../securitylayer/_1_2_3/EncryptedDataType.java | 14 +- .../securitylayer/_1_2_3/EncryptionInfoType.java | 56 ++--- .../securitylayer/_1_2_3/ErrorResponseType.java | 20 +- .../_1_2_3/ExcludedByteRangeType.java | 20 +- .../securitylayer/_1_2_3/GetPropertiesRequest.java | 12 +- .../_1_2_3/GetPropertiesRequestType.java | 12 +- .../_1_2_3/GetPropertiesResponseType.java | 28 +-- .../securitylayer/_1_2_3/GetStatusRequestType.java | 20 +- .../_1_2_3/GetStatusResponseType.java | 18 +- .../securitylayer/_1_2_3/HashDataType.java | 20 +- .../_1_2_3/InfoboxAssocArrayPairType.java | 14 +- .../_1_2_3/InfoboxAvailableRequestType.java | 12 +- .../_1_2_3/InfoboxAvailableResponseType.java | 18 +- .../_1_2_3/InfoboxCreateRequestType.java | 32 +-- .../_1_2_3/InfoboxCreateResponseType.java | 12 +- .../_1_2_3/InfoboxDeleteRequestType.java | 18 +- .../_1_2_3/InfoboxDeleteResponseType.java | 12 +- .../_1_2_3/InfoboxReadDataAssocArrayType.java | 28 +-- .../_1_2_3/InfoboxReadParamsAssocArrayType.java | 128 +++++------ .../_1_2_3/InfoboxReadParamsBinaryFileType.java | 14 +- .../_1_2_3/InfoboxReadRequestType.java | 28 +-- .../_1_2_3/InfoboxReadResponseType.java | 20 +- .../securitylayer/_1_2_3/InfoboxTypeType.java | 12 +- .../_1_2_3/InfoboxUpdateParamsAssocArrayType.java | 86 ++++---- .../_1_2_3/InfoboxUpdateRequestType.java | 28 +-- .../_1_2_3/InfoboxUpdateResponseType.java | 12 +- .../_1_2_3/ManifestRefsCheckResultInfoType.java | 22 +- .../_1_2_3/ManifestRefsCheckResultType.java | 20 +- .../securitylayer/_1_2_3/MetaInfoType.java | 22 +- .../_1_2_3/NullOperationRequestType.java | 12 +- .../_1_2_3/NullOperationResponseType.java | 12 +- .../_1_2_3/QualifiedBoxIdentifierType.java | 16 +- .../_1_2_3/ReferencesCheckResultInfoType.java | 20 +- .../_1_2_3/ReferencesCheckResultType.java | 20 +- .../securitylayer/_1_2_3/RequesterIDType.java | 14 +- .../securitylayer/_1_2_3/ResetColdType.java | 12 +- .../namespaces/securitylayer/_1_2_3/ResetType.java | 14 +- .../securitylayer/_1_2_3/ResponseAPDUType.java | 18 +- .../securitylayer/_1_2_3/ResultApplElement.java | 20 +- .../securitylayer/_1_2_3/ResultElement.java | 20 +- .../securitylayer/_1_2_3/ReturnResultType.java | 14 +- .../securitylayer/_1_2_3/ScriptElement.java | 20 +- .../_1_2_3/SignatureInfoCreationType.java | 52 ++--- .../_1_2_3/SignatureInfoVerificationType.java | 20 +- .../securitylayer/_1_2_3/ToBeEncryptedType.java | 90 ++++---- .../securitylayer/_1_2_3/TokenStatusType.java | 12 +- .../securitylayer/_1_2_3/TransformsInfoType.java | 20 +- .../_1_2_3/UserConfirmationSimpleType.java | 16 +- .../securitylayer/_1_2_3/UserConfirmationType.java | 14 +- .../_1_2_3/VerificationResultType.java | 20 +- .../_1_2_3/VerifyCMSSignatureRequestType.java | 24 +-- .../_1_2_3/VerifyCMSSignatureResponseType.java | 22 +- .../_1_2_3/VerifyHashInfoRequestType.java | 24 +-- .../_1_2_3/VerifyHashRequestType.java | 18 +- .../_1_2_3/VerifyHashResponseType.java | 18 +- .../_1_2_3/VerifyXMLSignatureRequestType.java | 22 +- .../_1_2_3/VerifyXMLSignatureResponseType.java | 26 +-- .../securitylayer/_1_2_3/XMLContentType.java | 14 +- .../_1_2_3/XMLRecipientPublicKeyType.java | 20 +- .../_1_2_3/XMLToBeEncryptedNewContentType.java | 14 +- .../_1_2_3/XMLToBeEncryptedNewType.java | 24 +-- .../_20020225_/ErrorResponseType.java | 20 +- .../persondata/_20020228_/AbstractAddressType.java | 22 +- .../persondata/_20020228_/AbstractPersonType.java | 22 +- .../persondata/_20020228_/CorporateBodyType.java | 30 +-- .../_20020228_/DefinedAlternativeNameTypeType.java | 18 +- .../persondata/_20020228_/DefinedRelationType.java | 26 +-- .../persondata/_20020228_/IdentificationType.java | 58 ++--- .../persondata/_20020228_/InternetAddressType.java | 24 +-- .../persondata/_20020228_/MaritalStatusType.java | 16 +- .../_20020228_/MobileTelcomNumberType.java | 14 +- .../persondata/_20020228_/PersonDataType.java | 64 +++--- .../persondata/_20020228_/PersonNameType.java | 240 ++++++++++----------- .../persondata/_20020228_/PhysicalPersonType.java | 112 +++++----- .../persondata/_20020228_/PostalAddressType.java | 164 +++++++------- .../namespace/persondata/_20020228_/SexType.java | 14 +- .../_20020228_/TelcomNumberListType.java | 26 +-- .../persondata/_20020228_/TelcomNumberType.java | 20 +- .../_20020228_/TelephoneAddressType.java | 24 +-- .../_20020228_/TypedPostalAddressType.java | 24 +-- .../gv/egiz/bku/utils/URLEncodingOutputStream.java | 2 +- .../utils/urldereferencer/URIResolverAdapter.java | 9 +- .../at/gv/egiz/idlink/IdentityLinkFactory.java | 6 - .../java/at/gv/egiz/marshal/MarshallerFactory.java | 2 +- .../gv/egiz/marshal/NamespacePrefixMapperImpl.java | 2 +- .../at/gv/egiz/slbinding/RedirectEventFilter.java | 9 +- .../ReportingValidationEventHandler.java | 2 +- .../names/tc/saml/_1_0/assertion/ActionType.java | 14 +- .../names/tc/saml/_1_0/assertion/AdviceType.java | 22 +- .../names/tc/saml/_1_0/assertion/AnyType.java | 18 +- .../tc/saml/_1_0/assertion/AssertionType.java | 46 ++-- .../_1_0/assertion/AttributeDesignatorType.java | 16 +- .../_1_0/assertion/AttributeStatementType.java | 18 +- .../tc/saml/_1_0/assertion/AttributeType.java | 18 +- .../AudienceRestrictionConditionType.java | 18 +- .../assertion/AuthenticationStatementType.java | 24 +-- .../saml/_1_0/assertion/AuthorityBindingType.java | 18 +- .../AuthorizationDecisionStatementType.java | 24 +-- .../saml/_1_0/assertion/ConditionAbstractType.java | 12 +- .../tc/saml/_1_0/assertion/ConditionsType.java | 24 +-- .../names/tc/saml/_1_0/assertion/DecisionType.java | 14 +- .../names/tc/saml/_1_0/assertion/EvidenceType.java | 20 +- .../tc/saml/_1_0/assertion/NameIdentifierType.java | 16 +- .../saml/_1_0/assertion/StatementAbstractType.java | 12 +- .../_1_0/assertion/SubjectConfirmationType.java | 22 +- .../saml/_1_0/assertion/SubjectLocalityType.java | 16 +- .../assertion/SubjectStatementAbstractType.java | 18 +- .../names/tc/saml/_1_0/assertion/SubjectType.java | 26 +-- .../java/org/etsi/uri/_01903/v1_1/AnyType.java | 18 +- .../etsi/uri/_01903/v1_1/CRLIdentifierType.java | 24 +-- .../java/org/etsi/uri/_01903/v1_1/CRLRefType.java | 20 +- .../java/org/etsi/uri/_01903/v1_1/CRLRefsType.java | 18 +- .../org/etsi/uri/_01903/v1_1/CRLValuesType.java | 18 +- .../org/etsi/uri/_01903/v1_1/CertIDListType.java | 18 +- .../java/org/etsi/uri/_01903/v1_1/CertIDType.java | 20 +- .../uri/_01903/v1_1/CertificateValuesType.java | 22 +- .../uri/_01903/v1_1/CertifiedRolesListType.java | 18 +- .../etsi/uri/_01903/v1_1/ClaimedRolesListType.java | 18 +- .../_01903/v1_1/CommitmentTypeIndicationType.java | 28 +-- .../v1_1/CommitmentTypeQualifiersListType.java | 18 +- .../_01903/v1_1/CompleteCertificateRefsType.java | 20 +- .../_01903/v1_1/CompleteRevocationRefsType.java | 24 +-- .../etsi/uri/_01903/v1_1/CounterSignatureType.java | 18 +- .../etsi/uri/_01903/v1_1/DataObjectFormatType.java | 26 +-- .../uri/_01903/v1_1/DigestAlgAndValueType.java | 20 +- .../_01903/v1_1/DocumentationReferencesType.java | 18 +- .../uri/_01903/v1_1/EncapsulatedPKIDataType.java | 14 +- .../org/etsi/uri/_01903/v1_1/HashDataInfoType.java | 20 +- .../org/etsi/uri/_01903/v1_1/IdentifierType.java | 14 +- .../org/etsi/uri/_01903/v1_1/IntegerListType.java | 18 +- .../etsi/uri/_01903/v1_1/NoticeReferenceType.java | 20 +- .../etsi/uri/_01903/v1_1/OCSPIdentifierType.java | 22 +- .../java/org/etsi/uri/_01903/v1_1/OCSPRefType.java | 20 +- .../org/etsi/uri/_01903/v1_1/OCSPRefsType.java | 18 +- .../org/etsi/uri/_01903/v1_1/OCSPValuesType.java | 18 +- .../etsi/uri/_01903/v1_1/ObjectIdentifierType.java | 22 +- .../uri/_01903/v1_1/OtherCertStatusRefsType.java | 18 +- .../uri/_01903/v1_1/OtherCertStatusValuesType.java | 18 +- .../org/etsi/uri/_01903/v1_1/QualifierType.java | 12 +- .../v1_1/QualifyingPropertiesReferenceType.java | 22 +- .../uri/_01903/v1_1/QualifyingPropertiesType.java | 24 +-- .../etsi/uri/_01903/v1_1/RevocationValuesType.java | 24 +-- .../org/etsi/uri/_01903/v1_1/SPUserNoticeType.java | 20 +- .../_01903/v1_1/SigPolicyQualifiersListType.java | 18 +- .../uri/_01903/v1_1/SignaturePolicyIdType.java | 24 +-- .../_01903/v1_1/SignaturePolicyIdentifierType.java | 46 ++-- .../_01903/v1_1/SignatureProductionPlaceType.java | 24 +-- .../v1_1/SignedDataObjectPropertiesType.java | 24 +-- .../etsi/uri/_01903/v1_1/SignedPropertiesType.java | 22 +- .../_01903/v1_1/SignedSignaturePropertiesType.java | 26 +-- .../org/etsi/uri/_01903/v1_1/SignerRoleType.java | 20 +- .../org/etsi/uri/_01903/v1_1/TimeStampType.java | 26 +-- .../v1_1/UnsignedDataObjectPropertiesType.java | 18 +- .../uri/_01903/v1_1/UnsignedPropertiesType.java | 22 +- .../v1_1/UnsignedSignaturePropertiesType.java | 38 ++-- .../java/org/etsi/uri/_01903/v1_3/AnyType.java | 20 +- .../etsi/uri/_01903/v1_3/CRLIdentifierType.java | 24 +-- .../java/org/etsi/uri/_01903/v1_3/CRLRefType.java | 20 +- .../java/org/etsi/uri/_01903/v1_3/CRLRefsType.java | 18 +- .../org/etsi/uri/_01903/v1_3/CRLValuesType.java | 18 +- .../org/etsi/uri/_01903/v1_3/CertIDListType.java | 18 +- .../java/org/etsi/uri/_01903/v1_3/CertIDType.java | 22 +- .../uri/_01903/v1_3/CertificateValuesType.java | 22 +- .../uri/_01903/v1_3/CertifiedRolesListType.java | 18 +- .../etsi/uri/_01903/v1_3/ClaimedRolesListType.java | 18 +- .../_01903/v1_3/CommitmentTypeIndicationType.java | 28 +-- .../v1_3/CommitmentTypeQualifiersListType.java | 18 +- .../_01903/v1_3/CompleteCertificateRefsType.java | 20 +- .../_01903/v1_3/CompleteRevocationRefsType.java | 24 +-- .../etsi/uri/_01903/v1_3/CounterSignatureType.java | 18 +- .../etsi/uri/_01903/v1_3/DataObjectFormatType.java | 26 +-- .../uri/_01903/v1_3/DigestAlgAndValueType.java | 20 +- .../_01903/v1_3/DocumentationReferencesType.java | 18 +- .../uri/_01903/v1_3/EncapsulatedPKIDataType.java | 16 +- .../etsi/uri/_01903/v1_3/GenericTimeStampType.java | 36 ++-- .../org/etsi/uri/_01903/v1_3/IdentifierType.java | 14 +- .../java/org/etsi/uri/_01903/v1_3/IncludeType.java | 16 +- .../org/etsi/uri/_01903/v1_3/IntegerListType.java | 18 +- .../etsi/uri/_01903/v1_3/NoticeReferenceType.java | 20 +- .../etsi/uri/_01903/v1_3/OCSPIdentifierType.java | 22 +- .../java/org/etsi/uri/_01903/v1_3/OCSPRefType.java | 20 +- .../org/etsi/uri/_01903/v1_3/OCSPRefsType.java | 18 +- .../org/etsi/uri/_01903/v1_3/OCSPValuesType.java | 18 +- .../etsi/uri/_01903/v1_3/ObjectIdentifierType.java | 22 +- .../uri/_01903/v1_3/OtherCertStatusRefsType.java | 18 +- .../uri/_01903/v1_3/OtherCertStatusValuesType.java | 18 +- .../etsi/uri/_01903/v1_3/OtherTimeStampType.java | 30 +-- .../org/etsi/uri/_01903/v1_3/QualifierType.java | 12 +- .../v1_3/QualifyingPropertiesReferenceType.java | 16 +- .../uri/_01903/v1_3/QualifyingPropertiesType.java | 24 +-- .../etsi/uri/_01903/v1_3/ReferenceInfoType.java | 24 +-- .../org/etsi/uri/_01903/v1_3/ResponderIDType.java | 20 +- .../etsi/uri/_01903/v1_3/RevocationValuesType.java | 24 +-- .../org/etsi/uri/_01903/v1_3/SPUserNoticeType.java | 20 +- .../_01903/v1_3/SigPolicyQualifiersListType.java | 18 +- .../uri/_01903/v1_3/SignaturePolicyIdType.java | 24 +-- .../_01903/v1_3/SignaturePolicyIdentifierType.java | 20 +- .../_01903/v1_3/SignatureProductionPlaceType.java | 24 +-- .../v1_3/SignedDataObjectPropertiesType.java | 26 +-- .../etsi/uri/_01903/v1_3/SignedPropertiesType.java | 22 +- .../_01903/v1_3/SignedSignaturePropertiesType.java | 28 +-- .../org/etsi/uri/_01903/v1_3/SignerRoleType.java | 20 +- .../v1_3/UnsignedDataObjectPropertiesType.java | 20 +- .../uri/_01903/v1_3/UnsignedPropertiesType.java | 22 +- .../v1_3/UnsignedSignaturePropertiesType.java | 46 ++-- .../etsi/uri/_01903/v1_3/XAdESTimeStampType.java | 30 +-- .../etsi/uri/_01903/v1_4/ValidationDataType.java | 24 +-- .../_09/xmldsig_/CanonicalizationMethodType.java | 20 +- .../org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java | 38 ++-- .../w3/_2000/_09/xmldsig_/DigestMethodType.java | 20 +- .../org/w3/_2000/_09/xmldsig_/KeyInfoType.java | 34 +-- .../org/w3/_2000/_09/xmldsig_/KeyValueType.java | 22 +- .../org/w3/_2000/_09/xmldsig_/ManifestType.java | 20 +- .../java/org/w3/_2000/_09/xmldsig_/ObjectType.java | 24 +-- .../org/w3/_2000/_09/xmldsig_/PGPDataType.java | 34 +-- .../org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java | 20 +- .../org/w3/_2000/_09/xmldsig_/ReferenceType.java | 28 +-- .../w3/_2000/_09/xmldsig_/RetrievalMethodType.java | 22 +- .../org/w3/_2000/_09/xmldsig_/SPKIDataType.java | 20 +- .../w3/_2000/_09/xmldsig_/SignatureMethodType.java | 22 +- .../_09/xmldsig_/SignaturePropertiesType.java | 20 +- .../_2000/_09/xmldsig_/SignaturePropertyType.java | 22 +- .../org/w3/_2000/_09/xmldsig_/SignatureType.java | 26 +-- .../w3/_2000/_09/xmldsig_/SignatureValueType.java | 14 +- .../org/w3/_2000/_09/xmldsig_/SignedInfoType.java | 24 +-- .../org/w3/_2000/_09/xmldsig_/TransformType.java | 22 +- .../org/w3/_2000/_09/xmldsig_/TransformsType.java | 18 +- .../org/w3/_2000/_09/xmldsig_/X509DataType.java | 32 +-- .../_2000/_09/xmldsig_/X509IssuerSerialType.java | 20 +- .../_04/xmldsig_more_/BasePointParamsType.java | 22 +- .../_04/xmldsig_more_/CharTwoFieldElemType.java | 14 +- .../_04/xmldsig_more_/CharTwoFieldParamsType.java | 18 +- .../_2001/_04/xmldsig_more_/CurveParamsType.java | 22 +- .../_2001/_04/xmldsig_more_/DomainParamsType.java | 50 ++--- .../_2001/_04/xmldsig_more_/ECDSAKeyValueType.java | 20 +- .../w3/_2001/_04/xmldsig_more_/ECPointType.java | 20 +- .../_04/xmldsig_more_/ExplicitParamsType.java | 22 +- .../w3/_2001/_04/xmldsig_more_/FieldElemType.java | 12 +- .../_2001/_04/xmldsig_more_/FieldParamsType.java | 12 +- .../OddCharExtensionFieldElemType.java | 14 +- .../OddCharExtensionFieldParamsType.java | 20 +- .../_04/xmldsig_more_/PnBFieldParamsType.java | 22 +- .../_04/xmldsig_more_/PrimeFieldElemType.java | 14 +- .../_04/xmldsig_more_/PrimeFieldParamsType.java | 18 +- .../_04/xmldsig_more_/TnBFieldParamsType.java | 18 +- utils/src/test/java/cardchannel/UnmarshalTest.java | 2 +- .../test/java/saml/KeyValueAttributeTypeTest.java | 2 +- 541 files changed, 5298 insertions(+), 5333 deletions(-) diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java index 8bbe4dbe..67c3f9af 100644 --- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java +++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletBKUWorker.java @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class AppletBKUWorker extends AbstractBKUWorker implements Runnable { diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java index 3b9ee1d2..b2c084bd 100644 --- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java +++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletSecureViewer.java @@ -50,7 +50,7 @@ import at.gv.egiz.stal.signedinfo.SignedInfoType; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class AppletSecureViewer implements SecureViewer { @@ -79,11 +79,9 @@ public class AppletSecureViewer implements SecureViewer { /** * retrieves the data to be signed for - * @param signedReferences + * @param signedInfo * @param okListener * @param okCommand - * @param cancelListener - * @param cancelCommand * @throws java.security.DigestException * @throws java.lang.Exception */ diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java index 46ee4102..bde6f5be 100644 --- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java +++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java @@ -332,7 +332,6 @@ public class BKUApplet extends JApplet { * STALTranslator) * * @return - * @throws java.net.MalformedURLException */ public STALTranslator getSTALTranslator() { return new STALTranslator(); @@ -340,9 +339,6 @@ public class BKUApplet extends JApplet { /** * Callback for BKUWorker to keep applet context out of BKUWorker - * - * @return - * @throws java.net.MalformedURLException */ protected void sendRedirect() { try { diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java index c2f89150..cdc8481d 100644 --- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java +++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/viewer/URLFontLoader.java @@ -41,7 +41,7 @@ import at.gv.egiz.bku.gui.viewer.FontProviderException; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class URLFontLoader extends SwingWorker implements FontProvider { @@ -68,7 +68,7 @@ public class URLFontLoader extends SwingWorker implements FontProv /** * waits for loadInBackground to finish * @return the font loaded in loadInbackground - * @throws Exception + * @throws FontProviderException */ @Override public Font getFont() throws FontProviderException { diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java index 99b2765e..11746e80 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java @@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class ActivationApplet extends BKUApplet { diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java index 2674ea8f..346d65e4 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java @@ -35,7 +35,7 @@ import at.gv.egiz.bku.gui.viewer.FontProvider; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetCertificateApplet extends BKUApplet { diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java index adf5fd81..f05cccc4 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java @@ -42,7 +42,7 @@ import at.gv.egiz.stal.ext.GetCertificateResponse; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetCertificateBKUWorker extends AppletBKUWorker { diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoApplet.java index 1678bd73..44cd1d66 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoApplet.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoApplet.java @@ -35,7 +35,7 @@ import at.gv.egiz.bku.gui.viewer.FontProvider; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class HardwareInfoApplet extends BKUApplet { diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java index 60dd94d3..617b1612 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java @@ -42,7 +42,7 @@ import at.gv.egiz.stal.ext.GetHardwareInfoResponse; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class HardwareInfoBKUWorker extends AppletBKUWorker { diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkApplet.java index 75c7c8eb..94a1e04b 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkApplet.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/IdentityLinkApplet.java @@ -36,7 +36,7 @@ import at.gv.egiz.bku.gui.viewer.FontProvider; /** * - * @author Andreas Fitzek + * @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> */ public class IdentityLinkApplet extends BKUApplet { private static final long serialVersionUID = 1L; diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementApplet.java index cff2c5c5..b15a56cb 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementApplet.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementApplet.java @@ -35,7 +35,7 @@ import java.util.Locale; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINManagementApplet extends BKUApplet { diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java index dc867897..8cb366c2 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * This BKU Worker does not connect to STAL webservice * (no Internet connection permitted while activating PINs). * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINManagementBKUWorker extends AppletBKUWorker { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java index 111c73a1..82513a0e 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java @@ -1749,11 +1749,11 @@ public class BKUGUIImpl implements BKUGUIFacade { // ////////////////////////////////////////////////////////////////////////// /** - * @param signedReferences + * @param dataToBeSigned * @param backListener * gets notified if pin-dialog has to be redrawn * (signedRefencesList returns via BACK button) - * @param okCommand + * @param backCommand */ @Override public void showSecureViewer(final List dataToBeSigned, diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUIcons.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUIcons.java index f8bba7f4..ff1d5463 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUIcons.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUIcons.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class BKUIcons { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java index 44eb7cbf..a9523054 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HashDataTableModel.java @@ -30,7 +30,7 @@ import javax.swing.table.DefaultTableModel; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ class HashDataTableModel extends DefaultTableModel { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpLinkFocusManager.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpLinkFocusManager.java index ad919146..751adf27 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpLinkFocusManager.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpLinkFocusManager.java @@ -41,7 +41,7 @@ import javax.swing.text.StyleConstants; /** * - * @author Thomas Zefferer + * @author Thomas Zefferer <thomas.zefferer@iaik.tugraz.at> */ public final class HelpLinkFocusManager extends KeyAdapter { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpURLProvider.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpURLProvider.java index b35aea84..f8b992ae 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpURLProvider.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpURLProvider.java @@ -30,7 +30,7 @@ package at.gv.egiz.bku.gui; * Make current context dependent help topic available (outside the applet). * Updated by the GUI whenever the current help topic changes. * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface HelpURLProvider { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java index bd016bca..af5d38e6 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class HelpViewer extends JDialog implements ActionListener { @@ -73,7 +73,6 @@ public class HelpViewer extends JDialog * * @param ctx external links are opened via ctx.showDocument() * @param helpURL - * @param helpTopic * @param messages */ public static void showHelpDialog(AppletContext ctx, diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java index a861dafa..a2a4479e 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HyperlinkRenderer.java @@ -30,7 +30,7 @@ import javax.swing.table.DefaultTableCellRenderer; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class HyperlinkRenderer extends DefaultTableCellRenderer { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java index 87845123..7c4d7eb4 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ImagePanel.java @@ -34,7 +34,7 @@ import javax.swing.JPanel; /** * paints the background image in the lower left corner of the component * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class ImagePanel extends JPanel { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java index 45f68a5d..b3c1c69d 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java @@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class SecureViewerDialog extends JDialog { @@ -245,9 +245,6 @@ public class SecureViewerDialog extends JDialog { * Sets the hashdataInput to be displayed and makes the dialog visible. * This method blocks until the dialog's close button is pressed. * - * @param mimeType defaults to text/plain if null - * @param encoding must be null if document contains charset declaration (e.g. HTML page), otherwise the parser crashes - * @param hashDataInput */ public void setContent(HashDataInput hashDataInput) { //throws FontProviderException { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/WindowCloseAdapter.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/WindowCloseAdapter.java index 15fad038..dedeab39 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/WindowCloseAdapter.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/WindowCloseAdapter.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class WindowCloseAdapter extends WindowAdapter { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedHTMLEditorKit.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedHTMLEditorKit.java index 60f0e136..09cdec26 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedHTMLEditorKit.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedHTMLEditorKit.java @@ -33,7 +33,7 @@ import javax.swing.text.html.HTMLEditorKit; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class RestrictedHTMLEditorKit extends HTMLEditorKit { diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java index 2b633139..e3cf2e59 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/html/RestrictedImageView.java @@ -30,7 +30,7 @@ import javax.swing.text.html.ImageView; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ /** * ImageViewer.refreshImage() (and loadImage()) is private :-( diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProvider.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProvider.java index 49a72edb..fe597704 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProvider.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProvider.java @@ -29,7 +29,7 @@ import java.awt.Font; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface FontProvider { @@ -40,8 +40,7 @@ public interface FontProvider { /** * * @return - * @throws InterruptedException - * @throws FileNotFoundException if remote font file cannot be retrieved + * @throws FontProviderException if remote font file cannot be retrieved */ Font getFont() throws FontProviderException; diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProviderException.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProviderException.java index b7d64ca5..1a0ba96b 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProviderException.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/viewer/FontProviderException.java @@ -27,7 +27,7 @@ package at.gv.egiz.bku.gui.viewer; /** * Encapsulates the reason why a font could not be loaded. - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class FontProviderException extends Exception { diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java index 11601878..b99d2e6d 100644 --- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java +++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class DummyFontLoader implements FontProvider { diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SimplePinInfo.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SimplePinInfo.java index 1d23d169..5cf392d4 100644 --- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SimplePinInfo.java +++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SimplePinInfo.java @@ -30,7 +30,7 @@ import java.util.Locale; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class SimplePinInfo extends PinInfo { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java index a37d73b9..2702c0d2 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class ActivationGUI extends CardMgmtGUI implements ActivationGUIFacade { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java index 07caf539..6a57d190 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUIFacade.java @@ -28,7 +28,7 @@ import java.awt.event.ActionListener; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface ActivationGUIFacade extends BKUGUIFacade { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java index 5f3dabfe..5126a906 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Common superclass for Activation and PinManagement GUIs * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class CardMgmtGUI extends BKUGUIImpl { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java index 965ce27e..438153ee 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java @@ -44,7 +44,7 @@ import at.gv.egiz.bku.gui.viewer.FontProvider; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetCertificateGUI extends CardMgmtGUI implements diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java index aa1b6a70..45488b1e 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java @@ -28,7 +28,7 @@ import java.io.File; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public interface GetCertificateGUIFacade extends BKUGUIFacade { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java index 1aea3d83..90f98235 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java @@ -43,7 +43,7 @@ import at.gv.egiz.bku.gui.viewer.FontProvider; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetHardwareInfoGUI extends CardMgmtGUI implements diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java index 21b96d18..5b86a27b 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUIFacade.java @@ -27,7 +27,7 @@ import java.awt.event.ActionListener; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public interface GetHardwareInfoGUIFacade extends BKUGUIFacade { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java index 84282ed7..8c086bef 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java @@ -44,7 +44,7 @@ import at.gv.egiz.bku.gui.viewer.FontProvider; /** * Implements GUI for the identity link informations * - * @author Andreas Fitzek + * @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> */ public class IdentityLinkGUI extends CardMgmtGUI implements IdentityLinkGUIFacade { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java index 784b623a..7ca92017 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java @@ -28,7 +28,7 @@ import java.awt.event.ActionListener; /** * - * @author Andreas Fitzek + * @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> */ public interface IdentityLinkGUIFacade extends BKUGUIFacade { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java index d09d348a..b737005c 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java @@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory; * TODO pull out ResourceBundle to common superclass for activationGUI and * pinMgmtGUI * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINManagementGUI extends CardMgmtGUI implements PINManagementGUIFacade { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java index 6f429456..68815aa6 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java @@ -30,7 +30,7 @@ import java.awt.event.ActionListener; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface PINManagementGUIFacade extends BKUGUIFacade { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java index 1e9a06bc..c135d850 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusRenderer.java @@ -33,7 +33,7 @@ import javax.swing.table.DefaultTableCellRenderer; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINStatusRenderer extends DefaultTableCellRenderer { diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java index f777a745..866fa4f9 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINStatusTableModel.java @@ -29,7 +29,7 @@ import javax.swing.table.DefaultTableModel; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINStatusTableModel extends DefaultTableModel { diff --git a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java index d4e90591..d4ef1338 100644 --- a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java +++ b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/DummyFontLoader.java @@ -31,7 +31,7 @@ import java.awt.Font; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class DummyFontLoader implements FontProvider { diff --git a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/SimplePinInfo.java b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/SimplePinInfo.java index 1d23d169..5cf392d4 100644 --- a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/SimplePinInfo.java +++ b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/SimplePinInfo.java @@ -30,7 +30,7 @@ import java.util.Locale; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class SimplePinInfo extends PinInfo { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java index 69fd09ec..5565879f 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/GUIProxy.java @@ -31,7 +31,7 @@ import javax.swing.JFrame; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class GUIProxy implements InvocationHandler { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java index 31670f61..6ded7a44 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/gui/LocalHelpListener.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; /** * Open help document in browser, fallback to help viewer (swing dialog) if Java Desktop API not supported. * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class LocalHelpListener extends ViewerHelpListener { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java index a7d930b3..afaad92d 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java @@ -44,7 +44,7 @@ import javax.swing.JFrame; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class LocalBKUWorker extends AbstractBKUWorker { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java index 19db5b8f..741ab3ff 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class LocalGetCertificateSTALFactory implements STALFactory { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetHardwareInfoSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetHardwareInfoSTALFactory.java index 83a010b6..4d96c051 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetHardwareInfoSTALFactory.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetHardwareInfoSTALFactory.java @@ -47,7 +47,7 @@ import at.gv.egiz.stal.STALFactory; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class LocalGetHardwareInfoSTALFactory implements STALFactory { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java index 14c30d21..5e346aba 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSecureViewer.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class LocalSecureViewer implements SecureViewer { @@ -63,7 +63,9 @@ public class LocalSecureViewer implements SecureViewer { /** * - * @param dsigReferences + * @param signedInfo + * @param okListener + * @param okCommand * @throws java.lang.Exception */ @Override diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java index c4855400..76dee366 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java @@ -35,7 +35,7 @@ import at.gv.egiz.stal.SignRequest; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class LocalSignRequestHandler extends SignRequestHandler { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java index 23c08bd5..6c0ebf57 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java @@ -45,7 +45,7 @@ import at.gv.egiz.stal.ext.GetCertificateRequest; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetCertificateServlet extends HttpServlet { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java index 51ed2d8d..269d6adf 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java @@ -45,7 +45,7 @@ import at.gv.egiz.stal.ext.GetHardwareInfoRequest; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetHardwareInfoServlet extends HttpServlet { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java index 197f868b..583d45a5 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java @@ -46,7 +46,7 @@ import at.gv.egiz.stal.ext.IdentityLinkRequest; /** * IdentityLink BKU Worker for non-applet version * - * @author Andreas Fitzek + * @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> */ public class IdentityLinkServlet extends HttpServlet { diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java index 1989237f..10afca67 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/PINManagementServlet.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; /** * PINManagementBKUWorker for non-applet version - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINManagementServlet extends HttpServlet { diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java index cc5b8462..eab5c62d 100644 --- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java +++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java @@ -88,11 +88,11 @@ public class STALRequestBrokerImpl implements STALRequestBroker { * Produce requests (and HashDataInputCallback) and wait for responses. * This method is not thread safe, since every bindingprocessor thread possesses it's own instance. * It however assures cooperation with STAL webservice threads consuming the requests and producing responses. + * Requests: either single SignRequest, QuitRequest or multiple ReadInfoboxRequests * - * @param requests + * @param stalRequests * @return * - * @pre requests: either single SignRequest, QuitRequest or multiple ReadInfoboxRequests */ @Override public List handleRequest(List stalRequests) { @@ -250,7 +250,7 @@ public class STALRequestBrokerImpl implements STALRequestBroker { * (synchronizing the entire method does not * hinder the zombie to interrupt two consecutive nextRequest() calls.) * - * @param responses + * @param resps * @return QUIT if expected responses are not provided */ @Override diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java index 298a302a..026eee4d 100644 --- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java +++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class STALXJAXBContextFactory implements JAXBContextFactory { diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java index db34198d..4999c975 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Configurator.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class Configurator { @@ -104,7 +104,6 @@ public class Configurator { /** * Checks whether the config directory already exists and creates it otherwise. - * @param configDir the config directory to be created * @throws IOException config/certificate creation failed * @throws GeneralSecurityException if MOCCA TLS certificate could not be created * @throws CodingException if MOCCA TLS certificate could not be created diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java index 19adf571..ab3d9a42 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java @@ -212,12 +212,12 @@ public class Container { } } - /** - * grant all permissions, since we need read/write access to save signature data files anywhere (JFileChooser) in the local filesystem - * and Jetty does not allow declare (webapp) permissions on a codeBase basis. - * @param webappDir - * @return - */ +// /** +// * grant all permissions, since we need read/write access to save signature data files anywhere (JFileChooser) in the local filesystem +// * and Jetty does not allow declare (webapp) permissions on a codeBase basis. +// * @param webappDir +// * @return +// */ // private Permissions getPermissions(File webappDir) { // Permissions perms = new Permissions(); // perms.add(new AllPermission()); diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/GetCertificateInvoker.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/GetCertificateInvoker.java index 888206a6..d863cb8a 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/GetCertificateInvoker.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/GetCertificateInvoker.java @@ -33,7 +33,7 @@ import at.gv.egiz.bku.webstart.gui.StatusNotifier; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetCertificateInvoker implements Runnable { diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/HardwareInfoInvoker.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/HardwareInfoInvoker.java index 6baabfe1..40125ced 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/HardwareInfoInvoker.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/HardwareInfoInvoker.java @@ -33,7 +33,7 @@ import at.gv.egiz.bku.webstart.gui.StatusNotifier; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class HardwareInfoInvoker implements Runnable { diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java index 9709a01f..72b18d08 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/IdentityLinkInvoker.java @@ -34,7 +34,7 @@ import at.gv.egiz.bku.webstart.gui.StatusNotifier; /** * - * @author Andreas Fitzek + * @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> */ public class IdentityLinkInvoker implements Runnable { diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PINManagementInvoker.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PINManagementInvoker.java index 526caeba..351e05cd 100644 --- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PINManagementInvoker.java +++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/PINManagementInvoker.java @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; /** * GUI is painted using SwingUtilities.invokeLater, but TrayIcon ActionListener Thread (== webstart thread) joined Jetty Thread * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINManagementInvoker implements Runnable { diff --git a/STAL/src/main/java/at/gv/egiz/stal/ErrorResponse.java b/STAL/src/main/java/at/gv/egiz/stal/ErrorResponse.java index 6a63cb02..1d5d3074 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/ErrorResponse.java +++ b/STAL/src/main/java/at/gv/egiz/stal/ErrorResponse.java @@ -38,16 +38,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ErrorResponseType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
- *       <sequence>
- *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *         <element name="ErrorMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ErrorResponseType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
+ *       <sequence>
+ *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         <element name="ErrorMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/InfoboxReadRequest.java b/STAL/src/main/java/at/gv/egiz/stal/InfoboxReadRequest.java index c485ad44..a1dd30d5 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/InfoboxReadRequest.java +++ b/STAL/src/main/java/at/gv/egiz/stal/InfoboxReadRequest.java @@ -37,16 +37,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="InfoboxReadRequestType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
- *       <sequence>
- *         <element name="InfoboxIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="DomainIdentifier" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxReadRequestType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
+ *       <sequence>
+ *         <element name="InfoboxIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="DomainIdentifier" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/InfoboxReadResponse.java b/STAL/src/main/java/at/gv/egiz/stal/InfoboxReadResponse.java index d2c0b5eb..f63ba216 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/InfoboxReadResponse.java +++ b/STAL/src/main/java/at/gv/egiz/stal/InfoboxReadResponse.java @@ -37,15 +37,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="InfoboxReadResponseType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
- *       <sequence>
- *         <element name="InfoboxValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxReadResponseType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
+ *       <sequence>
+ *         <element name="InfoboxValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/QuitRequest.java b/STAL/src/main/java/at/gv/egiz/stal/QuitRequest.java index 99d2af76..6c4a6bdd 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/QuitRequest.java +++ b/STAL/src/main/java/at/gv/egiz/stal/QuitRequest.java @@ -36,12 +36,12 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="QuitRequestType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QuitRequestType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/STALRequest.java b/STAL/src/main/java/at/gv/egiz/stal/STALRequest.java index 3371a63e..5047c954 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/STALRequest.java +++ b/STAL/src/main/java/at/gv/egiz/stal/STALRequest.java @@ -39,12 +39,12 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="RequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/STALResponse.java b/STAL/src/main/java/at/gv/egiz/stal/STALResponse.java index f1ac2f72..b487da84 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/STALResponse.java +++ b/STAL/src/main/java/at/gv/egiz/stal/STALResponse.java @@ -39,13 +39,13 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/SignRequest.java b/STAL/src/main/java/at/gv/egiz/stal/SignRequest.java index 6041cf5d..d4212b24 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/SignRequest.java +++ b/STAL/src/main/java/at/gv/egiz/stal/SignRequest.java @@ -43,36 +43,36 @@ import javax.xml.bind.annotation.XmlValue; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignRequestType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
- *       <sequence>
- *         <element name="KeyIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="SignedInfo">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *                 <attribute name="IsCMSSignedAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *         <element name="SignatureMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="DigestMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ExcludedByteRange" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
- *                 <attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignRequestType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
+ *       <sequence>
+ *         <element name="KeyIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="SignedInfo">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *                 <attribute name="IsCMSSignedAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="SignatureMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="DigestMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="ExcludedByteRange" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
+ *                 <attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -129,8 +129,7 @@ public class SignRequest * Gets the value of the signedInfo property. * * @return - * possible object is - * {@link SignRequestType.SignedInfo } + * possible object is SignRequestType.SignedInfo * */ public SignRequest.SignedInfo getSignedInfo() { @@ -141,8 +140,7 @@ public class SignRequest * Sets the value of the signedInfo property. * * @param value - * allowed object is - * {@link SignRequestType.SignedInfo } + * allowed object is SignRequestType.SignedInfo * */ public void setSignedInfo(SignRequest.SignedInfo value) { @@ -201,8 +199,7 @@ public class SignRequest * Gets the value of the excludedByteRange property. * * @return - * possible object is - * {@link ExcludedByteRange.ExcludedByteRange } + * possible object is ExcludedByteRange.ExcludedByteRange * */ public SignRequest.ExcludedByteRange getExcludedByteRange() { @@ -213,8 +210,7 @@ public class SignRequest * Sets the value of the excludedByteRange property. * * @param value - * allowed object is - * {@link ExcludedByteRange.ExcludedByteRange } + * allowed object is ExcludedByteRange.ExcludedByteRange * */ public void setExcludedByteRange(SignRequest.ExcludedByteRange value) { @@ -236,14 +232,14 @@ public class SignRequest *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
-     *       <attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
+     *       <attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      *
* * @@ -316,13 +312,13 @@ public class SignRequest *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
-     *       <attribute name="IsCMSSignedAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+     *       <attribute name="IsCMSSignedAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/SignResponse.java b/STAL/src/main/java/at/gv/egiz/stal/SignResponse.java index e0ed6a12..09f92f11 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/SignResponse.java +++ b/STAL/src/main/java/at/gv/egiz/stal/SignResponse.java @@ -37,15 +37,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignResponseType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
- *       <sequence>
- *         <element name="SignatureValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignResponseType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
+ *       <sequence>
+ *         <element name="SignatureValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/StatusRequest.java b/STAL/src/main/java/at/gv/egiz/stal/StatusRequest.java index bbd23a64..1cc46aeb 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/StatusRequest.java +++ b/STAL/src/main/java/at/gv/egiz/stal/StatusRequest.java @@ -36,12 +36,12 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="StatusRequestType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusRequestType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/StatusResponse.java b/STAL/src/main/java/at/gv/egiz/stal/StatusResponse.java index 1b046953..631aa222 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/StatusResponse.java +++ b/STAL/src/main/java/at/gv/egiz/stal/StatusResponse.java @@ -37,13 +37,13 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="StatusResponseType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
- *       <attribute name="cardReady" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusResponseType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
+ *       <attribute name="cardReady" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/CanonicalizationMethodType.java b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/CanonicalizationMethodType.java index 7d8621c6..4e90c981 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/CanonicalizationMethodType.java +++ b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/CanonicalizationMethodType.java @@ -49,16 +49,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="CanonicalizationMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CanonicalizationMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/DigestMethodType.java b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/DigestMethodType.java index 0241837c..d3d17466 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/DigestMethodType.java +++ b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/DigestMethodType.java @@ -50,16 +50,16 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="DigestMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DigestMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/ObjectFactory.java b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/ObjectFactory.java index d085002d..d5f87327 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/ObjectFactory.java +++ b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/ObjectFactory.java @@ -40,7 +40,7 @@ import javax.xml.namespace.QName; /** * Do not use this package in jaxb context together with org.w3._2000._09.xmldsig_ - *
+ *
* This object contains factory methods for each * Java content interface and Java element interface * generated in the at.gv.egiz.stal.signedinfo package. diff --git a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/ReferenceType.java b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/ReferenceType.java index 1ae71f3b..c3215774 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/ReferenceType.java +++ b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/ReferenceType.java @@ -49,20 +49,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/SignatureMethodType.java b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/SignatureMethodType.java index de0ff01c..b21d0a0b 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/SignatureMethodType.java +++ b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/SignatureMethodType.java @@ -49,16 +49,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignatureMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/SignedInfoType.java b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/SignedInfoType.java index 21b22b43..9c1e044f 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/SignedInfoType.java +++ b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/SignedInfoType.java @@ -51,18 +51,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignedInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/TransformsType.java b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/TransformsType.java index 8afe30f5..4e88ee1f 100644 --- a/STAL/src/main/java/at/gv/egiz/stal/signedinfo/TransformsType.java +++ b/STAL/src/main/java/at/gv/egiz/stal/signedinfo/TransformsType.java @@ -45,15 +45,15 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java index 747564e3..9fdd3612 100644 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java @@ -27,7 +27,7 @@ import at.gv.egiz.stal.STALRequest; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetCertificateRequest extends STALRequest { diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java index a19be9d3..b02b0a97 100644 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java @@ -27,7 +27,7 @@ import at.gv.egiz.stal.STALResponse; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetCertificateResponse extends STALResponse { diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java index 728aa4f1..8e51d74e 100644 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java @@ -27,7 +27,7 @@ import at.gv.egiz.stal.STALRequest; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetHardwareInfoRequest extends STALRequest { diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java index 53952618..b895cbcf 100644 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java @@ -27,7 +27,7 @@ import at.gv.egiz.stal.STALResponse; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetHardwareInfoResponse extends STALResponse { diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkRequest.java index 65f0b3fe..fbad0fd1 100644 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkRequest.java +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkRequest.java @@ -30,7 +30,7 @@ import at.gv.egiz.stal.STALRequest; /** * Dummy STAL request to trigger display of identity link. * - * @author Andreas Fitzek + * @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> */ public class IdentityLinkRequest extends STALRequest { diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkResponse.java index 8d1d25d5..72a8db50 100644 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkResponse.java +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/IdentityLinkResponse.java @@ -27,7 +27,7 @@ import at.gv.egiz.stal.STALResponse; /** * - * @author Andreas Fitzek + * @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> */ public class IdentityLinkResponse extends STALResponse { diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementRequest.java index b5077c24..7992950d 100644 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementRequest.java +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementRequest.java @@ -32,7 +32,7 @@ import at.gv.egiz.stal.STALRequest; * for PIN activation, unblocking) * * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINManagementRequest extends STALRequest { diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementResponse.java index b0ca5776..1a3b44cd 100644 --- a/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementResponse.java +++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/PINManagementResponse.java @@ -29,7 +29,7 @@ import at.gv.egiz.stal.STALResponse; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINManagementResponse extends STALResponse { diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java b/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java index ff9e88ca..3f3d52c0 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/translator/STALTranslator.java @@ -60,7 +60,7 @@ import at.gv.egiz.stal.service.types.StatusResponseType; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class STALTranslator { @@ -126,7 +126,7 @@ public class STALTranslator { /** * Translate a STAL response to a STAL Webservice response. - * @param request + * @param response * @return * @throws at.gv.egiz.stal.service.translator.TranslationException */ @@ -144,7 +144,7 @@ public class STALTranslator { /** * Translate a STAL Webservice response to a STAL response. - * @param request + * @param response * @return * @throws at.gv.egiz.stal.service.translator.TranslationException */ diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/translator/TranslationException.java b/STALService/src/main/java/at/gv/egiz/stal/service/translator/TranslationException.java index 8460df07..70f530bb 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/translator/TranslationException.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/translator/TranslationException.java @@ -26,7 +26,7 @@ package at.gv.egiz.stal.service.translator; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class TranslationException extends Exception { @@ -41,8 +41,8 @@ public class TranslationException extends Exception { * Creates a new instance of TranslationException without detail message. * @param unknownClass the class that could not be translated */ - public TranslationException(Class unkownClass) { - this.unknownClass = unkownClass; + public TranslationException(Class unknownClass) { + this.unknownClass = unknownClass; } @Override diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/ErrorResponseType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/ErrorResponseType.java index 78861a7f..c50bfcd7 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/ErrorResponseType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/ErrorResponseType.java @@ -37,16 +37,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ErrorResponseType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
- *       <sequence>
- *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *         <element name="ErrorMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ErrorResponseType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
+ *       <sequence>
+ *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         <element name="ErrorMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputFaultType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputFaultType.java index ce3d5a19..fb42c564 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputFaultType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputFaultType.java @@ -37,16 +37,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="GetHashDataInputFaultType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}int"/>
- *         <element name="ErrorMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GetHashDataInputFaultType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         <element name="ErrorMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputResponseType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputResponseType.java index 351f8584..4d26f348 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputResponseType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputResponseType.java @@ -41,27 +41,27 @@ import javax.xml.bind.annotation.XmlValue; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="GetHashDataInputResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Reference" maxOccurs="unbounded">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *                 <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="Filename" type="{http://www.w3.org/2001/XMLSchema}string" />
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="SessionId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GetHashDataInputResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Reference" maxOccurs="unbounded">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *                 <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="Filename" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="SessionId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -137,16 +137,16 @@ public class GetHashDataInputResponseType { *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
-     *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="Filename" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+     *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="Filename" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputType.java index 99d5d0af..037e94eb 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetHashDataInputType.java @@ -40,24 +40,24 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="GetHashDataInputType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Reference" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="SessionId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GetHashDataInputType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Reference" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="SessionId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -133,13 +133,13 @@ public class GetHashDataInputType { *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetNextRequestResponseType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetNextRequestResponseType.java index b8d4a6ec..310190cc 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetNextRequestResponseType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetNextRequestResponseType.java @@ -43,20 +43,20 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="GetNextRequestResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="InfoboxReadRequest" type="{http://www.egiz.gv.at/stal}InfoboxReadRequestType"/>
- *         <element name="SignRequest" type="{http://www.egiz.gv.at/stal}SignRequestType"/>
- *         <element name="QuitRequest" type="{http://www.egiz.gv.at/stal}QuitRequestType"/>
- *         <element name="StatusRequest" type="{http://www.egiz.gv.at/stal}StatusRequestType"/>
- *         <element ref="{http://www.egiz.gv.at/stal}OtherRequest"/>
- *       </choice>
- *       <attribute name="SessionId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GetNextRequestResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="InfoboxReadRequest" type="{http://www.egiz.gv.at/stal}InfoboxReadRequestType"/>
+ *         <element name="SignRequest" type="{http://www.egiz.gv.at/stal}SignRequestType"/>
+ *         <element name="QuitRequest" type="{http://www.egiz.gv.at/stal}QuitRequestType"/>
+ *         <element name="StatusRequest" type="{http://www.egiz.gv.at/stal}StatusRequestType"/>
+ *         <element ref="{http://www.egiz.gv.at/stal}OtherRequest"/>
+ *       </choice>
+ *       <attribute name="SessionId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -99,7 +99,6 @@ public class GetNextRequestResponseType { * {@link JAXBElement }{@code <}{@link RequestType }{@code >} * {@link JAXBElement }{@code <}{@link QuitRequestType }{@code >} * {@link JAXBElement }{@code <}{@link InfoboxReadRequestType }{@code >} - * {@link JAXBElement }{@code <}{@link ScriptType }{@code >} * {@link JAXBElement }{@code <}{@link StatusRequestType }{@code >} * {@link JAXBElement }{@code <}{@link SignRequestType }{@code >} * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetNextRequestType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetNextRequestType.java index 49daee38..4b392aed 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/GetNextRequestType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/GetNextRequestType.java @@ -42,20 +42,20 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="GetNextRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="InfoboxReadResponse" type="{http://www.egiz.gv.at/stal}InfoboxReadResponseType"/>
- *         <element name="SignResponse" type="{http://www.egiz.gv.at/stal}SignResponseType"/>
- *         <element name="ErrorResponse" type="{http://www.egiz.gv.at/stal}ErrorResponseType"/>
- *         <element name="StatusResponse" type="{http://www.egiz.gv.at/stal}StatusResponseType"/>
- *         <element ref="{http://www.egiz.gv.at/stal}OtherResponse"/>
- *       </choice>
- *       <attribute name="SessionId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GetNextRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="InfoboxReadResponse" type="{http://www.egiz.gv.at/stal}InfoboxReadResponseType"/>
+ *         <element name="SignResponse" type="{http://www.egiz.gv.at/stal}SignResponseType"/>
+ *         <element name="ErrorResponse" type="{http://www.egiz.gv.at/stal}ErrorResponseType"/>
+ *         <element name="StatusResponse" type="{http://www.egiz.gv.at/stal}StatusResponseType"/>
+ *         <element ref="{http://www.egiz.gv.at/stal}OtherResponse"/>
+ *       </choice>
+ *       <attribute name="SessionId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -95,7 +95,6 @@ public class GetNextRequestType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link at.buergerkarte.namespaces.cardchannel.service.ResponseType }{@code >} * {@link JAXBElement }{@code <}{@link StatusResponseType }{@code >} * {@link JAXBElement }{@code <}{@link at.gv.egiz.stal.service.types.ResponseType }{@code >} * {@link JAXBElement }{@code <}{@link ErrorResponseType }{@code >} diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/InfoboxReadRequestType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/InfoboxReadRequestType.java index cb12e63d..8ba22fc7 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/InfoboxReadRequestType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/InfoboxReadRequestType.java @@ -38,24 +38,24 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="InfoboxReadRequestType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
- *       <sequence>
- *         <element name="InfoboxIdentifier">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="Certificates"/>
- *               <enumeration value="IdentityLink"/>
- *               <enumeration value="Mandates"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="DomainIdentifier" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxReadRequestType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
+ *       <sequence>
+ *         <element name="InfoboxIdentifier">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <enumeration value="Certificates"/>
+ *               <enumeration value="IdentityLink"/>
+ *               <enumeration value="Mandates"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="DomainIdentifier" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/InfoboxReadResponseType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/InfoboxReadResponseType.java index 841d5460..bd359e07 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/InfoboxReadResponseType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/InfoboxReadResponseType.java @@ -37,15 +37,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="InfoboxReadResponseType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
- *       <sequence>
- *         <element name="InfoboxValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxReadResponseType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
+ *       <sequence>
+ *         <element name="InfoboxValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/QuitRequestType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/QuitRequestType.java index c2f023aa..78dd8027 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/QuitRequestType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/QuitRequestType.java @@ -36,12 +36,12 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="QuitRequestType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QuitRequestType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/RequestType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/RequestType.java index 927f3cd3..2cf88988 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/RequestType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/RequestType.java @@ -38,12 +38,12 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="RequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/ResponseType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/ResponseType.java index f30dd668..02a91ef0 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/ResponseType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/ResponseType.java @@ -37,12 +37,12 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/SignRequestType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/SignRequestType.java index 84ccdc8a..6688d720 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/SignRequestType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/SignRequestType.java @@ -42,43 +42,43 @@ import javax.xml.bind.annotation.XmlValue; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignRequestType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
- *       <sequence>
- *         <element name="KeyIdentifier">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="SecureSignatureKeypair"/>
- *               <enumeration value="CertifiedKeypair"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="SignedInfo">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *                 <attribute name="IsCMSSignedAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *         <element name="SignatureMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="DigestMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ExcludedByteRange" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
- *                 <attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignRequestType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
+ *       <sequence>
+ *         <element name="KeyIdentifier">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <enumeration value="SecureSignatureKeypair"/>
+ *               <enumeration value="CertifiedKeypair"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="SignedInfo">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *                 <attribute name="IsCMSSignedAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="SignatureMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="DigestMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="ExcludedByteRange" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
+ *                 <attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -233,14 +233,14 @@ public class SignRequestType *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
-     *       <attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="from" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
+     *       <attribute name="to" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      *
* * @@ -313,13 +313,13 @@ public class SignRequestType *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
-     *       <attribute name="IsCMSSignedAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+     *       <attribute name="IsCMSSignedAttributes" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/SignResponseType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/SignResponseType.java index a1486e5f..4acb3ca2 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/SignResponseType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/SignResponseType.java @@ -37,15 +37,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignResponseType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
- *       <sequence>
- *         <element name="SignatureValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignResponseType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
+ *       <sequence>
+ *         <element name="SignatureValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/StatusRequestType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/StatusRequestType.java index eeda0bf1..1863684d 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/StatusRequestType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/StatusRequestType.java @@ -36,12 +36,12 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="StatusRequestType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusRequestType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALService/src/main/java/at/gv/egiz/stal/service/types/StatusResponseType.java b/STALService/src/main/java/at/gv/egiz/stal/service/types/StatusResponseType.java index 40576003..9bf53817 100644 --- a/STALService/src/main/java/at/gv/egiz/stal/service/types/StatusResponseType.java +++ b/STALService/src/main/java/at/gv/egiz/stal/service/types/StatusResponseType.java @@ -37,13 +37,13 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="StatusResponseType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
- *       <attribute name="cardReady" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatusResponseType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
+ *       <attribute name="cardReady" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ATRType.java b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ATRType.java index 274f5051..195a8bb4 100644 --- a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ATRType.java +++ b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ATRType.java @@ -45,13 +45,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ATRType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
- *       <attribute name="rc" type="{http://www.w3.org/2001/XMLSchema}integer" default="0" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ATRType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
+ *       <attribute name="rc" type="{http://www.w3.org/2001/XMLSchema}integer" default="0" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/AttributeList.java b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/AttributeList.java index 9270ebaf..a79c5b43 100644 --- a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/AttributeList.java +++ b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/AttributeList.java @@ -41,15 +41,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="AttributeList">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Attribute" type="{http://www.buergerkarte.at/cardchannel}AttributeType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeList">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Attribute" type="{http://www.buergerkarte.at/cardchannel}AttributeType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/AttributeType.java b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/AttributeType.java index df5fed2f..0073371b 100644 --- a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/AttributeType.java +++ b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/AttributeType.java @@ -43,22 +43,22 @@ import javax.xml.datatype.XMLGregorianCalendar; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="AttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Integer" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         <element name="Latin1String" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="UTF8String" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="NumericString" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="PrintableString" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="GeneralizedTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="Date" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="oid" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Integer" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         <element name="Latin1String" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="UTF8String" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="NumericString" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="PrintableString" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="GeneralizedTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         <element name="Date" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="oid" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/CommandAPDUType.java b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/CommandAPDUType.java index d3798fc4..c8455944 100644 --- a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/CommandAPDUType.java +++ b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/CommandAPDUType.java @@ -45,15 +45,15 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="CommandAPDUType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
- *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="CommandAPDUType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
+ *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResetType.java b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResetType.java index 661e737d..13485594 100644 --- a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResetType.java +++ b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResetType.java @@ -39,13 +39,13 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ResetType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="cold" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResetType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="cold" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResponseAPDUType.java b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResponseAPDUType.java index 4ad4a61a..40673018 100644 --- a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResponseAPDUType.java +++ b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResponseAPDUType.java @@ -45,15 +45,15 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ResponseAPDUType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
- *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="rc" type="{http://www.w3.org/2001/XMLSchema}integer" default="0" />
- *       <attribute name="SW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" default="9000" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ResponseAPDUType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
+ *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="rc" type="{http://www.w3.org/2001/XMLSchema}integer" default="0" />
+ *       <attribute name="SW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" default="9000" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResponseType.java b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResponseType.java index f5e346cd..df7201fa 100644 --- a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResponseType.java +++ b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ResponseType.java @@ -45,16 +45,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ResponseType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
- *       <choice maxOccurs="unbounded">
- *         <element name="ATR" type="{http://www.buergerkarte.at/cardchannel}ATRType"/>
- *         <element name="ResponseAPDU" type="{http://www.buergerkarte.at/cardchannel}ResponseAPDUType"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}ResponseType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="ATR" type="{http://www.buergerkarte.at/cardchannel}ATRType"/>
+ *         <element name="ResponseAPDU" type="{http://www.buergerkarte.at/cardchannel}ResponseAPDUType"/>
+ *       </choice>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ScriptType.java b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ScriptType.java index 84353b52..b39419a5 100644 --- a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ScriptType.java +++ b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/ScriptType.java @@ -45,17 +45,17 @@ import at.gv.egiz.stal.service.types.RequestType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ScriptType">
- *   <complexContent>
- *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
- *       <choice maxOccurs="unbounded">
- *         <element name="Reset" type="{http://www.buergerkarte.at/cardchannel}ResetType"/>
- *         <element name="CommandAPDU" type="{http://www.buergerkarte.at/cardchannel}CommandAPDUType"/>
- *         <element name="VerifyAPDU" type="{http://www.buergerkarte.at/cardchannel}VerifyAPDUType"/>
- *       </choice>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ScriptType">
+ *   <complexContent>
+ *     <extension base="{http://www.egiz.gv.at/stal}RequestType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="Reset" type="{http://www.buergerkarte.at/cardchannel}ResetType"/>
+ *         <element name="CommandAPDU" type="{http://www.buergerkarte.at/cardchannel}CommandAPDUType"/>
+ *         <element name="VerifyAPDU" type="{http://www.buergerkarte.at/cardchannel}VerifyAPDUType"/>
+ *       </choice>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/VerifyAPDUType.java b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/VerifyAPDUType.java index 78eb9ecb..1a1816e3 100644 --- a/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/VerifyAPDUType.java +++ b/STALXService/src/main/java/at/buergerkarte/namespaces/cardchannel/service/VerifyAPDUType.java @@ -45,19 +45,19 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="VerifyAPDUType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
- *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
- *       <attribute name="message" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="format" use="required" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
- *       <attribute name="offset" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *       <attribute name="timeout" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="VerifyAPDUType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
+ *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
+ *       <attribute name="message" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="format" use="required" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
+ *       <attribute name="offset" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="timeout" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  *
* * diff --git a/STALXService/src/main/java/at/gv/egiz/stalx/service/translator/STALXTranslationHandler.java b/STALXService/src/main/java/at/gv/egiz/stalx/service/translator/STALXTranslationHandler.java index c5c09af9..d9f902fe 100644 --- a/STALXService/src/main/java/at/gv/egiz/stalx/service/translator/STALXTranslationHandler.java +++ b/STALXService/src/main/java/at/gv/egiz/stalx/service/translator/STALXTranslationHandler.java @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class STALXTranslationHandler implements STALTranslator.TranslationHandler { diff --git a/STALXService/src/test/java/at/gv/egiz/stalx/service/ClientJAXBContextFactory.java b/STALXService/src/test/java/at/gv/egiz/stalx/service/ClientJAXBContextFactory.java index 76d55a19..7123f576 100644 --- a/STALXService/src/test/java/at/gv/egiz/stalx/service/ClientJAXBContextFactory.java +++ b/STALXService/src/test/java/at/gv/egiz/stalx/service/ClientJAXBContextFactory.java @@ -32,7 +32,7 @@ package at.gv.egiz.stalx.service; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class ClientJAXBContextFactory { //implements JAXBContextFactory { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/AccessControl.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/AccessControl.java index 07706222..ed6085d1 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/AccessControl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/AccessControl.java @@ -37,15 +37,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}Chains"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Chains"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Action.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Action.java index 5ecb3997..e99e9b17 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Action.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Action.java @@ -37,23 +37,23 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="ChainRef" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="RuleAction">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <enumeration value="allow"/>
- *               <enumeration value="deny"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="ChainRef" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="RuleAction">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <enumeration value="allow"/>
+ *               <enumeration value="deny"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chain.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chain.java index eff37730..2c44faef 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chain.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chain.java @@ -43,16 +43,16 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}Rules" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Rules" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chains.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chains.java index cccc97f6..9a9fb258 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chains.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chains.java @@ -39,15 +39,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}Chain" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Chain" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Command.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Command.java index 8428e432..ad66dac3 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Command.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Command.java @@ -41,16 +41,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}Param" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Param" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Param.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Param.java index d02fc833..bc163bb2 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Param.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Param.java @@ -41,13 +41,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType>
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}NCName" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rule.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rule.java index c1496884..9f49d817 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rule.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rule.java @@ -43,24 +43,24 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}AuthClass"/>
- *         <choice minOccurs="0">
- *           <element name="DomainName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="IPv4Address" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="URL" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         </choice>
- *         <element ref="{}Command" minOccurs="0"/>
- *         <element ref="{}Action"/>
- *         <element ref="{}UserInteraction"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}AuthClass"/>
+ *         <choice minOccurs="0">
+ *           <element name="DomainName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           <element name="IPv4Address" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           <element name="URL" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         </choice>
+ *         <element ref="{}Command" minOccurs="0"/>
+ *         <element ref="{}Action"/>
+ *         <element ref="{}UserInteraction"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rules.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rules.java index 730cc9cf..4f28c0df 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rules.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rules.java @@ -39,15 +39,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{}Rule" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{}Rule" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManager.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManager.java index c4f535a9..069c23bb 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManager.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManager.java @@ -71,13 +71,11 @@ public interface BindingProcessorManager { /** * Schedules the given BindingProcessor for processing. - *

*

    *
  1. Creates a processing context with the given id.
    2. *
  2. Schedules the given BindingProcessor for processing, and
    3. *
  3. Immediately returns the processing context.
    4. *
- *

* * @param id * @param bindingProcessor diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java index ef911e0b..17146c90 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java @@ -115,14 +115,14 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager, Com } /** - * @return the factoryMap + * @return the factory List */ public List getFactories() { return factories; } /** - * @param factoryMap the factoryMap to set + * @param factories the factory List to set */ public void setFactories(List factories) { this.factories = factories; diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlResponse.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlResponse.java index 8cd88109..85bb5a3a 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlResponse.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/DataUrlResponse.java @@ -80,7 +80,7 @@ public class DataUrlResponse extends StreamData { } /** - * Checks if the http response equals "" + * Checks if the http response equals "<ok/>" * * @throws IOException */ diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/FormParameterStore.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/FormParameterStore.java index a95909f5..57541fb4 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/FormParameterStore.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/FormParameterStore.java @@ -101,14 +101,6 @@ public class FormParameterStore implements FormParameter { } } - /** - * Reads all data from the stream and stores it internally. The stream will - * not be closed. - * - * @param datSource - * @param formName - * @param contentType - */ @Override public String getFormParameterContentType() { ensureInitialized(); diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessorImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessorImpl.java index e7bc2f33..4f9260d2 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessorImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessorImpl.java @@ -82,7 +82,7 @@ import at.gv.egiz.stal.STALRequest; * Class performing the HTTP binding as defined by the CCE specification. * Currently a huge monolithic class. * - * @TODO refactor + * TODO: refactor */ @SuppressWarnings("unchecked") public class HTTPBindingProcessorImpl extends AbstractBindingProcessor implements diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HttpsDataURLConnection.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HttpsDataURLConnection.java index f1bc293f..6451e6ee 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HttpsDataURLConnection.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HttpsDataURLConnection.java @@ -25,7 +25,6 @@ package at.gv.egiz.bku.binding; -import java.io.IOException; import java.net.URL; import java.security.cert.Certificate; @@ -39,7 +38,6 @@ public abstract class HttpsDataURLConnection extends HttpDataURLConnection { * Construct a new * * @param url - * @throws IOException */ public HttpsDataURLConnection(URL url) { super(url); diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/IdFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/IdFactory.java index 8d68f177..16a7bf4b 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/IdFactory.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/IdFactory.java @@ -75,7 +75,7 @@ public class IdFactory { /** * Don't use this method unless you know exactly what you do ! * Be sure to use a sufficient large entropy - * @param numberOfBits >=1 (although this small entropy does not make sense) + * @param numberOfBits >=1 (although this small entropy does not make sense) */ public void setNumberOfBits(int numberOfBits) { if (numberOfBits <1) { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusCommand.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusCommand.java index be25a7b8..4acf578f 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusCommand.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusCommand.java @@ -27,7 +27,7 @@ package at.gv.egiz.bku.slcommands; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface GetStatusCommand extends SLCommand { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusResult.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusResult.java index 2dd5896e..678beba0 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusResult.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/GetStatusResult.java @@ -27,7 +27,7 @@ package at.gv.egiz.bku.slcommands; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface GetStatusResult extends SLResult { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLMarshallerFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLMarshallerFactory.java index af75f67f..5a2aded4 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLMarshallerFactory.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLMarshallerFactory.java @@ -45,7 +45,6 @@ public class SLMarshallerFactory { * security layer requests and responses to avoid propagation of namespace * declarations of legacy namespaces into marshaled results. *

- * @see #jaxbContextLegacy */ protected static JAXBContext context; diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLResult.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLResult.java index aab185c0..0475b6fe 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLResult.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLResult.java @@ -45,8 +45,8 @@ public interface SLResult { /** * * @param result + * @param templates may be null. * @param fragment TODO - * @param transformer may be null. */ public void writeTo(Result result, Templates templates, boolean fragment); diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateCMSSignatureResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateCMSSignatureResultImpl.java index 66b24a82..967a4bae 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateCMSSignatureResultImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/CreateCMSSignatureResultImpl.java @@ -68,9 +68,9 @@ public class CreateCMSSignatureResultImpl extends SLResultImpl implements Create * Creates a new instance of this CreateCMSSignatureResultImpl with the given * signature signature. * - * @param document the signature document + * @param signature the signature * - * @throws NullPointerException if document is null + * @throws NullPointerException if signature is null */ public CreateCMSSignatureResultImpl(byte[] signature) { super(); diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java index f1236e60..d0451138 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/DataObjectHashDataInput.java @@ -31,7 +31,7 @@ import java.io.InputStream; /** * DataObject-backed HashDataInput - * If reference caching is enabled, + * If reference caching is enabled, * the hashdata input stream can be obtained repeatedly. * @author clemens */ diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java index 731c26af..2737eb2d 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class GetStatusCommandImpl extends SLCommandImpl implements GetStatusCommand { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java index dbe9c065..48202543 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusResultImpl.java @@ -34,7 +34,7 @@ import javax.xml.transform.Templates; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class GetStatusResultImpl extends SLResultImpl implements GetStatusResult { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java index 98423c48..44fa268b 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxFactory.java @@ -51,7 +51,7 @@ public class InfoboxFactory { private HashMap infoboxFactories = new HashMap(); /** - * @param infoboxFactories the infoboxFactories to set + * @param factories the infoboxFactories to set */ public void setInfoboxFactories( HashMap factories) { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java index 1b4cd565..384521df 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/STALHelper.java @@ -73,7 +73,7 @@ public class STALHelper { /** * An iterator over the STALResponses received in - * {@link SLCommandImpl#transmitSTALRequest(List)}. + * {@link transmitSTALRequest(List)}. */ protected Iterator stalResponses; diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java index 234d8a99..83537ea2 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java @@ -202,7 +202,7 @@ public class DataObject { /** * Creates a new instance. * - * @param document the document of the target signature + * @param signatureContext the SignatureContext */ public DataObject(SignatureContext signatureContext) { this.ctx = signatureContext; diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/IdValueFactoryImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/IdValueFactoryImpl.java index 6856ab1a..ca4eb6c5 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/IdValueFactoryImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/IdValueFactoryImpl.java @@ -34,16 +34,16 @@ import java.security.SecureRandom; * This IdValueFactory creates xsd:Id-attribute values of the form * '<elementName>-<random>-<sequenceNumber>', * where + *

*
    - *
  • <elementName> is the name provided at + *
  • <elementName>; is the name provided at * {@link #createIdValue(String)},
    • - *
  • <random> is a random generated fixed value for an + *
  • <random>; is a random generated fixed value for an * instance of this IdValueFactory and
    • - *
  • <sequenceNumber> is the sequence number of the value + *
  • <sequenceNumber>; is the sequence number of the value * generated for a given elementName by an instance of this * IdValueFactory.
    • *
- *

* * @author mcentner */ diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALPrivateKey.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALPrivateKey.java index 1e70e107..55aa8c0d 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALPrivateKey.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/STALPrivateKey.java @@ -65,8 +65,7 @@ public class STALPrivateKey implements PrivateKey { /** * Creates a new instance of this STALPrivateKey with the given * stal implementation, signature algorithm, - * keyboxIdentifier and hashDataInputCallback - * interface. + * keyboxIdentifier and dataObjects. * * @param stal * the STAL implementation @@ -74,8 +73,8 @@ public class STALPrivateKey implements PrivateKey { * the signature algorithm * @param keyboxIdentifier * the keybox identifier - * @param hashDataInputCallback - * the interface for obtaining the has input data + * @param dataObjects + * the data objects */ public STALPrivateKey(STAL stal, String algorithm, String keyboxIdentifier, List dataObjects) { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/spring/ConfigurationFactoryBean.java b/bkucommon/src/main/java/at/gv/egiz/bku/spring/ConfigurationFactoryBean.java index 47e1320a..3c7f0044 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/spring/ConfigurationFactoryBean.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/spring/ConfigurationFactoryBean.java @@ -101,7 +101,7 @@ public class ConfigurationFactoryBean implements FactoryBean, ResourceLoaderAwar } /** - * @param failOnMissingConfigurationResource the failOnMissingConfigurationResource to set + * @param failOnMissingResource the failOnMissingResource to set */ public void setFailOnMissingResource( Boolean failOnMissingResource) { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ResourceFontLoader.java b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ResourceFontLoader.java index 05c2781e..1c807036 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ResourceFontLoader.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/viewer/ResourceFontLoader.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; /** * Loads font(s) as classpath resource. * Loaded fonts are shared within all instances in this VM (classloader) - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class ResourceFontLoader implements FontProvider { diff --git a/bkucommon/src/test/java/moaspss/generated/AllSignatoriesType.java b/bkucommon/src/test/java/moaspss/generated/AllSignatoriesType.java index a171161e..376a3b07 100644 --- a/bkucommon/src/test/java/moaspss/generated/AllSignatoriesType.java +++ b/bkucommon/src/test/java/moaspss/generated/AllSignatoriesType.java @@ -36,11 +36,11 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. *

* 

- * <simpleType name="AllSignatoriesType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="all"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="AllSignatoriesType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="all"/>
+ *   </restriction>
+ * </simpleType>
  *
* */ diff --git a/bkucommon/src/test/java/moaspss/generated/AnyChildrenType.java b/bkucommon/src/test/java/moaspss/generated/AnyChildrenType.java index f86ad4da..0fa3cd45 100644 --- a/bkucommon/src/test/java/moaspss/generated/AnyChildrenType.java +++ b/bkucommon/src/test/java/moaspss/generated/AnyChildrenType.java @@ -42,15 +42,15 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="AnyChildrenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AnyChildrenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CMSContentBaseType.java b/bkucommon/src/test/java/moaspss/generated/CMSContentBaseType.java index d14f9c43..d3be5f6c 100644 --- a/bkucommon/src/test/java/moaspss/generated/CMSContentBaseType.java +++ b/bkucommon/src/test/java/moaspss/generated/CMSContentBaseType.java @@ -36,15 +36,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="CMSContentBaseType">
- *   <complexContent>
- *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType">
- *       <choice minOccurs="0">
- *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CMSContentBaseType">
+ *   <complexContent>
+ *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType">
+ *       <choice minOccurs="0">
+ *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CMSDataObjectOptionalMetaType.java b/bkucommon/src/test/java/moaspss/generated/CMSDataObjectOptionalMetaType.java index 8787cabf..b846a9b4 100644 --- a/bkucommon/src/test/java/moaspss/generated/CMSDataObjectOptionalMetaType.java +++ b/bkucommon/src/test/java/moaspss/generated/CMSDataObjectOptionalMetaType.java @@ -37,16 +37,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="CMSDataObjectOptionalMetaType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType" minOccurs="0"/>
- *         <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSContentBaseType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CMSDataObjectOptionalMetaType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType" minOccurs="0"/>
+ *         <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSContentBaseType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CanonicalizationMethodType.java b/bkucommon/src/test/java/moaspss/generated/CanonicalizationMethodType.java index dc990d36..2bac2a81 100644 --- a/bkucommon/src/test/java/moaspss/generated/CanonicalizationMethodType.java +++ b/bkucommon/src/test/java/moaspss/generated/CanonicalizationMethodType.java @@ -42,16 +42,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="CanonicalizationMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CanonicalizationMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CheckResultType.java b/bkucommon/src/test/java/moaspss/generated/CheckResultType.java index fc53ccd6..7334e423 100644 --- a/bkucommon/src/test/java/moaspss/generated/CheckResultType.java +++ b/bkucommon/src/test/java/moaspss/generated/CheckResultType.java @@ -40,16 +40,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="CheckResultType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
- *         <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CheckResultType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
+ *         <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ContentBaseType.java b/bkucommon/src/test/java/moaspss/generated/ContentBaseType.java index 6aeb5f70..9ff71450 100644 --- a/bkucommon/src/test/java/moaspss/generated/ContentBaseType.java +++ b/bkucommon/src/test/java/moaspss/generated/ContentBaseType.java @@ -39,17 +39,17 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ContentBaseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice minOccurs="0">
- *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="XMLContent" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLContentType"/>
- *         <element name="LocRefContent" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ContentBaseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice minOccurs="0">
+ *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element name="XMLContent" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLContentType"/>
+ *         <element name="LocRefContent" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ContentExLocRefBaseType.java b/bkucommon/src/test/java/moaspss/generated/ContentExLocRefBaseType.java index 21ba705f..4f25ac8f 100644 --- a/bkucommon/src/test/java/moaspss/generated/ContentExLocRefBaseType.java +++ b/bkucommon/src/test/java/moaspss/generated/ContentExLocRefBaseType.java @@ -37,16 +37,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ContentExLocRefBaseType">
- *   <complexContent>
- *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentBaseType">
- *       <choice minOccurs="0">
- *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="XMLContent" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLContentType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ContentExLocRefBaseType">
+ *   <complexContent>
+ *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentBaseType">
+ *       <choice minOccurs="0">
+ *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element name="XMLContent" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLContentType"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ContentOptionalRefType.java b/bkucommon/src/test/java/moaspss/generated/ContentOptionalRefType.java index 457bab02..0f4913a1 100644 --- a/bkucommon/src/test/java/moaspss/generated/ContentOptionalRefType.java +++ b/bkucommon/src/test/java/moaspss/generated/ContentOptionalRefType.java @@ -39,13 +39,13 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ContentOptionalRefType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentBaseType">
- *       <attribute name="Reference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ContentOptionalRefType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentBaseType">
+ *       <attribute name="Reference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ContentRequiredRefType.java b/bkucommon/src/test/java/moaspss/generated/ContentRequiredRefType.java index 0c829079..54cefabc 100644 --- a/bkucommon/src/test/java/moaspss/generated/ContentRequiredRefType.java +++ b/bkucommon/src/test/java/moaspss/generated/ContentRequiredRefType.java @@ -36,18 +36,18 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ContentRequiredRefType">
- *   <complexContent>
- *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType">
- *       <choice minOccurs="0">
- *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="XMLContent" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLContentType"/>
- *         <element name="LocRefContent" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *       </choice>
- *       <attribute name="Reference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ContentRequiredRefType">
+ *   <complexContent>
+ *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType">
+ *       <choice minOccurs="0">
+ *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element name="XMLContent" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLContentType"/>
+ *         <element name="LocRefContent" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       </choice>
+ *       <attribute name="Reference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CreateSignatureEnvironmentProfile.java b/bkucommon/src/test/java/moaspss/generated/CreateSignatureEnvironmentProfile.java index b5a75f4a..262e26b9 100644 --- a/bkucommon/src/test/java/moaspss/generated/CreateSignatureEnvironmentProfile.java +++ b/bkucommon/src/test/java/moaspss/generated/CreateSignatureEnvironmentProfile.java @@ -40,16 +40,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CreateSignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureLocationType"/>
- *         <element name="Supplement" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLDataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CreateSignatureLocation" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureLocationType"/>
+ *         <element name="Supplement" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}XMLDataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CreateSignatureLocationType.java b/bkucommon/src/test/java/moaspss/generated/CreateSignatureLocationType.java index 9b5774f1..dc5cf710 100644 --- a/bkucommon/src/test/java/moaspss/generated/CreateSignatureLocationType.java +++ b/bkucommon/src/test/java/moaspss/generated/CreateSignatureLocationType.java @@ -42,13 +42,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="CreateSignatureLocationType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>token">
- *       <attribute name="Index" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="CreateSignatureLocationType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>token">
+ *       <attribute name="Index" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CreateTransformsInfoProfile.java b/bkucommon/src/test/java/moaspss/generated/CreateTransformsInfoProfile.java index 99466c45..0115b0ff 100644 --- a/bkucommon/src/test/java/moaspss/generated/CreateTransformsInfoProfile.java +++ b/bkucommon/src/test/java/moaspss/generated/CreateTransformsInfoProfile.java @@ -40,16 +40,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CreateTransformsInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}TransformsInfoType"/>
- *         <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}Supplement" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CreateTransformsInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}TransformsInfoType"/>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}Supplement" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureRequest.java b/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureRequest.java index ebf527cc..7f1aa66e 100644 --- a/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureRequest.java +++ b/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureRequest.java @@ -37,12 +37,12 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateXMLSignatureRequestType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateXMLSignatureRequestType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureRequestType.java b/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureRequestType.java index 02afca65..211dc249 100644 --- a/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureRequestType.java +++ b/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureRequestType.java @@ -43,50 +43,50 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="CreateXMLSignatureRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="KeyIdentifier" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}KeyIdentifierType"/>
- *         <element name="SingleSignatureInfo" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="DataObjectInfo" maxOccurs="unbounded">
- *                     <complexType>
- *                       <complexContent>
- *                         <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}DataObjectInfoType">
- *                           <attribute name="ChildOfManifest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *                         </extension>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                   <element name="CreateSignatureInfo" minOccurs="0">
- *                     <complexType>
- *                       <complexContent>
- *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                           <sequence>
- *                             <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
- *                             <choice>
- *                               <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureEnvironmentProfile"/>
- *                               <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/>
- *                             </choice>
- *                           </sequence>
- *                         </restriction>
- *                       </complexContent>
- *                     </complexType>
- *                   </element>
- *                 </sequence>
- *                 <attribute name="SecurityLayerConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateXMLSignatureRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="KeyIdentifier" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}KeyIdentifierType"/>
+ *         <element name="SingleSignatureInfo" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="DataObjectInfo" maxOccurs="unbounded">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}DataObjectInfoType">
+ *                           <attribute name="ChildOfManifest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *                         </extension>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                   <element name="CreateSignatureInfo" minOccurs="0">
+ *                     <complexType>
+ *                       <complexContent>
+ *                         <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           <sequence>
+ *                             <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
+ *                             <choice>
+ *                               <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureEnvironmentProfile"/>
+ *                               <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/>
+ *                             </choice>
+ *                           </sequence>
+ *                         </restriction>
+ *                       </complexContent>
+ *                     </complexType>
+ *                   </element>
+ *                 </sequence>
+ *                 <attribute name="SecurityLayerConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -166,39 +166,39 @@ public class CreateXMLSignatureRequestType { *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="DataObjectInfo" maxOccurs="unbounded">
-     *           <complexType>
-     *             <complexContent>
-     *               <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}DataObjectInfoType">
-     *                 <attribute name="ChildOfManifest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *               </extension>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *         <element name="CreateSignatureInfo" minOccurs="0">
-     *           <complexType>
-     *             <complexContent>
-     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *                 <sequence>
-     *                   <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
-     *                   <choice>
-     *                     <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureEnvironmentProfile"/>
-     *                     <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/>
-     *                   </choice>
-     *                 </sequence>
-     *               </restriction>
-     *             </complexContent>
-     *           </complexType>
-     *         </element>
-     *       </sequence>
-     *       <attribute name="SecurityLayerConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="DataObjectInfo" maxOccurs="unbounded">
+     *           <complexType>
+     *             <complexContent>
+     *               <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}DataObjectInfoType">
+     *                 <attribute name="ChildOfManifest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+     *               </extension>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *         <element name="CreateSignatureInfo" minOccurs="0">
+     *           <complexType>
+     *             <complexContent>
+     *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *                 <sequence>
+     *                   <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
+     *                   <choice>
+     *                     <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureEnvironmentProfile"/>
+     *                     <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/>
+     *                   </choice>
+     *                 </sequence>
+     *               </restriction>
+     *             </complexContent>
+     *           </complexType>
+     *         </element>
+     *       </sequence>
+     *       <attribute name="SecurityLayerConformity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      *
* * @@ -305,19 +305,19 @@ public class CreateXMLSignatureRequestType { *

The following schema fragment specifies the expected content contained within this class. * * 

-         * <complexType>
-         *   <complexContent>
-         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-         *       <sequence>
-         *         <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
-         *         <choice>
-         *           <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureEnvironmentProfile"/>
-         *           <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/>
-         *         </choice>
-         *       </sequence>
-         *     </restriction>
-         *   </complexContent>
-         * </complexType>
+         * <complexType>
+         *   <complexContent>
+         *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+         *       <sequence>
+         *         <element name="CreateSignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
+         *         <choice>
+         *           <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateSignatureEnvironmentProfile"/>
+         *           <element name="CreateSignatureEnvironmentProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/>
+         *         </choice>
+         *       </sequence>
+         *     </restriction>
+         *   </complexContent>
+         * </complexType>
          *
* * @@ -419,13 +419,13 @@ public class CreateXMLSignatureRequestType { *

The following schema fragment specifies the expected content contained within this class. * * 

-         * <complexType>
-         *   <complexContent>
-         *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}DataObjectInfoType">
-         *       <attribute name="ChildOfManifest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-         *     </extension>
-         *   </complexContent>
-         * </complexType>
+         * <complexType>
+         *   <complexContent>
+         *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}DataObjectInfoType">
+         *       <attribute name="ChildOfManifest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+         *     </extension>
+         *   </complexContent>
+         * </complexType>
          *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureResponseType.java b/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureResponseType.java index db03c36d..7a6399b9 100644 --- a/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureResponseType.java +++ b/bkucommon/src/test/java/moaspss/generated/CreateXMLSignatureResponseType.java @@ -42,26 +42,26 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="CreateXMLSignatureResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="SignatureEnvironment">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <any/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}ErrorResponse"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateXMLSignatureResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="SignatureEnvironment">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <any/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}ErrorResponse"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -115,15 +115,15 @@ public class CreateXMLSignatureResponseType { *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <any/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <any/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/DSAKeyValueType.java b/bkucommon/src/test/java/moaspss/generated/DSAKeyValueType.java index 5551cecc..3d0fda2e 100644 --- a/bkucommon/src/test/java/moaspss/generated/DSAKeyValueType.java +++ b/bkucommon/src/test/java/moaspss/generated/DSAKeyValueType.java @@ -37,25 +37,25 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="DSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <sequence minOccurs="0">
- *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <sequence minOccurs="0">
- *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <sequence minOccurs="0">
+ *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <sequence minOccurs="0">
+ *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/DataObjectInfoType.java b/bkucommon/src/test/java/moaspss/generated/DataObjectInfoType.java index 463adb8e..9d535077 100644 --- a/bkucommon/src/test/java/moaspss/generated/DataObjectInfoType.java +++ b/bkucommon/src/test/java/moaspss/generated/DataObjectInfoType.java @@ -41,34 +41,34 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="DataObjectInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DataObject">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType">
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <choice>
- *           <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateTransformsInfoProfile"/>
- *           <element name="CreateTransformsInfoProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="Structure" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <enumeration value="detached"/>
- *             <enumeration value="enveloping"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DataObjectInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DataObject">
+ *           <complexType>
+ *             <complexContent>
+ *               <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType">
+ *               </extension>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <choice>
+ *           <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}CreateTransformsInfoProfile"/>
+ *           <element name="CreateTransformsInfoProfileID" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ProfileIdentifierType"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="Structure" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="detached"/>
+ *             <enumeration value="enveloping"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -197,12 +197,12 @@ public class DataObjectInfoType { *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <complexContent>
-     *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType">
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType">
+     *     </extension>
+     *   </complexContent>
+     * </complexType>
      *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/DigestMethodType.java b/bkucommon/src/test/java/moaspss/generated/DigestMethodType.java index 1f6af96c..85014cba 100644 --- a/bkucommon/src/test/java/moaspss/generated/DigestMethodType.java +++ b/bkucommon/src/test/java/moaspss/generated/DigestMethodType.java @@ -43,16 +43,16 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="DigestMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DigestMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ErrorResponseType.java b/bkucommon/src/test/java/moaspss/generated/ErrorResponseType.java index 1937f129..0399d4ae 100644 --- a/bkucommon/src/test/java/moaspss/generated/ErrorResponseType.java +++ b/bkucommon/src/test/java/moaspss/generated/ErrorResponseType.java @@ -38,16 +38,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ErrorResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ErrorResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         <element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/FinalDataMetaInfoType.java b/bkucommon/src/test/java/moaspss/generated/FinalDataMetaInfoType.java index d482d6df..0be0ad00 100644 --- a/bkucommon/src/test/java/moaspss/generated/FinalDataMetaInfoType.java +++ b/bkucommon/src/test/java/moaspss/generated/FinalDataMetaInfoType.java @@ -38,15 +38,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="FinalDataMetaInfoType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType">
- *       <sequence>
- *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FinalDataMetaInfoType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType">
+ *       <sequence>
+ *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/InputDataType.java b/bkucommon/src/test/java/moaspss/generated/InputDataType.java index c9c445b5..d59a4426 100644 --- a/bkucommon/src/test/java/moaspss/generated/InputDataType.java +++ b/bkucommon/src/test/java/moaspss/generated/InputDataType.java @@ -41,21 +41,21 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="InputDataType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentExLocRefBaseType">
- *       <attribute name="PartOf" default="SignedInfo">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *             <enumeration value="SignedInfo"/>
- *             <enumeration value="XMLDSIGManifest"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="ReferringSigReference" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InputDataType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentExLocRefBaseType">
+ *       <attribute name="PartOf" default="SignedInfo">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *             <enumeration value="SignedInfo"/>
+ *             <enumeration value="XMLDSIGManifest"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="ReferringSigReference" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/KeyInfoType.java b/bkucommon/src/test/java/moaspss/generated/KeyInfoType.java index d27beb1a..17600489 100644 --- a/bkucommon/src/test/java/moaspss/generated/KeyInfoType.java +++ b/bkucommon/src/test/java/moaspss/generated/KeyInfoType.java @@ -49,23 +49,23 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="KeyInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         <any/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/KeyStorageType.java b/bkucommon/src/test/java/moaspss/generated/KeyStorageType.java index 3cece983..16a1d642 100644 --- a/bkucommon/src/test/java/moaspss/generated/KeyStorageType.java +++ b/bkucommon/src/test/java/moaspss/generated/KeyStorageType.java @@ -36,12 +36,12 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. *

* 

- * <simpleType name="KeyStorageType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Software"/>
- *     <enumeration value="Hardware"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="KeyStorageType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="Software"/>
+ *     <enumeration value="Hardware"/>
+ *   </restriction>
+ * </simpleType>
  *
* */ diff --git a/bkucommon/src/test/java/moaspss/generated/KeyValueType.java b/bkucommon/src/test/java/moaspss/generated/KeyValueType.java index 8c94bf61..516ecdb4 100644 --- a/bkucommon/src/test/java/moaspss/generated/KeyValueType.java +++ b/bkucommon/src/test/java/moaspss/generated/KeyValueType.java @@ -44,17 +44,17 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="KeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         <any/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
+ *         <any/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ManifestRefsCheckResultInfoType.java b/bkucommon/src/test/java/moaspss/generated/ManifestRefsCheckResultInfoType.java index 67b1a22a..559131d0 100644 --- a/bkucommon/src/test/java/moaspss/generated/ManifestRefsCheckResultInfoType.java +++ b/bkucommon/src/test/java/moaspss/generated/ManifestRefsCheckResultInfoType.java @@ -36,17 +36,17 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ManifestRefsCheckResultInfoType">
- *   <complexContent>
- *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType">
- *       <sequence>
- *         <any/>
- *         <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ReferringSigReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManifestRefsCheckResultInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType">
+ *       <sequence>
+ *         <any/>
+ *         <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="ReferringSigReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ManifestRefsCheckResultType.java b/bkucommon/src/test/java/moaspss/generated/ManifestRefsCheckResultType.java index dedad98b..67146547 100644 --- a/bkucommon/src/test/java/moaspss/generated/ManifestRefsCheckResultType.java +++ b/bkucommon/src/test/java/moaspss/generated/ManifestRefsCheckResultType.java @@ -36,16 +36,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ManifestRefsCheckResultType">
- *   <complexContent>
- *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType">
- *       <sequence>
- *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
- *         <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ManifestRefsCheckResultInfoType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManifestRefsCheckResultType">
+ *   <complexContent>
+ *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType">
+ *       <sequence>
+ *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
+ *         <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ManifestRefsCheckResultInfoType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ManifestType.java b/bkucommon/src/test/java/moaspss/generated/ManifestType.java index 18116deb..0e79ea33 100644 --- a/bkucommon/src/test/java/moaspss/generated/ManifestType.java +++ b/bkucommon/src/test/java/moaspss/generated/ManifestType.java @@ -44,16 +44,16 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ManifestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManifestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/MetaInfoType.java b/bkucommon/src/test/java/moaspss/generated/MetaInfoType.java index f1b1e6a4..ca347ee6 100644 --- a/bkucommon/src/test/java/moaspss/generated/MetaInfoType.java +++ b/bkucommon/src/test/java/moaspss/generated/MetaInfoType.java @@ -44,17 +44,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="MetaInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MimeType" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MimeTypeType"/>
- *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="MetaInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MimeType" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MimeTypeType"/>
+ *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ObjectType.java b/bkucommon/src/test/java/moaspss/generated/ObjectType.java index 3aed3184..8aab1636 100644 --- a/bkucommon/src/test/java/moaspss/generated/ObjectType.java +++ b/bkucommon/src/test/java/moaspss/generated/ObjectType.java @@ -46,18 +46,18 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ObjectType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObjectType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/PGPDataType.java b/bkucommon/src/test/java/moaspss/generated/PGPDataType.java index c3e17d7f..a3acd569 100644 --- a/bkucommon/src/test/java/moaspss/generated/PGPDataType.java +++ b/bkucommon/src/test/java/moaspss/generated/PGPDataType.java @@ -43,23 +43,23 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="PGPDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *           <any/>
- *         </sequence>
- *         <sequence>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any/>
- *         </sequence>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PGPDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *           <any/>
+ *         </sequence>
+ *         <sequence>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any/>
+ *         </sequence>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/PublicAuthorityType.java b/bkucommon/src/test/java/moaspss/generated/PublicAuthorityType.java index 655359f8..7fb13354 100644 --- a/bkucommon/src/test/java/moaspss/generated/PublicAuthorityType.java +++ b/bkucommon/src/test/java/moaspss/generated/PublicAuthorityType.java @@ -37,15 +37,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="PublicAuthorityType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PublicAuthorityType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/RSAKeyValueType.java b/bkucommon/src/test/java/moaspss/generated/RSAKeyValueType.java index acf0fc3b..fa00c8a7 100644 --- a/bkucommon/src/test/java/moaspss/generated/RSAKeyValueType.java +++ b/bkucommon/src/test/java/moaspss/generated/RSAKeyValueType.java @@ -37,16 +37,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="RSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ReferenceType.java b/bkucommon/src/test/java/moaspss/generated/ReferenceType.java index 263e504d..871aa86f 100644 --- a/bkucommon/src/test/java/moaspss/generated/ReferenceType.java +++ b/bkucommon/src/test/java/moaspss/generated/ReferenceType.java @@ -42,20 +42,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ReferencesCheckResultInfoType.java b/bkucommon/src/test/java/moaspss/generated/ReferencesCheckResultInfoType.java index 0c08e4b3..fa305479 100644 --- a/bkucommon/src/test/java/moaspss/generated/ReferencesCheckResultInfoType.java +++ b/bkucommon/src/test/java/moaspss/generated/ReferencesCheckResultInfoType.java @@ -36,16 +36,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ReferencesCheckResultInfoType">
- *   <complexContent>
- *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType">
- *       <sequence>
- *         <any/>
- *         <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferencesCheckResultInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType">
+ *       <sequence>
+ *         <any/>
+ *         <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/ReferencesCheckResultType.java b/bkucommon/src/test/java/moaspss/generated/ReferencesCheckResultType.java index be45e1f7..0b14de02 100644 --- a/bkucommon/src/test/java/moaspss/generated/ReferencesCheckResultType.java +++ b/bkucommon/src/test/java/moaspss/generated/ReferencesCheckResultType.java @@ -36,16 +36,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="ReferencesCheckResultType">
- *   <complexContent>
- *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType">
- *       <sequence>
- *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
- *         <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ReferencesCheckResultInfoType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferencesCheckResultType">
+ *   <complexContent>
+ *     <restriction base="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType">
+ *       <sequence>
+ *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
+ *         <element name="Info" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ReferencesCheckResultInfoType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/RetrievalMethodType.java b/bkucommon/src/test/java/moaspss/generated/RetrievalMethodType.java index e0eba597..bb635fb5 100644 --- a/bkucommon/src/test/java/moaspss/generated/RetrievalMethodType.java +++ b/bkucommon/src/test/java/moaspss/generated/RetrievalMethodType.java @@ -39,17 +39,17 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="RetrievalMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RetrievalMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/SPKIDataType.java b/bkucommon/src/test/java/moaspss/generated/SPKIDataType.java index 2d7f50ee..86ba582c 100644 --- a/bkucommon/src/test/java/moaspss/generated/SPKIDataType.java +++ b/bkucommon/src/test/java/moaspss/generated/SPKIDataType.java @@ -42,16 +42,16 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SPKIDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SPKIDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/SignatureMethodType.java b/bkucommon/src/test/java/moaspss/generated/SignatureMethodType.java index 1dd81905..a803f40c 100644 --- a/bkucommon/src/test/java/moaspss/generated/SignatureMethodType.java +++ b/bkucommon/src/test/java/moaspss/generated/SignatureMethodType.java @@ -45,17 +45,17 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignatureMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
- *         <any/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
+ *         <any/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/SignaturePropertiesType.java b/bkucommon/src/test/java/moaspss/generated/SignaturePropertiesType.java index 62308fde..52cace05 100644 --- a/bkucommon/src/test/java/moaspss/generated/SignaturePropertiesType.java +++ b/bkucommon/src/test/java/moaspss/generated/SignaturePropertiesType.java @@ -44,16 +44,16 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/SignaturePropertyType.java b/bkucommon/src/test/java/moaspss/generated/SignaturePropertyType.java index 394a5173..d1534e41 100644 --- a/bkucommon/src/test/java/moaspss/generated/SignaturePropertyType.java +++ b/bkucommon/src/test/java/moaspss/generated/SignaturePropertyType.java @@ -46,17 +46,17 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignaturePropertyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <any/>
- *       </choice>
- *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <any/>
+ *       </choice>
+ *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/SignatureType.java b/bkucommon/src/test/java/moaspss/generated/SignatureType.java index 9e1a30a2..c34ac89d 100644 --- a/bkucommon/src/test/java/moaspss/generated/SignatureType.java +++ b/bkucommon/src/test/java/moaspss/generated/SignatureType.java @@ -44,19 +44,19 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignatureType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/SignatureValueType.java b/bkucommon/src/test/java/moaspss/generated/SignatureValueType.java index 6312a3ab..3e3be465 100644 --- a/bkucommon/src/test/java/moaspss/generated/SignatureValueType.java +++ b/bkucommon/src/test/java/moaspss/generated/SignatureValueType.java @@ -42,13 +42,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignatureValueType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="SignatureValueType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/SignedInfoType.java b/bkucommon/src/test/java/moaspss/generated/SignedInfoType.java index df3e15ab..7810c22b 100644 --- a/bkucommon/src/test/java/moaspss/generated/SignedInfoType.java +++ b/bkucommon/src/test/java/moaspss/generated/SignedInfoType.java @@ -44,18 +44,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="SignedInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/TransformParameterType.java b/bkucommon/src/test/java/moaspss/generated/TransformParameterType.java index e5e5e18a..e5b8bb4a 100644 --- a/bkucommon/src/test/java/moaspss/generated/TransformParameterType.java +++ b/bkucommon/src/test/java/moaspss/generated/TransformParameterType.java @@ -39,28 +39,28 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="TransformParameterType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice minOccurs="0">
- *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="Hash">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *                   <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </choice>
- *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformParameterType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice minOccurs="0">
+ *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element name="Hash">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *                   <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </choice>
+ *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -157,16 +157,16 @@ public class TransformParameterType { *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
-     *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+     *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/TransformType.java b/bkucommon/src/test/java/moaspss/generated/TransformType.java index 3ba8c404..81b11096 100644 --- a/bkucommon/src/test/java/moaspss/generated/TransformType.java +++ b/bkucommon/src/test/java/moaspss/generated/TransformType.java @@ -45,17 +45,17 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="TransformType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </choice>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </choice>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/TransformsInfoType.java b/bkucommon/src/test/java/moaspss/generated/TransformsInfoType.java index 9dfa9575..0ea46fe1 100644 --- a/bkucommon/src/test/java/moaspss/generated/TransformsInfoType.java +++ b/bkucommon/src/test/java/moaspss/generated/TransformsInfoType.java @@ -37,16 +37,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="TransformsInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element name="FinalDataMetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}FinalDataMetaInfoType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element name="FinalDataMetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}FinalDataMetaInfoType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/TransformsType.java b/bkucommon/src/test/java/moaspss/generated/TransformsType.java index 4959ea7f..a23ecc02 100644 --- a/bkucommon/src/test/java/moaspss/generated/TransformsType.java +++ b/bkucommon/src/test/java/moaspss/generated/TransformsType.java @@ -39,15 +39,15 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureRequest.java b/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureRequest.java index 66bfc176..05accdc7 100644 --- a/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureRequest.java +++ b/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureRequest.java @@ -40,13 +40,13 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyCMSSignatureRequestType">
- *       <attribute name="Signatories" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}SignatoriesType" default="1" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyCMSSignatureRequestType">
+ *       <attribute name="Signatories" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}SignatoriesType" default="1" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureRequestType.java b/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureRequestType.java index 50eb4dc4..71d884b1 100644 --- a/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureRequestType.java +++ b/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureRequestType.java @@ -42,18 +42,18 @@ import javax.xml.datatype.XMLGregorianCalendar; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="VerifyCMSSignatureRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="CMSSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="DataObject" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSDataObjectOptionalMetaType" minOccurs="0"/>
- *         <element name="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyCMSSignatureRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         <element name="CMSSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element name="DataObject" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CMSDataObjectOptionalMetaType" minOccurs="0"/>
+ *         <element name="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureResponseType.java b/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureResponseType.java index 16d87207..5d6234e7 100644 --- a/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureResponseType.java +++ b/bkucommon/src/test/java/moaspss/generated/VerifyCMSSignatureResponseType.java @@ -41,17 +41,17 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="VerifyCMSSignatureResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
- *         <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/>
- *         <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyCMSSignatureResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+ *         <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/>
+ *         <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/VerifyTransformsDataType.java b/bkucommon/src/test/java/moaspss/generated/VerifyTransformsDataType.java index 7bad2ee3..ed0fae54 100644 --- a/bkucommon/src/test/java/moaspss/generated/VerifyTransformsDataType.java +++ b/bkucommon/src/test/java/moaspss/generated/VerifyTransformsDataType.java @@ -40,16 +40,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="VerifyTransformsDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyTransformsInfoProfile"/>
- *         <element name="VerifyTransformsInfoProfileID" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyTransformsDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyTransformsInfoProfile"/>
+ *         <element name="VerifyTransformsInfoProfileID" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/VerifyTransformsInfoProfile.java b/bkucommon/src/test/java/moaspss/generated/VerifyTransformsInfoProfile.java index 1405ec34..46f37425 100644 --- a/bkucommon/src/test/java/moaspss/generated/VerifyTransformsInfoProfile.java +++ b/bkucommon/src/test/java/moaspss/generated/VerifyTransformsInfoProfile.java @@ -40,16 +40,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element name="TransformParameter" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}TransformParameterType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element name="TransformParameter" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}TransformParameterType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/VerifyXMLSignatureRequestType.java b/bkucommon/src/test/java/moaspss/generated/VerifyXMLSignatureRequestType.java index 9a65a93c..efbf8005 100644 --- a/bkucommon/src/test/java/moaspss/generated/VerifyXMLSignatureRequestType.java +++ b/bkucommon/src/test/java/moaspss/generated/VerifyXMLSignatureRequestType.java @@ -45,45 +45,45 @@ import javax.xml.datatype.XMLGregorianCalendar; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="VerifyXMLSignatureRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="VerifySignatureInfo">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
- *                   <element name="VerifySignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}SupplementProfile"/>
- *           <element name="SupplementProfileID" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         </choice>
- *         <element name="SignatureManifestCheckParams" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="ReferenceInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyTransformsDataType" maxOccurs="unbounded"/>
- *                 </sequence>
- *                 <attribute name="ReturnReferenceInputData" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ReturnHashInputData" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *         <element name="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyXMLSignatureRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         <element name="VerifySignatureInfo">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
+ *                   <element name="VerifySignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <choice maxOccurs="unbounded" minOccurs="0">
+ *           <element ref="{http://reference.e-government.gv.at/namespace/moa/20020822#}SupplementProfile"/>
+ *           <element name="SupplementProfileID" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         </choice>
+ *         <element name="SignatureManifestCheckParams" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="ReferenceInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyTransformsDataType" maxOccurs="unbounded"/>
+ *                 </sequence>
+ *                 <attribute name="ReturnReferenceInputData" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="ReturnHashInputData" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
+ *         <element name="TrustProfileID" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * @@ -275,16 +275,16 @@ public class VerifyXMLSignatureRequestType { *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="ReferenceInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyTransformsDataType" maxOccurs="unbounded"/>
-     *       </sequence>
-     *       <attribute name="ReturnReferenceInputData" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="ReferenceInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}VerifyTransformsDataType" maxOccurs="unbounded"/>
+     *       </sequence>
+     *       <attribute name="ReturnReferenceInputData" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      *
* * @@ -366,16 +366,16 @@ public class VerifyXMLSignatureRequestType { *

The following schema fragment specifies the expected content contained within this class. * * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
-     *         <element name="VerifySignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="VerifySignatureEnvironment" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentOptionalRefType"/>
+     *         <element name="VerifySignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/VerifyXMLSignatureResponseType.java b/bkucommon/src/test/java/moaspss/generated/VerifyXMLSignatureResponseType.java index a827c705..e0782e13 100644 --- a/bkucommon/src/test/java/moaspss/generated/VerifyXMLSignatureResponseType.java +++ b/bkucommon/src/test/java/moaspss/generated/VerifyXMLSignatureResponseType.java @@ -39,21 +39,21 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="VerifyXMLSignatureResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
- *         <element name="HashInputData" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}InputDataType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ReferenceInputData" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}InputDataType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ReferencesCheckResultType"/>
- *         <element name="SignatureManifestCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ReferencesCheckResultType" minOccurs="0"/>
- *         <element name="XMLDSIGManifestCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ManifestRefsCheckResultType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyXMLSignatureResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+ *         <element name="HashInputData" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}InputDataType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="ReferenceInputData" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}InputDataType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ReferencesCheckResultType"/>
+ *         <element name="SignatureManifestCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ReferencesCheckResultType" minOccurs="0"/>
+ *         <element name="XMLDSIGManifestCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ManifestRefsCheckResultType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}CheckResultType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/X509DataType.java b/bkucommon/src/test/java/moaspss/generated/X509DataType.java index 140def2d..9add0bb4 100644 --- a/bkucommon/src/test/java/moaspss/generated/X509DataType.java +++ b/bkucommon/src/test/java/moaspss/generated/X509DataType.java @@ -43,22 +43,22 @@ import org.w3c.dom.Element; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="X509DataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <choice>
- *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509DataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <choice>
+ *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+ *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/X509IssuerSerialType.java b/bkucommon/src/test/java/moaspss/generated/X509IssuerSerialType.java index fc0c6e76..bdf2f681 100644 --- a/bkucommon/src/test/java/moaspss/generated/X509IssuerSerialType.java +++ b/bkucommon/src/test/java/moaspss/generated/X509IssuerSerialType.java @@ -38,16 +38,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="X509IssuerSerialType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509IssuerSerialType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/XMLContentType.java b/bkucommon/src/test/java/moaspss/generated/XMLContentType.java index cf69f8a0..37b3ad0f 100644 --- a/bkucommon/src/test/java/moaspss/generated/XMLContentType.java +++ b/bkucommon/src/test/java/moaspss/generated/XMLContentType.java @@ -39,13 +39,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="XMLContentType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType">
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}space"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="XMLContentType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/moa/20020822#}AnyChildrenType">
+ *       <attribute ref="{http://www.w3.org/XML/1998/namespace}space"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/bkucommon/src/test/java/moaspss/generated/XMLDataObjectAssociationType.java b/bkucommon/src/test/java/moaspss/generated/XMLDataObjectAssociationType.java index bffeef42..6d006f86 100644 --- a/bkucommon/src/test/java/moaspss/generated/XMLDataObjectAssociationType.java +++ b/bkucommon/src/test/java/moaspss/generated/XMLDataObjectAssociationType.java @@ -37,16 +37,16 @@ import javax.xml.bind.annotation.XmlType; *

The following schema fragment specifies the expected content contained within this class. * * 

- * <complexType name="XMLDataObjectAssociationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType" minOccurs="0"/>
- *         <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentRequiredRefType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="XMLDataObjectAssociationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MetaInfo" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}MetaInfoType" minOccurs="0"/>
+ *         <element name="Content" type="{http://reference.e-government.gv.at/namespace/moa/20020822#}ContentRequiredRefType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
* * diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINConfirmationException.java b/smcc/src/main/java/at/gv/egiz/smcc/PINConfirmationException.java index 2299061e..9aee4ca8 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/PINConfirmationException.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/PINConfirmationException.java @@ -28,7 +28,7 @@ package at.gv.egiz.smcc; * TODO check whether card readers distinguish specific reason (pin too short?) * and add getters/setters * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINConfirmationException extends SignatureCardException { diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINFormatException.java b/smcc/src/main/java/at/gv/egiz/smcc/PINFormatException.java index ef861b23..272ce69d 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/PINFormatException.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/PINFormatException.java @@ -28,7 +28,7 @@ package at.gv.egiz.smcc; * TODO check whether card readers distinguish specific reason (pin too short?) * and add getters/setters * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINFormatException extends SignatureCardException { diff --git a/smcc/src/main/java/at/gv/egiz/smcc/PINOperationAbortedException.java b/smcc/src/main/java/at/gv/egiz/smcc/PINOperationAbortedException.java index 1f3055e4..3c5f201b 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/PINOperationAbortedException.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/PINOperationAbortedException.java @@ -28,7 +28,7 @@ package at.gv.egiz.smcc; * TODO check whether card readers distinguish specific reason (pin too short?) * and add getters/setters * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINOperationAbortedException extends SignatureCardException { diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java index b3cbaec8..b7c2b9a6 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java @@ -102,7 +102,7 @@ public interface SignatureCard { /** * * @param infobox - * @param provider + * @param pinGUI * @param domainId may be null. * @return * @throws SignatureCardException @@ -115,7 +115,7 @@ public interface SignatureCard { * * @param input * @param keyboxName - * @param provider + * @param pinGUI * @param alg TODO * @return * @throws at.gv.egiz.smcc.SignatureCardException diff --git a/smcc/src/main/java/at/gv/egiz/smcc/conf/SMCCConfiguration.java b/smcc/src/main/java/at/gv/egiz/smcc/conf/SMCCConfiguration.java index a1801da5..58872409 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/conf/SMCCConfiguration.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/conf/SMCCConfiguration.java @@ -27,7 +27,7 @@ package at.gv.egiz.smcc.conf; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class SMCCConfiguration { diff --git a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java index 2d1ec970..dd24599b 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/ModifyPINProvider.java @@ -35,13 +35,13 @@ import at.gv.egiz.smcc.PinInfo; *
  • new pin (pin activation, no current pin) *
  • puk and new pin (probably verify only?) * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface ModifyPINProvider { /** * - * @param spec + * @param pinInfo * @param retries * @return null if no old value for this pin * @throws at.gv.egiz.smcc.CancelledException if cancelled by user diff --git a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java index 06d5df60..dcf99a09 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINGUI.java @@ -39,7 +39,8 @@ public interface PINGUI extends PINProvider { throws CancelledException, InterruptedException; /** - * @throws CancelledException, InterruptedException if signature-data dialog is interrupted or cancelled + * @throws CancelledException if signature-data dialog is cancelled + * @throws InterruptedException if signature-data dialog is interrupted */ void enterPIN(PinInfo pinInfo, int retries) throws CancelledException, InterruptedException; diff --git a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINProvider.java b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINProvider.java index ef954dd8..b740c0ad 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINProvider.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/pin/gui/PINProvider.java @@ -37,7 +37,7 @@ import at.gv.egiz.smcc.PinInfo; * * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated) * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface PINProvider { @@ -45,7 +45,7 @@ public interface PINProvider { * TODO change interface to void providePIN(char[] pin, pinspec, retries) * to allow caller to clear pin afterwards. * - * @param spec + * @param pinSpec * @param retries num of remaining retries or -1 if unknown * (a positive value does not necessarily signify that there was * already an unsuccessful PIN verification) diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/CardReader.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/CardReader.java index c3d950a7..b05fd8eb 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/reader/CardReader.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/CardReader.java @@ -41,7 +41,7 @@ import javax.smartcardio.Card; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface CardReader { diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java index 06d3d133..6560e73f 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/DefaultCardReader.java @@ -46,7 +46,7 @@ import at.gv.egiz.smcc.util.ISO7816Utils; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class DefaultCardReader implements CardReader { diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/PinpadCardReader.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/PinpadCardReader.java index 9a7206ec..48331278 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/reader/PinpadCardReader.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/PinpadCardReader.java @@ -54,7 +54,7 @@ import at.gv.egiz.smcc.util.SMCCHelper; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PinpadCardReader extends DefaultCardReader { diff --git a/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java index 8b49f1a9..5cb28908 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/reader/ReaderFactory.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; /** * TODO - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class ReaderFactory { diff --git a/smcc/src/main/java/at/gv/egiz/smcc/util/LinuxLibraryFinder.java b/smcc/src/main/java/at/gv/egiz/smcc/util/LinuxLibraryFinder.java index 5aed2c2d..94d964c2 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/util/LinuxLibraryFinder.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/util/LinuxLibraryFinder.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; * There is one exception to this rule, the ELF variables DT_RPATH and * DT_RUNPATH are not evaluated, because they are not available in java. * - * @author Tobias Wich + * @author Tobias Wich <tobias.wich@ecsec.de> */ public class LinuxLibraryFinder { @@ -51,6 +51,7 @@ public class LinuxLibraryFinder { *

    * The algorithm to find the library can be found in the ld.so(8) manpage and * is as follows: + *

    *
      *
    1. Check paths in {@code LD_LIBRARY_PATH} environment variable.
      2. *
    2. Check for library in {@code /etc/ld.so.cache} by executing @@ -58,7 +59,6 @@ public class LinuxLibraryFinder { *
    3. Check the base library paths {@code /lib} and {@code /usr/lib} or * {@code /lib64} and {@code /usr/lib64} depending on the architecture.
      4. *
    - *

    * * @param name * Name of the library, such as pcsclite. diff --git a/smcc/src/main/java/org/openecard/scio/osx/PlatformPCSC.java b/smcc/src/main/java/org/openecard/scio/osx/PlatformPCSC.java index e7b048f0..929e5a77 100644 --- a/smcc/src/main/java/org/openecard/scio/osx/PlatformPCSC.java +++ b/smcc/src/main/java/org/openecard/scio/osx/PlatformPCSC.java @@ -34,9 +34,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * OS X specific PlatformPCSC. For more information see {@link package-info}. + * OS X specific PlatformPCSC. For more information see {@link org.openecard.scio.osx}. * - * @author Benedikt Biallowons + * @author Benedikt Biallowons <benedikt.biallowons@ecsec.de> */ public class PlatformPCSC { diff --git a/smcc/src/main/java/org/openecard/scio/osx/SunOSXPCSC.java b/smcc/src/main/java/org/openecard/scio/osx/SunOSXPCSC.java index f05d0373..ef98b341 100644 --- a/smcc/src/main/java/org/openecard/scio/osx/SunOSXPCSC.java +++ b/smcc/src/main/java/org/openecard/scio/osx/SunOSXPCSC.java @@ -29,9 +29,9 @@ import javax.smartcardio.CardTerminals; import javax.smartcardio.TerminalFactorySpi; /** - * OS X PC/SC provider. For more information see {@link package-info}. + * OS X PC/SC provider. For more information see {@link org.openecard.scio.osx}. * - * @author Benedikt Biallowons + * @author Benedikt Biallowons <benedikt.biallowons@ecsec.de> */ public final class SunOSXPCSC extends Provider { @@ -55,11 +55,11 @@ public final class SunOSXPCSC extends Provider { * Internal provider factory. For more information see * {@link TerminalFactorySpi} * - * @author Benedikt Biallowons + * @author Benedikt Biallowons <benedikt.biallowons@ecsec.de> */ public static final class Factory extends TerminalFactorySpi { /** - * Constructor checking availability & initializing context. + * Constructor checking availability & initializing context. * * @param obj * provider parameters diff --git a/smcc/src/main/java/org/openecard/scio/osx/package-info.java b/smcc/src/main/java/org/openecard/scio/osx/package-info.java index 5d066a40..7208e9c0 100644 --- a/smcc/src/main/java/org/openecard/scio/osx/package-info.java +++ b/smcc/src/main/java/org/openecard/scio/osx/package-info.java @@ -22,7 +22,7 @@ /** * This package contains a OS X specific SmartcardIO implementation. We've to do - * this, because the current PC/SC JNI libraries on OS X (jre6 & jre7) are too buggy + * this, because the current PC/SC JNI libraries on OS X (jre6 & jre7) are too buggy * to be useful and the design of the sun.security.smartcardio package doesn't allow * to specify another JNI library path. */ diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/AbstractPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/AbstractPINProvider.java index 0c28bff9..ccdd22a4 100644 --- a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/AbstractPINProvider.java +++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/AbstractPINProvider.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; /** * common super class providing action listener for all PIN GUIs - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public abstract class AbstractPINProvider implements ActionListener { diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINGUI.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINGUI.java index 4fbba32e..bc49b85e 100644 --- a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINGUI.java +++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINGUI.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; * * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated) * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class SignPINGUI extends SignPINProvider implements PINGUI { diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINProvider.java index e8650535..f9dfe068 100644 --- a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINProvider.java +++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/SignPINProvider.java @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; * * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated) * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class SignPINProvider extends AbstractPINProvider implements PINProvider { diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java index 4637dc50..73be5bbe 100644 --- a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java +++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINGUI.java @@ -38,7 +38,7 @@ import at.gv.egiz.smcc.pin.gui.PINGUI; * * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated) * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class VerifyPINGUI extends VerifyPINProvider implements PINGUI { diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java index 6a96aedf..59ee0593 100644 --- a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java +++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; * * (ACOS: reload counter: between 0 and 15, where 15 meens deactivated) * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class VerifyPINProvider extends AbstractPINProvider implements PINProvider { diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java index daffa394..2bb6f492 100644 --- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java +++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/AbstractBKUWorker.java @@ -44,10 +44,10 @@ import at.gv.egiz.stal.STALResponse; * Abstract base class for AppletBKUWorker and LocalBKUWorker, * providing card specific functionality not implemented by AbstractSMCCSTAL * as well as common GUI functionality (action event handling). - *
    + *
    * This class implements SMCCSTALRequestHandler and registers itself as QUIT handler. * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public abstract class AbstractBKUWorker extends AbstractSMCCSTAL implements ActionListener, SMCCSTALRequestHandler { diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java index 1d2240e3..ea279f40 100644 --- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java +++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SecureViewer.java @@ -30,7 +30,7 @@ import java.security.DigestException; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public interface SecureViewer { @@ -40,7 +40,9 @@ public interface SecureViewer { * (LocalSignRequestHandler operates on DataObjectHashDataInput, * other SignRequestHandlers should cache the HashDataInputs obtained by webservice calls, * or simply forward to a HashDataInputServlet.) - * @param signedReferences The caller may select a subset of the references in SignedInfo to be displayed. + * @param signedInfo The caller may select a subset of the references in SignedInfo to be displayed. + * @param okListener + * @param okCommand * @throws java.security.DigestException if digest values are verified and do not correspond * (or any other digest computation error occurs) * @throws java.lang.Exception diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/StatusRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/StatusRequestHandler.java index 86711ca4..bb176fdc 100644 --- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/StatusRequestHandler.java +++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/StatusRequestHandler.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class StatusRequestHandler extends AbstractRequestHandler { diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java index c5cf0cc7..4e9e0ac6 100644 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java @@ -25,7 +25,7 @@ package at.gv.egiz.bku.smccstal; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ import java.io.File; diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java index e1843dc7..413b618d 100644 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java @@ -34,7 +34,7 @@ import at.gv.egiz.stal.ext.GetHardwareInfoResponse; /** * -* @author Thomas Lenz +* @author Thomas Lenz <thomas.lenz@iaik.tugraz.at> */ public class GetHardwareInfoRequestHandler extends AbstractRequestHandler { diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java index fe232301..16756f9b 100644 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/IdentityLinkRequestHandler.java @@ -42,7 +42,7 @@ import at.gv.egiz.stal.ext.IdentityLinkResponse; /** * - * @author Andreas Fitzek + * @author Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> */ public class IdentityLinkRequestHandler extends AbstractRequestHandler { diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java index 26cb9368..c24798f8 100644 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/PINManagementRequestHandler.java @@ -49,7 +49,7 @@ import at.gv.egiz.stal.ext.PINManagementResponse; /** * - * @author Clemens Orthacker + * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at> */ public class PINManagementRequestHandler extends AbstractRequestHandler { diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ATRType.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ATRType.java index 94b3711d..af3ce8f6 100644 --- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ATRType.java +++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ATRType.java @@ -45,13 +45,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

    The following schema fragment specifies the expected content contained within this class. * * 

    - * <complexType name="ATRType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
- *       <attribute name="rc" type="{http://www.w3.org/2001/XMLSchema}integer" default="0" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ATRType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
+ *       <attribute name="rc" type="{http://www.w3.org/2001/XMLSchema}integer" default="0" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  *
    * * diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/AttributeList.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/AttributeList.java index 2977100b..8fa0128a 100644 --- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/AttributeList.java +++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/AttributeList.java @@ -41,15 +41,15 @@ import javax.xml.bind.annotation.XmlType; *

    The following schema fragment specifies the expected content contained within this class. * * 

    - * <complexType name="AttributeList">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Attribute" type="{}AttributeType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeList">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Attribute" type="{}AttributeType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
    * * diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/AttributeType.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/AttributeType.java index d4ad8df9..00309711 100644 --- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/AttributeType.java +++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/AttributeType.java @@ -43,22 +43,22 @@ import javax.xml.datatype.XMLGregorianCalendar; *

    The following schema fragment specifies the expected content contained within this class. * * 

    - * <complexType name="AttributeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Integer" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         <element name="Latin1String" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="UTF8String" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="NumericString" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="PrintableString" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="GeneralizedTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="Date" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="oid" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Integer" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         <element name="Latin1String" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="UTF8String" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="NumericString" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="PrintableString" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="GeneralizedTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         <element name="Date" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="oid" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  *
    * * diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/CommandAPDUType.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/CommandAPDUType.java index 766c748a..77e1a88d 100644 --- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/CommandAPDUType.java +++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/CommandAPDUType.java @@ -45,15 +45,15 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; *

    The following schema fragment specifies the expected content contained within this class. * * 

    - * <complexType name="CommandAPDUType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
- *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="CommandAPDUType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
+ *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  *
    * * diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ObjectFactory.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ObjectFactory.java index 9faeec5f..fd82de5d 100644 --- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ObjectFactory.java +++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ObjectFactory.java @@ -52,7 +52,7 @@ public class ObjectFactory { private final static QName _Grunddaten_QNAME = new QName("", "Grunddaten"); private final static QName _Script_QNAME = new QName("", "Script"); - /** A-Trust expects 
    <Result>
    instead of 
    <Response>
    */ + /** A-Trust expects 
    <Result>
    instead of 
    <Response>}}
-     *  A-Trust expects 
    <Result>
     instead of 
    <Response>
     
+     *  A-Trust expects 
    <Result>
     instead of 
    <Response>
     
      */
     @XmlElementDecl(namespace = "", name = "Result") //Response")
     public JAXBElement createResponse(ResponseType value) {
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResetType.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResetType.java
index 44912b13..b2895ddb 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResetType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResetType.java
@@ -39,13 +39,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ResetType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="cold" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResetType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="cold" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResponseAPDUType.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResponseAPDUType.java
index 35e42f48..20a7221f 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResponseAPDUType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResponseAPDUType.java
@@ -45,15 +45,15 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ResponseAPDUType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
- *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="rc" type="{http://www.w3.org/2001/XMLSchema}integer" default="0" />
- *       <attribute name="sw" type="{http://www.w3.org/2001/XMLSchema}hexBinary" default="9000" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ResponseAPDUType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
+ *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="rc" type="{http://www.w3.org/2001/XMLSchema}integer" default="0" />
+ *       <attribute name="sw" type="{http://www.w3.org/2001/XMLSchema}hexBinary" default="9000" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResponseType.java
index 1aaa2366..35cbc3f0 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ResponseType.java
@@ -43,16 +43,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="ATR" type="{}ATRType"/>
- *         <element name="ResponseAPDU" type="{}ResponseAPDUType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="ATR" type="{}ATRType"/>
+ *         <element name="ResponseAPDU" type="{}ResponseAPDUType"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ScriptType.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ScriptType.java
index 344b65cc..577168ce 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ScriptType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/ScriptType.java
@@ -42,17 +42,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ScriptType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="Reset" type="{}ResetType"/>
- *         <element name="CommandAPDU" type="{}CommandAPDUType"/>
- *         <element name="VerifyAPDU" type="{}VerifyAPDUType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ScriptType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="Reset" type="{}ResetType"/>
+ *         <element name="CommandAPDU" type="{}CommandAPDUType"/>
+ *         <element name="VerifyAPDU" type="{}VerifyAPDUType"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/VerifyAPDUType.java b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/VerifyAPDUType.java
index 8f0a319b..b2125f2a 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/VerifyAPDUType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/cardchannel/VerifyAPDUType.java
@@ -45,19 +45,19 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="VerifyAPDUType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
- *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
- *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
- *       <attribute name="message" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="format" use="required" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
- *       <attribute name="offset" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *       <attribute name="timeout" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="VerifyAPDUType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
+ *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
+ *       <attribute name="message" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="format" use="required" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
+ *       <attribute name="offset" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="timeout" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/personenbindung/_20020506_/CompressedIdentityLinkType.java b/utils/src/main/java/at/buergerkarte/namespaces/personenbindung/_20020506_/CompressedIdentityLinkType.java
index 4153aaa2..b0adb841 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/personenbindung/_20020506_/CompressedIdentityLinkType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/personenbindung/_20020506_/CompressedIdentityLinkType.java
@@ -48,23 +48,23 @@ import org.w3._2000._09.xmldsig_.KeyValueType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CompressedIdentityLinkType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="IssuerTemplate" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="AssertionID" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="IssueInstant" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="PersonData" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractPersonType"/>
- *         <element name="CitizenPublicKey" type="{http://www.w3.org/2000/09/xmldsig#}KeyValueType" maxOccurs="unbounded"/>
- *         <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="ReferenceDigest" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <element name="ReferenceManifestDigest" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <element name="ManifestReferenceDigest" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CompressedIdentityLinkType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="IssuerTemplate" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="AssertionID" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="IssueInstant" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="PersonData" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractPersonType"/>
+ *         <element name="CitizenPublicKey" type="{http://www.w3.org/2000/09/xmldsig#}KeyValueType" maxOccurs="unbounded"/>
+ *         <element name="SignatureValue" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="ReferenceDigest" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <element name="ReferenceManifestDigest" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <element name="ManifestReferenceDigest" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/APDUATRType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/APDUATRType.java
index f603974d..d4dfb6f6 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/APDUATRType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/APDUATRType.java
@@ -22,13 +22,13 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="APDUATRType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="rc" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="APDUATRType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="rc" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/APDUResponseElement.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/APDUResponseElement.java
index c4c9b036..09296646 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/APDUResponseElement.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/APDUResponseElement.java
@@ -23,16 +23,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="APDUResponseElement">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="ATR" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}APDUATRType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="ResponseAPDU" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ResponseAPDUType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="APDUResponseElement">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="ATR" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}APDUATRType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="ResponseAPDU" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ResponseAPDUType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AccessAuthorizationType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AccessAuthorizationType.java
index 34ea4c61..558a0a31 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AccessAuthorizationType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AccessAuthorizationType.java
@@ -23,16 +23,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AccessAuthorizationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="RequesterID" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}RequesterIDType" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="UserMayChange" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AccessAuthorizationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="RequesterID" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}RequesterIDType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="UserMayChange" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AllSignatoriesType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AllSignatoriesType.java
index 593d1b71..1b5342ff 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AllSignatoriesType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AllSignatoriesType.java
@@ -19,11 +19,11 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="AllSignatoriesType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="all"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="AllSignatoriesType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="all"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AnyChildrenType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AnyChildrenType.java
index 2a258447..92bc06e9 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AnyChildrenType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AnyChildrenType.java
@@ -24,15 +24,15 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AnyChildrenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any processContents='lax'/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AnyChildrenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <any processContents='lax'/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AnyMixedChildrenType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AnyMixedChildrenType.java
index b848f2f7..92911ae0 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AnyMixedChildrenType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AnyMixedChildrenType.java
@@ -25,15 +25,15 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AnyMixedChildrenType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any processContents='lax'/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AnyMixedChildrenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <any processContents='lax'/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ApplicationIdentifierType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ApplicationIdentifierType.java
index 2afdcf39..93773b7e 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ApplicationIdentifierType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ApplicationIdentifierType.java
@@ -19,13 +19,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="ApplicationIdentifierType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="SecureSignatureApplication"/>
- *     <enumeration value="CertifiedApplication"/>
- *     <enumeration value="InfoboxApplication"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="ApplicationIdentifierType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="SecureSignatureApplication"/>
+ *     <enumeration value="CertifiedApplication"/>
+ *     <enumeration value="InfoboxApplication"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AuthenticationClassType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AuthenticationClassType.java
index 0c4a9653..44ab7eb8 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AuthenticationClassType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/AuthenticationClassType.java
@@ -19,14 +19,14 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="AuthenticationClassType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="anonym"/>
- *     <enumeration value="pseudoanonym"/>
- *     <enumeration value="certified"/>
- *     <enumeration value="certifiedGovAgency"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="AuthenticationClassType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="anonym"/>
+ *     <enumeration value="pseudoanonym"/>
+ *     <enumeration value="certified"/>
+ *     <enumeration value="certifiedGovAgency"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64ContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64ContentType.java
index a0655377..66ca5669 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64ContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64ContentType.java
@@ -21,15 +21,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="Base64ContentType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice minOccurs="0">
- *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="Base64ContentType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice minOccurs="0">
+ *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64OptRefContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64OptRefContentType.java
index eb52f620..a0986f02 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64OptRefContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64OptRefContentType.java
@@ -21,13 +21,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="Base64OptRefContentType">
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64ContentType">
- *       <attribute name="Reference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="Base64OptRefContentType">
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64ContentType">
+ *       <attribute name="Reference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLContentType.java
index 8280a1de..a3d9af2d 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLContentType.java
@@ -21,16 +21,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="Base64XMLContentType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice minOccurs="0">
- *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="XMLContent" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLContentType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="Base64XMLContentType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice minOccurs="0">
+ *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element name="XMLContent" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLContentType"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefContentType.java
index 6208d94b..9174ba38 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefContentType.java
@@ -22,17 +22,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="Base64XMLLocRefContentType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice minOccurs="0">
- *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="XMLContent" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLContentType"/>
- *         <element name="LocRefContent" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="Base64XMLLocRefContentType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice minOccurs="0">
+ *         <element name="Base64Content" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element name="XMLContent" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLContentType"/>
+ *         <element name="LocRefContent" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefOptRefContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefOptRefContentType.java
index 799421de..a377eb7d 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefOptRefContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefOptRefContentType.java
@@ -21,13 +21,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="Base64XMLLocRefOptRefContentType">
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefContentType">
- *       <attribute name="Reference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="Base64XMLLocRefOptRefContentType">
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefContentType">
+ *       <attribute name="Reference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefReqRefContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefReqRefContentType.java
index 6112946e..a0eb4620 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefReqRefContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLLocRefReqRefContentType.java
@@ -21,13 +21,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="Base64XMLLocRefReqRefContentType">
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefContentType">
- *       <attribute name="Reference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="Base64XMLLocRefReqRefContentType">
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefContentType">
+ *       <attribute name="Reference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLOptRefContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLOptRefContentType.java
index 130b1076..b2ce6aea 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLOptRefContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/Base64XMLOptRefContentType.java
@@ -21,13 +21,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="Base64XMLOptRefContentType">
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLContentType">
- *       <attribute name="Reference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="Base64XMLOptRefContentType">
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLContentType">
+ *       <attribute name="Reference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BindingType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BindingType.java
index 0bd8bed6..3991f208 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BindingType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BindingType.java
@@ -23,13 +23,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="BindingType">
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyChildrenType">
- *       <attribute name="Identifier" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="BindingType">
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyChildrenType">
+ *       <attribute name="Identifier" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BulkRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BulkRequestType.java
index aef16b63..c646fa30 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BulkRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BulkRequestType.java
@@ -27,70 +27,70 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="BulkRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="CreateSignatureRequest" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <choice>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateCMSSignatureRequest"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateXMLSignatureRequest"/>
- *                 </choice>
- *                 <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="VerifySignatureRequest" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <choice>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyCMSSignatureRequest"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyXMLSignatureRequest"/>
- *                 </choice>
- *                 <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="EncryptRequest" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <choice>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptCMSRequest"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLRequest"/>
- *                 </choice>
- *                 <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="DecryptRequest" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <choice>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptCMSRequest"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptXMLRequest"/>
- *                 </choice>
- *                 <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="BulkRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="CreateSignatureRequest" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <choice>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateCMSSignatureRequest"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateXMLSignatureRequest"/>
+ *                 </choice>
+ *                 <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="VerifySignatureRequest" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <choice>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyCMSSignatureRequest"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyXMLSignatureRequest"/>
+ *                 </choice>
+ *                 <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="EncryptRequest" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <choice>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptCMSRequest"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLRequest"/>
+ *                 </choice>
+ *                 <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="DecryptRequest" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <choice>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptCMSRequest"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptXMLRequest"/>
+ *                 </choice>
+ *                 <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -236,18 +236,18 @@ public class BulkRequestType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <choice>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateCMSSignatureRequest"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateXMLSignatureRequest"/>
-     *       </choice>
-     *       <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <choice>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateCMSSignatureRequest"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateXMLSignatureRequest"/>
+     *       </choice>
+     *       <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -376,18 +376,18 @@ public class BulkRequestType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <choice>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptCMSRequest"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptXMLRequest"/>
-     *       </choice>
-     *       <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <choice>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptCMSRequest"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptXMLRequest"/>
+     *       </choice>
+     *       <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -516,18 +516,18 @@ public class BulkRequestType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <choice>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptCMSRequest"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLRequest"/>
-     *       </choice>
-     *       <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <choice>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptCMSRequest"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLRequest"/>
+     *       </choice>
+     *       <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -656,18 +656,18 @@ public class BulkRequestType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <choice>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyCMSSignatureRequest"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyXMLSignatureRequest"/>
-     *       </choice>
-     *       <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <choice>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyCMSSignatureRequest"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyXMLSignatureRequest"/>
+     *       </choice>
+     *       <attribute name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BulkResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BulkResponseType.java
index dd06fb4f..725faa13 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BulkResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/BulkResponseType.java
@@ -27,70 +27,70 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="BulkResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="CreateSignatureResponse" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <choice>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateCMSSignatureResponse"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateXMLSignatureResponse"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
- *                 </choice>
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="VerifySignatureResponse" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <choice>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyCMSSignatureResponse"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyXMLSignatureResponse"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
- *                 </choice>
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="EncryptResponse" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <choice>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptCMSResponse"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLResponse"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
- *                 </choice>
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="DecryptResponse" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <choice>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptCMSResponse"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptXMLResponse"/>
- *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
- *                 </choice>
- *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="BulkResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="CreateSignatureResponse" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <choice>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateCMSSignatureResponse"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateXMLSignatureResponse"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
+ *                 </choice>
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="VerifySignatureResponse" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <choice>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyCMSSignatureResponse"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyXMLSignatureResponse"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
+ *                 </choice>
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="EncryptResponse" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <choice>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptCMSResponse"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLResponse"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
+ *                 </choice>
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="DecryptResponse" maxOccurs="unbounded">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <choice>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptCMSResponse"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptXMLResponse"/>
+ *                   <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
+ *                 </choice>
+ *                 <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -236,18 +236,18 @@ public class BulkResponseType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <choice>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateCMSSignatureResponse"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateXMLSignatureResponse"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
-     *       </choice>
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <choice>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateCMSSignatureResponse"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateXMLSignatureResponse"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
+     *       </choice>
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -377,18 +377,18 @@ public class BulkResponseType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <choice>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptCMSResponse"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptXMLResponse"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
-     *       </choice>
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <choice>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptCMSResponse"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DecryptXMLResponse"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
+     *       </choice>
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -518,18 +518,18 @@ public class BulkResponseType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <choice>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptCMSResponse"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLResponse"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
-     *       </choice>
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <choice>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptCMSResponse"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLResponse"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
+     *       </choice>
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -659,18 +659,18 @@ public class BulkResponseType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <choice>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyCMSSignatureResponse"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyXMLSignatureResponse"/>
-     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
-     *       </choice>
-     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <choice>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyCMSSignatureResponse"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyXMLSignatureResponse"/>
+     *         <element ref="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorResponse"/>
+     *       </choice>
+     *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSDataObjectOptionalMetaType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSDataObjectOptionalMetaType.java
index 23a880d7..325d8dbf 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSDataObjectOptionalMetaType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSDataObjectOptionalMetaType.java
@@ -21,17 +21,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CMSDataObjectOptionalMetaType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType" minOccurs="0"/>
- *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64OptRefContentType"/>
- *         <element name="ExcludedByteRange" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ExcludedByteRangeType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CMSDataObjectOptionalMetaType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType" minOccurs="0"/>
+ *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64OptRefContentType"/>
+ *         <element name="ExcludedByteRange" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ExcludedByteRangeType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSDataObjectRequiredMetaType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSDataObjectRequiredMetaType.java
index ffa11f5d..cdd6fe57 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSDataObjectRequiredMetaType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSDataObjectRequiredMetaType.java
@@ -19,17 +19,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CMSDataObjectRequiredMetaType">
- *   <complexContent>
- *     <restriction base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSDataObjectOptionalMetaType">
- *       <sequence>
- *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
- *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64OptRefContentType"/>
- *         <element name="ExcludedByteRange" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ExcludedByteRangeType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CMSDataObjectRequiredMetaType">
+ *   <complexContent>
+ *     <restriction base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSDataObjectOptionalMetaType">
+ *       <sequence>
+ *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
+ *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64OptRefContentType"/>
+ *         <element name="ExcludedByteRange" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ExcludedByteRangeType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSEncryptedContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSEncryptedContentType.java
index 2091ae05..d3334d02 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSEncryptedContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSEncryptedContentType.java
@@ -20,16 +20,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CMSEncryptedContentType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType" minOccurs="0"/>
- *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64OptRefContentType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CMSEncryptedContentType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType" minOccurs="0"/>
+ *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64OptRefContentType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSRecipientPublicKeyType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSRecipientPublicKeyType.java
index 70309110..887ee1e5 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSRecipientPublicKeyType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSRecipientPublicKeyType.java
@@ -20,15 +20,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CMSRecipientPublicKeyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CMSRecipientPublicKeyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSToBeEncryptedType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSToBeEncryptedType.java
index 4fa35be9..041bb302 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSToBeEncryptedType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CMSToBeEncryptedType.java
@@ -20,16 +20,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CMSToBeEncryptedType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
- *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64OptRefContentType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CMSToBeEncryptedType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
+ *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64OptRefContentType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionElement.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionElement.java
index e8d22b53..65fae6a0 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionElement.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionElement.java
@@ -21,15 +21,15 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CardActionElement">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="Action" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionType" />
- *       <attribute name="ApplicationIdentifier" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ApplicationIdentifierType" />
- *       <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="CardActionElement">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="Action" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionType" />
+ *       <attribute name="ApplicationIdentifier" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ApplicationIdentifierType" />
+ *       <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionResponseType.java
index 8a7f2ac4..396afad4 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionResponseType.java
@@ -19,15 +19,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="CardActionResponseType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="OK"/>
- *     <enumeration value="Error"/>
- *     <enumeration value="Blocked"/>
- *     <enumeration value="Activ"/>
- *     <enumeration value="Inactive"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="CardActionResponseType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="OK"/>
+ *     <enumeration value="Error"/>
+ *     <enumeration value="Blocked"/>
+ *     <enumeration value="Activ"/>
+ *     <enumeration value="Inactive"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionType.java
index 59f16dea..f4bf83a5 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardActionType.java
@@ -19,14 +19,14 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="CardActionType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="ActivatePIN"/>
- *     <enumeration value="ChangePIN"/>
- *     <enumeration value="ReadPINStatus"/>
- *     <enumeration value="UnblockPIN"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="CardActionType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="ActivatePIN"/>
+ *     <enumeration value="ChangePIN"/>
+ *     <enumeration value="ReadPINStatus"/>
+ *     <enumeration value="UnblockPIN"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardChannelRequest.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardChannelRequest.java
index 9d3fba6e..f7bd16ba 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardChannelRequest.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardChannelRequest.java
@@ -21,15 +21,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Script" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ScriptElement"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Script" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ScriptElement"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardChannelResponse.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardChannelResponse.java
index 21fb89a2..f8527659 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardChannelResponse.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardChannelResponse.java
@@ -21,15 +21,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Response" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}APDUResponseElement"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Response" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}APDUResponseElement"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardManagementRequest.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardManagementRequest.java
index 05272a12..e75da717 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardManagementRequest.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardManagementRequest.java
@@ -23,15 +23,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CardAction" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionElement" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CardAction" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionElement" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardManagementResponse.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardManagementResponse.java
index 60a28434..29a7bdd7 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardManagementResponse.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CardManagementResponse.java
@@ -23,15 +23,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType>
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Result" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ResultElement" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Result" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ResultElement" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CheckResultType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CheckResultType.java
index b04d8517..6b5be40f 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CheckResultType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CheckResultType.java
@@ -22,16 +22,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CheckResultType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
- *         <element name="Info" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyMixedChildrenType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CheckResultType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
+ *         <element name="Info" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyMixedChildrenType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CommandAPDUType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CommandAPDUType.java
index 688fa44d..84e547d0 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CommandAPDUType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CommandAPDUType.java
@@ -22,15 +22,15 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CommandAPDUType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="CommandAPDUType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="of" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="expectedSW" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateCMSSignatureRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateCMSSignatureRequestType.java
index 7067adb4..5c0d0a4b 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateCMSSignatureRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateCMSSignatureRequestType.java
@@ -23,25 +23,25 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CreateCMSSignatureRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="KeyboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
- *         <element name="DataObject" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSDataObjectRequiredMetaType"/>
- *       </sequence>
- *       <attribute name="Structure" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <enumeration value="detached"/>
- *             <enumeration value="enveloping"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *       <attribute name="PAdESCompatibility" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateCMSSignatureRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="KeyboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
+ *         <element name="DataObject" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSDataObjectRequiredMetaType"/>
+ *       </sequence>
+ *       <attribute name="Structure" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="detached"/>
+ *             <enumeration value="enveloping"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *       <attribute name="PAdESCompatibility" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateCMSSignatureResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateCMSSignatureResponseType.java
index eaa28510..ee529efe 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateCMSSignatureResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateCMSSignatureResponseType.java
@@ -20,15 +20,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CreateCMSSignatureResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CMSSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateCMSSignatureResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CMSSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashInfoRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashInfoRequestType.java
index 9a17f657..aabb2a53 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashInfoRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashInfoRequestType.java
@@ -22,18 +22,18 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CreateHashInfoRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HashData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}HashDataType"/>
- *         <element name="HashAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         <element name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="RespondHashData" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateHashInfoRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HashData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}HashDataType"/>
+ *         <element name="HashAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         <element name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="RespondHashData" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashInfoResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashInfoResponseType.java
index b5aa64b2..66930eae 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashInfoResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashInfoResponseType.java
@@ -21,18 +21,18 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CreateHashInfoResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HashData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}HashDataType" minOccurs="0"/>
- *         <element name="HashAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         <element name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="HashValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateHashInfoResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HashData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}HashDataType" minOccurs="0"/>
+ *         <element name="HashAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         <element name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="HashValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashRequestType.java
index 24b490df..827c978f 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashRequestType.java
@@ -22,15 +22,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CreateHashRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HashInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateHashInfoRequestType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateHashRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HashInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateHashInfoRequestType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashResponseType.java
index efffefab..d9088fc8 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateHashResponseType.java
@@ -22,15 +22,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CreateHashResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HashInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateHashInfoResponseType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateHashResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HashInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CreateHashInfoResponseType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateXMLSignatureRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateXMLSignatureRequestType.java
index 77a5142b..802d56ef 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateXMLSignatureRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateXMLSignatureRequestType.java
@@ -24,17 +24,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CreateXMLSignatureRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="KeyboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
- *         <element name="DataObjectInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectInfoType" maxOccurs="unbounded"/>
- *         <element name="SignatureInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}SignatureInfoCreationType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateXMLSignatureRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="KeyboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
+ *         <element name="DataObjectInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectInfoType" maxOccurs="unbounded"/>
+ *         <element name="SignatureInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}SignatureInfoCreationType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateXMLSignatureResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateXMLSignatureResponseType.java
index 6d5d31a4..6df48246 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateXMLSignatureResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/CreateXMLSignatureResponseType.java
@@ -21,15 +21,15 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CreateXMLSignatureResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any processContents='lax' minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CreateXMLSignatureResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any processContents='lax' minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DataObjectAssociationType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DataObjectAssociationType.java
index 105c0653..e5e7c372 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DataObjectAssociationType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DataObjectAssociationType.java
@@ -20,16 +20,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DataObjectAssociationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType" minOccurs="0"/>
- *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefReqRefContentType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DataObjectAssociationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType" minOccurs="0"/>
+ *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefReqRefContentType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DataObjectInfoType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DataObjectInfoType.java
index 51d78ead..a9f4b339 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DataObjectInfoType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DataObjectInfoType.java
@@ -23,25 +23,25 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DataObjectInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DataObject" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefOptRefContentType"/>
- *         <element name="TransformsInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}TransformsInfoType" maxOccurs="unbounded"/>
- *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Structure" use="required">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <enumeration value="detached"/>
- *             <enumeration value="enveloping"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DataObjectInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DataObject" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefOptRefContentType"/>
+ *         <element name="TransformsInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}TransformsInfoType" maxOccurs="unbounded"/>
+ *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Structure" use="required">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="detached"/>
+ *             <enumeration value="enveloping"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptCMSRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptCMSRequestType.java
index 8e2499bf..d588abda 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptCMSRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptCMSRequestType.java
@@ -21,17 +21,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DecryptCMSRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CMSMessage" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="EncryptedContent" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSEncryptedContentType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ReturnResult" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReturnResultType" default="xml" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DecryptCMSRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CMSMessage" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element name="EncryptedContent" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSEncryptedContentType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ReturnResult" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReturnResultType" default="xml" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptCMSResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptCMSResponseType.java
index 94b1474c..787f697c 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptCMSResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptCMSResponseType.java
@@ -20,15 +20,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DecryptCMSResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DecryptedData" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DecryptCMSResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DecryptedData" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptXMLRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptXMLRequestType.java
index 531f5ab4..c34f214a 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptXMLRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptXMLRequestType.java
@@ -23,18 +23,18 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DecryptXMLRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncryptedContent" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
- *         <element name="EncrElemsSelector" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ReturnResult" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReturnResultType" default="xml" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DecryptXMLRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncryptedContent" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
+ *         <element name="EncrElemsSelector" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ReturnResult" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReturnResultType" default="xml" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptXMLResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptXMLResponseType.java
index 9039f3a8..1dd68502 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptXMLResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/DecryptXMLResponseType.java
@@ -25,26 +25,26 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DecryptXMLResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="CandidateDocument" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLContentType"/>
- *         <element name="DecryptedBinaryData" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *                 <attribute name="EncrElemSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DecryptXMLResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence minOccurs="0">
+ *         <element name="CandidateDocument" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLContentType"/>
+ *         <element name="DecryptedBinaryData" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *                 <attribute name="EncrElemSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -121,15 +121,15 @@ public class DecryptXMLResponseType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
-     *       <attribute name="EncrElemSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+     *       <attribute name="EncrElemSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptCMSRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptCMSRequestType.java
index 864e4468..fd429264 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptCMSRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptCMSRequestType.java
@@ -23,17 +23,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="EncryptCMSRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="RecipientPublicKey" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSRecipientPublicKeyType" maxOccurs="unbounded"/>
- *         <element name="ToBeEncrypted" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSToBeEncryptedType"/>
- *       </sequence>
- *       <attribute name="ReturnBinaryResult" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptCMSRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="RecipientPublicKey" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSRecipientPublicKeyType" maxOccurs="unbounded"/>
+ *         <element name="ToBeEncrypted" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSToBeEncryptedType"/>
+ *       </sequence>
+ *       <attribute name="ReturnBinaryResult" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptCMSResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptCMSResponseType.java
index 3f0f902e..affdd95a 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptCMSResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptCMSResponseType.java
@@ -20,15 +20,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="EncryptCMSResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CMSMessage" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptCMSResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CMSMessage" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLRequest.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLRequest.java
index f6aa4d05..ca33c7a7 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLRequest.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLRequest.java
@@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType>
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLRequestType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptXMLRequestType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLRequestType.java
index bd732a45..8179679b 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLRequestType.java
@@ -23,17 +23,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="EncryptXMLRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="RecipientPublicKey" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLRecipientPublicKeyType" maxOccurs="unbounded"/>
- *         <element name="ToBeEncrypted" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ToBeEncryptedType" maxOccurs="unbounded"/>
- *         <element name="EncryptionInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptionInfoType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptXMLRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="RecipientPublicKey" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLRecipientPublicKeyType" maxOccurs="unbounded"/>
+ *         <element name="ToBeEncrypted" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ToBeEncryptedType" maxOccurs="unbounded"/>
+ *         <element name="EncryptionInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptionInfoType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLResponseType.java
index 55b9da27..0f6c4bd6 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptXMLResponseType.java
@@ -24,26 +24,26 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="EncryptXMLResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncryptionEnvironment">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <any processContents='lax'/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="EncryptedData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptedDataType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptXMLResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncryptionEnvironment">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <any processContents='lax'/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="EncryptedData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}EncryptedDataType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -120,15 +120,15 @@ public class EncryptXMLResponseType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <any processContents='lax'/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <any processContents='lax'/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptedDataType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptedDataType.java
index 6d989613..404a1241 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptedDataType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptedDataType.java
@@ -22,13 +22,13 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="EncryptedDataType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="EncDataReference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="EncryptedDataType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       <attribute name="EncDataReference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptionInfoType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptionInfoType.java
index f50c21ce..98e43fd9 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptionInfoType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/EncryptionInfoType.java
@@ -27,26 +27,26 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="EncryptionInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncryptionEnvironment" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
- *         <element name="EncryptedKeyLocation" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="ParentSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
- *                 <attribute name="NodeCount" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EncryptionInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncryptionEnvironment" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
+ *         <element name="EncryptedKeyLocation" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="ParentSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *                 <attribute name="NodeCount" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -150,14 +150,14 @@ public class EncryptionInfoType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="ParentSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
-     *       <attribute name="NodeCount" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="ParentSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+     *       <attribute name="NodeCount" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ErrorResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ErrorResponseType.java
index dc0b5f00..86b37ac5 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ErrorResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ErrorResponseType.java
@@ -20,16 +20,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ErrorResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ErrorCode" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorCodeType"/>
- *         <element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ErrorResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ErrorCode" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ErrorCodeType"/>
+ *         <element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ExcludedByteRangeType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ExcludedByteRangeType.java
index 9699e989..414a8938 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ExcludedByteRangeType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ExcludedByteRangeType.java
@@ -22,16 +22,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ExcludedByteRangeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="From" type="{http://www.w3.org/2001/XMLSchema}unsignedLong"/>
- *         <element name="To" type="{http://www.w3.org/2001/XMLSchema}unsignedLong"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ExcludedByteRangeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="From" type="{http://www.w3.org/2001/XMLSchema}unsignedLong"/>
+ *         <element name="To" type="{http://www.w3.org/2001/XMLSchema}unsignedLong"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesRequest.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesRequest.java
index c866d520..5e31358d 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesRequest.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesRequest.java
@@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType>
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}GetPropertiesRequestType">
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType>
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}GetPropertiesRequestType">
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesRequestType.java
index 17147255..5b5ae99f 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesRequestType.java
@@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="GetPropertiesRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GetPropertiesRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesResponseType.java
index f1fef203..6f88994c 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetPropertiesResponseType.java
@@ -26,20 +26,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="GetPropertiesResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ViewerMediaType" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MimeTypeType" maxOccurs="unbounded"/>
- *         <element name="XMLSignatureTransform" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
- *         <element name="KeyboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}QualifiedBoxIdentifierType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Binding" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BindingType" maxOccurs="unbounded"/>
- *         <element name="ProtocolVersion" type="{http://www.w3.org/2001/XMLSchema}token" maxOccurs="unbounded"/>
- *         <any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GetPropertiesResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ViewerMediaType" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MimeTypeType" maxOccurs="unbounded"/>
+ *         <element name="XMLSignatureTransform" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
+ *         <element name="KeyboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}QualifiedBoxIdentifierType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Binding" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BindingType" maxOccurs="unbounded"/>
+ *         <element name="ProtocolVersion" type="{http://www.w3.org/2001/XMLSchema}token" maxOccurs="unbounded"/>
+ *         <any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetStatusRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetStatusRequestType.java
index b09e15df..2b424470 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetStatusRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetStatusRequestType.java
@@ -22,16 +22,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="GetStatusRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="TokenStatus" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}TokenStatusType"/>
- *         <element name="MaxDelay" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GetStatusRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence minOccurs="0">
+ *         <element name="TokenStatus" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}TokenStatusType"/>
+ *         <element name="MaxDelay" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetStatusResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetStatusResponseType.java
index 99c5f1e2..5d558ec1 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetStatusResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/GetStatusResponseType.java
@@ -20,15 +20,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="GetStatusResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="TokenStatus" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}TokenStatusType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GetStatusResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="TokenStatus" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}TokenStatusType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/HashDataType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/HashDataType.java
index ffd13779..3d15e2be 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/HashDataType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/HashDataType.java
@@ -20,16 +20,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="HashDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
- *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="HashDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
+ *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAssocArrayPairType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAssocArrayPairType.java
index 8696add7..5347293f 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAssocArrayPairType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAssocArrayPairType.java
@@ -20,13 +20,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxAssocArrayPairType">
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLContentType">
- *       <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxAssocArrayPairType">
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLContentType">
+ *       <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAvailableRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAvailableRequestType.java
index ffc7d828..7622ef69 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAvailableRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAvailableRequestType.java
@@ -19,12 +19,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxAvailableRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxAvailableRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAvailableResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAvailableResponseType.java
index 788cc2cb..ece1df14 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAvailableResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxAvailableResponseType.java
@@ -24,15 +24,15 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxAvailableResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxAvailableResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxCreateRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxCreateRequestType.java
index 3f242b96..9647f7e8 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxCreateRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxCreateRequestType.java
@@ -22,22 +22,22 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxCreateRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
- *         <element name="InfoboxType" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxTypeType"/>
- *         <element name="Creator" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Purpose" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="ReadAccessAuthorization" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AccessAuthorizationType" minOccurs="0"/>
- *         <element name="UpdateAccessAuthorization" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AccessAuthorizationType" minOccurs="0"/>
- *         <element name="ReadUserConfirmation" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}UserConfirmationType" minOccurs="0"/>
- *         <element name="UpdateUserConfirmation" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}UserConfirmationType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxCreateRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
+ *         <element name="InfoboxType" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxTypeType"/>
+ *         <element name="Creator" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="Purpose" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="ReadAccessAuthorization" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AccessAuthorizationType" minOccurs="0"/>
+ *         <element name="UpdateAccessAuthorization" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AccessAuthorizationType" minOccurs="0"/>
+ *         <element name="ReadUserConfirmation" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}UserConfirmationType" minOccurs="0"/>
+ *         <element name="UpdateUserConfirmation" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}UserConfirmationType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxCreateResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxCreateResponseType.java
index 9c51d64c..e23abbdc 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxCreateResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxCreateResponseType.java
@@ -19,12 +19,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxCreateResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxCreateResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxDeleteRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxDeleteRequestType.java
index f2fb47e8..c7dd3d3f 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxDeleteRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxDeleteRequestType.java
@@ -22,15 +22,15 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxDeleteRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxDeleteRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxDeleteResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxDeleteResponseType.java
index 3f921979..fd5ce658 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxDeleteResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxDeleteResponseType.java
@@ -19,12 +19,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxDeleteResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxDeleteResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadDataAssocArrayType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadDataAssocArrayType.java
index e5b9450b..283b9b78 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadDataAssocArrayType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadDataAssocArrayType.java
@@ -24,20 +24,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxReadDataAssocArrayType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence maxOccurs="unbounded" minOccurs="0">
- *           <element name="Key" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
- *         </sequence>
- *         <sequence maxOccurs="unbounded" minOccurs="0">
- *           <element name="Pair" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxAssocArrayPairType"/>
- *         </sequence>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxReadDataAssocArrayType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence maxOccurs="unbounded" minOccurs="0">
+ *           <element name="Key" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
+ *         </sequence>
+ *         <sequence maxOccurs="unbounded" minOccurs="0">
+ *           <element name="Pair" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxAssocArrayPairType"/>
+ *         </sequence>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadParamsAssocArrayType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadParamsAssocArrayType.java
index b2487955..d982afeb 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadParamsAssocArrayType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadParamsAssocArrayType.java
@@ -23,45 +23,45 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxReadParamsAssocArrayType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="ReadKeys">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="SearchString" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}WildCardSearchStringType" />
- *                 <attribute name="UserMakesUnique" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ReadPairs">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="SearchString" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}WildCardSearchStringType" />
- *                 <attribute name="UserMakesUnique" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *                 <attribute name="ValuesAreXMLEntities" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ReadValue">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Key" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType" />
- *                 <attribute name="ValueIsXMLEntity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxReadParamsAssocArrayType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="ReadKeys">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="SearchString" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}WildCardSearchStringType" />
+ *                 <attribute name="UserMakesUnique" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="ReadPairs">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="SearchString" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}WildCardSearchStringType" />
+ *                 <attribute name="UserMakesUnique" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *                 <attribute name="ValuesAreXMLEntities" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="ReadValue">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="Key" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType" />
+ *                 <attribute name="ValueIsXMLEntity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -160,14 +160,14 @@ public class InfoboxReadParamsAssocArrayType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="SearchString" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}WildCardSearchStringType" />
-     *       <attribute name="UserMakesUnique" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="SearchString" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}WildCardSearchStringType" />
+     *       <attribute name="UserMakesUnique" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -242,15 +242,15 @@ public class InfoboxReadParamsAssocArrayType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="SearchString" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}WildCardSearchStringType" />
-     *       <attribute name="UserMakesUnique" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *       <attribute name="ValuesAreXMLEntities" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="SearchString" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}WildCardSearchStringType" />
+     *       <attribute name="UserMakesUnique" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+     *       <attribute name="ValuesAreXMLEntities" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -355,14 +355,14 @@ public class InfoboxReadParamsAssocArrayType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Key" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType" />
-     *       <attribute name="ValueIsXMLEntity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="Key" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType" />
+     *       <attribute name="ValueIsXMLEntity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadParamsBinaryFileType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadParamsBinaryFileType.java
index ca1e98e3..f6f96ef0 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadParamsBinaryFileType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadParamsBinaryFileType.java
@@ -20,13 +20,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxReadParamsBinaryFileType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="ContentIsXMLEntity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxReadParamsBinaryFileType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="ContentIsXMLEntity" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadRequestType.java
index b0cd6da5..1ba322c7 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadRequestType.java
@@ -22,20 +22,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxReadRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
- *         <choice>
- *           <element name="BinaryFileParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxReadParamsBinaryFileType"/>
- *           <element name="AssocArrayParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxReadParamsAssocArrayType"/>
- *         </choice>
- *         <element name="BoxSpecificParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyChildrenType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxReadRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
+ *         <choice>
+ *           <element name="BinaryFileParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxReadParamsBinaryFileType"/>
+ *           <element name="AssocArrayParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxReadParamsAssocArrayType"/>
+ *         </choice>
+ *         <element name="BoxSpecificParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyChildrenType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadResponseType.java
index b6fb5fb7..a7da7b3a 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxReadResponseType.java
@@ -20,16 +20,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxReadResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="BinaryFileData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLContentType"/>
- *         <element name="AssocArrayData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxReadDataAssocArrayType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxReadResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="BinaryFileData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLContentType"/>
+ *         <element name="AssocArrayData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxReadDataAssocArrayType"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxTypeType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxTypeType.java
index d37ab21e..842a6e29 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxTypeType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxTypeType.java
@@ -19,12 +19,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="InfoboxTypeType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="BinaryFile"/>
- *     <enumeration value="AssocArray"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="InfoboxTypeType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="BinaryFile"/>
+ *     <enumeration value="AssocArray"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateParamsAssocArrayType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateParamsAssocArrayType.java
index 786f2a6f..9e760521 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateParamsAssocArrayType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateParamsAssocArrayType.java
@@ -24,34 +24,34 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxUpdateParamsAssocArrayType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="UpdateKey">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
- *                 <attribute name="NewKey" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="UpdateValue" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxAssocArrayPairType"/>
- *         <element name="DeletePair">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxUpdateParamsAssocArrayType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="UpdateKey">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *                 <attribute name="NewKey" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="UpdateValue" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxAssocArrayPairType"/>
+ *         <element name="DeletePair">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -150,13 +150,13 @@ public class InfoboxUpdateParamsAssocArrayType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -203,14 +203,14 @@ public class InfoboxUpdateParamsAssocArrayType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
-     *       <attribute name="NewKey" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="Key" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+     *       <attribute name="NewKey" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateRequestType.java
index dd81a374..f53db42b 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateRequestType.java
@@ -22,20 +22,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxUpdateRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
- *         <choice>
- *           <element name="BinaryFileParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLContentType"/>
- *           <element name="AssocArrayParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxUpdateParamsAssocArrayType"/>
- *         </choice>
- *         <element name="BoxSpecificParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyChildrenType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxUpdateRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="InfoboxIdentifier" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}BoxIdentifierType"/>
+ *         <choice>
+ *           <element name="BinaryFileParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLContentType"/>
+ *           <element name="AssocArrayParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}InfoboxUpdateParamsAssocArrayType"/>
+ *         </choice>
+ *         <element name="BoxSpecificParameters" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyChildrenType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateResponseType.java
index 873bc70f..34fbe695 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/InfoboxUpdateResponseType.java
@@ -19,12 +19,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InfoboxUpdateResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InfoboxUpdateResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ManifestRefsCheckResultInfoType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ManifestRefsCheckResultInfoType.java
index e39aabbe..0e485785 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ManifestRefsCheckResultInfoType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ManifestRefsCheckResultInfoType.java
@@ -28,17 +28,17 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ManifestRefsCheckResultInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ReferringSigReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManifestRefsCheckResultInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ReferringSigReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *         <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/>
+ *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ManifestRefsCheckResultType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ManifestRefsCheckResultType.java
index aaea6828..b6a2145f 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ManifestRefsCheckResultType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ManifestRefsCheckResultType.java
@@ -22,16 +22,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ManifestRefsCheckResultType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
- *         <element name="Info" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ManifestRefsCheckResultInfoType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManifestRefsCheckResultType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
+ *         <element name="Info" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ManifestRefsCheckResultInfoType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/MetaInfoType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/MetaInfoType.java
index 8d08bc7b..2ef77121 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/MetaInfoType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/MetaInfoType.java
@@ -25,17 +25,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="MetaInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MimeType" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MimeTypeType"/>
- *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="MetaInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MimeType" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MimeTypeType"/>
+ *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/NullOperationRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/NullOperationRequestType.java
index 9e0f5b01..dd28ea62 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/NullOperationRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/NullOperationRequestType.java
@@ -19,12 +19,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="NullOperationRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="NullOperationRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/NullOperationResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/NullOperationResponseType.java
index 966719b6..2e95e71a 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/NullOperationResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/NullOperationResponseType.java
@@ -19,12 +19,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="NullOperationResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="NullOperationResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/QualifiedBoxIdentifierType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/QualifiedBoxIdentifierType.java
index 725d91cb..55d478a2 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/QualifiedBoxIdentifierType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/QualifiedBoxIdentifierType.java
@@ -23,14 +23,14 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="QualifiedBoxIdentifierType">
- *   <simpleContent>
- *     <extension base="<http://www.buergerkarte.at/namespaces/securitylayer/1.2#>BoxIdentifierType">
- *       <attribute name="Signature" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <attribute name="Encryption" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="QualifiedBoxIdentifierType">
+ *   <simpleContent>
+ *     <extension base="<http://www.buergerkarte.at/namespaces/securitylayer/1.2#>BoxIdentifierType">
+ *       <attribute name="Signature" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       <attribute name="Encryption" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReferencesCheckResultInfoType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReferencesCheckResultInfoType.java
index df9ee414..dc3c5f82 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReferencesCheckResultInfoType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReferencesCheckResultInfoType.java
@@ -27,16 +27,16 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ReferencesCheckResultInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferencesCheckResultInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="FailedReference" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" maxOccurs="unbounded" minOccurs="0"/>
+ *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReferencesCheckResultType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReferencesCheckResultType.java
index 95c49f10..353f9664 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReferencesCheckResultType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReferencesCheckResultType.java
@@ -22,16 +22,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ReferencesCheckResultType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
- *         <element name="Info" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReferencesCheckResultInfoType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferencesCheckResultType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Code" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger"/>
+ *         <element name="Info" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReferencesCheckResultInfoType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/RequesterIDType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/RequesterIDType.java
index 0ae82ee1..c6b84f6b 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/RequesterIDType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/RequesterIDType.java
@@ -21,13 +21,13 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="RequesterIDType">
- *   <simpleContent>
- *     <extension base="<http://www.buergerkarte.at/namespaces/securitylayer/1.2#>RequesterIDSimpleType">
- *       <attribute name="AuthenticationClass" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AuthenticationClassType" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="RequesterIDType">
+ *   <simpleContent>
+ *     <extension base="<http://www.buergerkarte.at/namespaces/securitylayer/1.2#>RequesterIDSimpleType">
+ *       <attribute name="AuthenticationClass" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AuthenticationClassType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResetColdType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResetColdType.java
index 3caae469..72e8f516 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResetColdType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResetColdType.java
@@ -19,12 +19,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="ResetColdType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="true"/>
- *     <enumeration value="false"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="ResetColdType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="true"/>
+ *     <enumeration value="false"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResetType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResetType.java
index 6a06e23b..0fa45ad7 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResetType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResetType.java
@@ -20,13 +20,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ResetType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="cold" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ResetColdType" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResetType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="cold" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ResetColdType" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResponseAPDUType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResponseAPDUType.java
index b5c39e33..6c7b9231 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResponseAPDUType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResponseAPDUType.java
@@ -22,15 +22,15 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ResponseAPDUType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="rc" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="SW" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ResponseAPDUType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="sequence" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="rc" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="SW" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResultApplElement.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResultApplElement.java
index d227267e..a0c32bee 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResultApplElement.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResultApplElement.java
@@ -21,16 +21,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ResultApplElement">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="ApplicationIdentifier" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ApplicationIdentifierType" />
- *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Status" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionResponseType" />
- *       <attribute name="RetryCount" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResultApplElement">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="ApplicationIdentifier" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ApplicationIdentifierType" />
+ *       <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="Status" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionResponseType" />
+ *       <attribute name="RetryCount" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResultElement.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResultElement.java
index 87a01113..98a63ecc 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResultElement.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ResultElement.java
@@ -21,16 +21,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ResultElement">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="CardAction" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionType" />
- *       <attribute name="ApplicationIdentifier" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ApplicationIdentifierType" />
- *       <attribute name="Result" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionResponseType" />
- *       <attribute name="RetryCount" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResultElement">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="CardAction" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionType" />
+ *       <attribute name="ApplicationIdentifier" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ApplicationIdentifierType" />
+ *       <attribute name="Result" use="required" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CardActionResponseType" />
+ *       <attribute name="RetryCount" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReturnResultType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReturnResultType.java
index e0f9b0d0..cda9218a 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReturnResultType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ReturnResultType.java
@@ -19,13 +19,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="ReturnResultType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="binary"/>
- *     <enumeration value="xml"/>
- *     <enumeration value="none"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="ReturnResultType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="binary"/>
+ *     <enumeration value="xml"/>
+ *     <enumeration value="none"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ScriptElement.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ScriptElement.java
index 0e8f08e7..ea01aede 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ScriptElement.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ScriptElement.java
@@ -23,16 +23,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ScriptElement">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="Reset" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ResetType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="CommandAPDU" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CommandAPDUType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ScriptElement">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="Reset" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ResetType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="CommandAPDU" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CommandAPDUType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/SignatureInfoCreationType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/SignatureInfoCreationType.java
index 7c658d2a..d1b86712 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/SignatureInfoCreationType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/SignatureInfoCreationType.java
@@ -28,25 +28,25 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignatureInfoCreationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SignatureEnvironment" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
- *         <element name="SignatureLocation">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>token">
- *                 <attribute name="Index" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureInfoCreationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SignatureEnvironment" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
+ *         <element name="SignatureLocation">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>token">
+ *                 <attribute name="Index" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -150,13 +150,13 @@ public class SignatureInfoCreationType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>token">
-     *       <attribute name="Index" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>token">
+     *       <attribute name="Index" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/SignatureInfoVerificationType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/SignatureInfoVerificationType.java
index a0b1bb76..83314daa 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/SignatureInfoVerificationType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/SignatureInfoVerificationType.java
@@ -23,16 +23,16 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignatureInfoVerificationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SignatureEnvironment" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
- *         <element name="SignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureInfoVerificationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SignatureEnvironment" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLOptRefContentType"/>
+ *         <element name="SignatureLocation" type="{http://www.w3.org/2001/XMLSchema}token"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ToBeEncryptedType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ToBeEncryptedType.java
index 3dc09da8..31bacc12 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ToBeEncryptedType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/ToBeEncryptedType.java
@@ -24,35 +24,35 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ToBeEncryptedType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="Element">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Selector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
- *                 <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="ElementContent">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="Selector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
- *                 <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="New" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLToBeEncryptedNewType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ToBeEncryptedType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="Element">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="Selector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *                 <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="ElementContent">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="Selector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *                 <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="New" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLToBeEncryptedNewType"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -151,14 +151,14 @@ public class ToBeEncryptedType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Selector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
-     *       <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="Selector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+     *       <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -232,14 +232,14 @@ public class ToBeEncryptedType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="Selector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
-     *       <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="Selector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+     *       <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/TokenStatusType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/TokenStatusType.java
index dea42c9e..43b36be9 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/TokenStatusType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/TokenStatusType.java
@@ -19,12 +19,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="TokenStatusType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="ready"/>
- *     <enumeration value="removed"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="TokenStatusType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="ready"/>
+ *     <enumeration value="removed"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/TransformsInfoType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/TransformsInfoType.java
index 577c453c..a65cd4af 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/TransformsInfoType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/TransformsInfoType.java
@@ -21,16 +21,16 @@ import org.w3._2000._09.xmldsig_.TransformsType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="TransformsInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element name="FinalDataMetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element name="FinalDataMetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/UserConfirmationSimpleType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/UserConfirmationSimpleType.java
index 5b5f2dbb..54e8ac5f 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/UserConfirmationSimpleType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/UserConfirmationSimpleType.java
@@ -19,14 +19,14 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="UserConfirmationSimpleType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="none"/>
- *     <enumeration value="info"/>
- *     <enumeration value="confirm"/>
- *     <enumeration value="confirmWithSecret"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="UserConfirmationSimpleType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="none"/>
+ *     <enumeration value="info"/>
+ *     <enumeration value="confirm"/>
+ *     <enumeration value="confirmWithSecret"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/UserConfirmationType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/UserConfirmationType.java
index 22df3652..4c7714d3 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/UserConfirmationType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/UserConfirmationType.java
@@ -21,13 +21,13 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="UserConfirmationType">
- *   <simpleContent>
- *     <extension base="<http://www.buergerkarte.at/namespaces/securitylayer/1.2#>UserConfirmationSimpleType">
- *       <attribute name="UserMayChange" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="UserConfirmationType">
+ *   <simpleContent>
+ *     <extension base="<http://www.buergerkarte.at/namespaces/securitylayer/1.2#>UserConfirmationSimpleType">
+ *       <attribute name="UserMayChange" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerificationResultType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerificationResultType.java
index 87df6e24..bac41f1d 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerificationResultType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerificationResultType.java
@@ -20,16 +20,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="VerificationResultType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Result" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerificationResultType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="Result" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyCMSSignatureRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyCMSSignatureRequestType.java
index c83a19da..d2dcbb8e 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyCMSSignatureRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyCMSSignatureRequestType.java
@@ -25,18 +25,18 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="VerifyCMSSignatureRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="CMSSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <element name="DataObject" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSDataObjectOptionalMetaType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Signatories" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}SignatoriesType" default="1" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyCMSSignatureRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         <element name="CMSSignature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <element name="DataObject" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CMSDataObjectOptionalMetaType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Signatories" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}SignatoriesType" default="1" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyCMSSignatureResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyCMSSignatureResponseType.java
index 7d859bc0..16cef8a0 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyCMSSignatureResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyCMSSignatureResponseType.java
@@ -25,17 +25,17 @@ import org.w3._2000._09.xmldsig_.KeyInfoType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="VerifyCMSSignatureResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
- *         <element name="SignatureCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CheckResultType"/>
- *         <element name="CertificateCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CheckResultType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyCMSSignatureResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+ *         <element name="SignatureCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CheckResultType"/>
+ *         <element name="CertificateCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CheckResultType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashInfoRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashInfoRequestType.java
index 40760eb0..19ab4eea 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashInfoRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashInfoRequestType.java
@@ -21,18 +21,18 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="VerifyHashInfoRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HashData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}HashDataType"/>
- *         <element name="HashAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         <element name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="HashValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyHashInfoRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HashData" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}HashDataType"/>
+ *         <element name="HashAlgorithm" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         <element name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="HashValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashRequestType.java
index 53a5cdd5..50d9a340 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashRequestType.java
@@ -22,15 +22,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="VerifyHashRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HashInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyHashInfoRequestType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyHashRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HashInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerifyHashInfoRequestType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashResponseType.java
index 5ed274f6..1fc0c7c8 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyHashResponseType.java
@@ -22,15 +22,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="VerifyHashResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="VerificationResult" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerificationResultType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyHashResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="VerificationResult" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}VerificationResultType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyXMLSignatureRequestType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyXMLSignatureRequestType.java
index 30fe4dbd..b34ccab8 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyXMLSignatureRequestType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyXMLSignatureRequestType.java
@@ -24,17 +24,17 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="VerifyXMLSignatureRequestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="SignatureInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}SignatureInfoVerificationType"/>
- *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyXMLSignatureRequestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DateTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         <element name="SignatureInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}SignatureInfoVerificationType"/>
+ *         <element name="Supplement" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}DataObjectAssociationType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyXMLSignatureResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyXMLSignatureResponseType.java
index 23e53128..487493c3 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyXMLSignatureResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/VerifyXMLSignatureResponseType.java
@@ -23,19 +23,19 @@ import org.w3._2000._09.xmldsig_.KeyInfoType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="VerifyXMLSignatureResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
- *         <element name="SignatureCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReferencesCheckResultType"/>
- *         <element name="SignatureManifestCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReferencesCheckResultType"/>
- *         <element name="XMLDSIGManifestCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ManifestRefsCheckResultType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="CertificateCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CheckResultType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="VerifyXMLSignatureResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/>
+ *         <element name="SignatureCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReferencesCheckResultType"/>
+ *         <element name="SignatureManifestCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ReferencesCheckResultType"/>
+ *         <element name="XMLDSIGManifestCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}ManifestRefsCheckResultType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="CertificateCheck" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}CheckResultType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLContentType.java
index 0d97144f..2acbe0cb 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLContentType.java
@@ -22,13 +22,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="XMLContentType">
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyMixedChildrenType">
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}space"/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="XMLContentType">
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}AnyMixedChildrenType">
+ *       <attribute ref="{http://www.w3.org/XML/1998/namespace}space"/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLRecipientPublicKeyType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLRecipientPublicKeyType.java
index 7fac08f0..a9add5c9 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLRecipientPublicKeyType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLRecipientPublicKeyType.java
@@ -21,16 +21,16 @@ import org.w3._2000._09.xmldsig_.KeyValueType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="XMLRecipientPublicKeyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="XMLRecipientPublicKeyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
+ *         <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLToBeEncryptedNewContentType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLToBeEncryptedNewContentType.java
index f3165bb8..90d149e2 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLToBeEncryptedNewContentType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLToBeEncryptedNewContentType.java
@@ -21,13 +21,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="XMLToBeEncryptedNewContentType">
- *   <complexContent>
- *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefContentType">
- *       <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="XMLToBeEncryptedNewContentType">
+ *   <complexContent>
+ *     <extension base="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}Base64XMLLocRefContentType">
+ *       <attribute name="EncDataReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLToBeEncryptedNewType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLToBeEncryptedNewType.java
index 4465f74a..a2b96194 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLToBeEncryptedNewType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_1_2_3/XMLToBeEncryptedNewType.java
@@ -25,18 +25,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="XMLToBeEncryptedNewType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
- *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLToBeEncryptedNewContentType"/>
- *       </sequence>
- *       <attribute name="ParentSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
- *       <attribute name="NodeCount" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="XMLToBeEncryptedNewType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="MetaInfo" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}MetaInfoType"/>
+ *         <element name="Content" type="{http://www.buergerkarte.at/namespaces/securitylayer/1.2#}XMLToBeEncryptedNewContentType"/>
+ *       </sequence>
+ *       <attribute name="ParentSelector" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *       <attribute name="NodeCount" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_20020225_/ErrorResponseType.java b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_20020225_/ErrorResponseType.java
index 69b5cd9d..abfc10b1 100644
--- a/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_20020225_/ErrorResponseType.java
+++ b/utils/src/main/java/at/buergerkarte/namespaces/securitylayer/_20020225_/ErrorResponseType.java
@@ -21,16 +21,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ErrorResponseType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *         <element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ErrorResponseType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ErrorCode" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         <element name="Info" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/AbstractAddressType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/AbstractAddressType.java
index 8d02c692..1918fcf5 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/AbstractAddressType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/AbstractAddressType.java
@@ -34,17 +34,17 @@ import javax.xml.namespace.QName;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AbstractAddressType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="Identification" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}IdentificationType" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <anyAttribute namespace='##other'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AbstractAddressType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence minOccurs="0">
+ *         <element name="Identification" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}IdentificationType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <anyAttribute namespace='##other'/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/AbstractPersonType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/AbstractPersonType.java
index 2ad23e16..3ea49c70 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/AbstractPersonType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/AbstractPersonType.java
@@ -34,17 +34,17 @@ import javax.xml.namespace.QName;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AbstractPersonType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="Identification" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}IdentificationType" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <anyAttribute namespace='##other'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AbstractPersonType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence minOccurs="0">
+ *         <element name="Identification" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}IdentificationType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <anyAttribute namespace='##other'/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/CorporateBodyType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/CorporateBodyType.java
index b90dd571..eef8fd9e 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/CorporateBodyType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/CorporateBodyType.java
@@ -29,21 +29,21 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CorporateBodyType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractPersonType">
- *       <sequence minOccurs="0">
- *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="FullName" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
- *         <element name="AlternativeName" type="{http://www.w3.org/2001/XMLSchema}token" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="LegalForm" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="Organisation" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CorporateBodyType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractPersonType">
+ *       <sequence minOccurs="0">
+ *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="FullName" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
+ *         <element name="AlternativeName" type="{http://www.w3.org/2001/XMLSchema}token" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="LegalForm" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="Organisation" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
+ *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <anyAttribute namespace='##other'/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/DefinedAlternativeNameTypeType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/DefinedAlternativeNameTypeType.java
index 5fe8bd3c..31d799fc 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/DefinedAlternativeNameTypeType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/DefinedAlternativeNameTypeType.java
@@ -19,15 +19,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="DefinedAlternativeNameTypeType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="ArtistName"/>
- *     <enumeration value="NickName"/>
- *     <enumeration value="FormerName"/>
- *     <enumeration value="Alias"/>
- *     <enumeration value="MaidenName"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="DefinedAlternativeNameTypeType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="ArtistName"/>
+ *     <enumeration value="NickName"/>
+ *     <enumeration value="FormerName"/>
+ *     <enumeration value="Alias"/>
+ *     <enumeration value="MaidenName"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/DefinedRelationType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/DefinedRelationType.java
index ae1c26af..38ee78db 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/DefinedRelationType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/DefinedRelationType.java
@@ -19,19 +19,19 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="DefinedRelationType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="family:Parent"/>
- *     <enumeration value="family:Child"/>
- *     <enumeration value="family:Sibling"/>
- *     <enumeration value="family:Grandparent"/>
- *     <enumeration value="family:Grandchild"/>
- *     <enumeration value="family:Spouse"/>
- *     <enumeration value="function:LegalGuardian"/>
- *     <enumeration value="function:IsGuardedBy"/>
- *     <enumeration value="function:Cohabitant"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="DefinedRelationType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="family:Parent"/>
+ *     <enumeration value="family:Child"/>
+ *     <enumeration value="family:Sibling"/>
+ *     <enumeration value="family:Grandparent"/>
+ *     <enumeration value="family:Grandchild"/>
+ *     <enumeration value="family:Spouse"/>
+ *     <enumeration value="function:LegalGuardian"/>
+ *     <enumeration value="function:IsGuardedBy"/>
+ *     <enumeration value="function:Cohabitant"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/IdentificationType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/IdentificationType.java
index a00b5029..80beced2 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/IdentificationType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/IdentificationType.java
@@ -36,28 +36,28 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="IdentificationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Value">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                 <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         <element name="Authority" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <anyAttribute namespace='##other'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IdentificationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Value">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                 <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         <element name="Authority" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <anyAttribute namespace='##other'/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -240,13 +240,13 @@ public class IdentificationType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/InternetAddressType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/InternetAddressType.java
index dcfe1996..7b195367 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/InternetAddressType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/InternetAddressType.java
@@ -27,18 +27,18 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="InternetAddressType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractAddressType">
- *       <sequence minOccurs="0">
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element name="Address" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="InternetAddressType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractAddressType">
+ *       <sequence minOccurs="0">
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         <element name="Address" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <anyAttribute namespace='##other'/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/MaritalStatusType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/MaritalStatusType.java
index 32e22fe8..390e8aaf 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/MaritalStatusType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/MaritalStatusType.java
@@ -19,14 +19,14 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="MaritalStatusType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     <enumeration value="single"/>
- *     <enumeration value="married"/>
- *     <enumeration value="divorced"/>
- *     <enumeration value="widowed"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="MaritalStatusType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     <enumeration value="single"/>
+ *     <enumeration value="married"/>
+ *     <enumeration value="divorced"/>
+ *     <enumeration value="widowed"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/MobileTelcomNumberType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/MobileTelcomNumberType.java
index 795e28aa..b0caed24 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/MobileTelcomNumberType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/MobileTelcomNumberType.java
@@ -20,13 +20,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="MobileTelcomNumberType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}TelcomNumberType">
- *       <attribute name="smsEnabled" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="MobileTelcomNumberType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}TelcomNumberType">
+ *       <attribute name="smsEnabled" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PersonDataType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PersonDataType.java
index 863c1e3c..5f069c2f 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PersonDataType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PersonDataType.java
@@ -27,29 +27,29 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="PersonDataType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractPersonType">
- *       <sequence>
- *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Person"/>
- *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Address" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="AdditionalData" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence maxOccurs="unbounded" minOccurs="0">
- *                   <any processContents='lax'/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <anyAttribute namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PersonDataType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractPersonType">
+ *       <sequence>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Person"/>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Address" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="AdditionalData" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence maxOccurs="unbounded" minOccurs="0">
+ *                   <any processContents='lax'/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <anyAttribute namespace='##other'/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -187,15 +187,15 @@ public class PersonDataType
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence maxOccurs="unbounded" minOccurs="0">
-     *         <any processContents='lax'/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence maxOccurs="unbounded" minOccurs="0">
+     *         <any processContents='lax'/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PersonNameType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PersonNameType.java
index d54fbc27..1f78bc38 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PersonNameType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PersonNameType.java
@@ -25,75 +25,75 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="PersonNameType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="FormattedName" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                 <attribute name="type" default="presentation">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                       <enumeration value="presentation"/>
- *                       <enumeration value="legal"/>
- *                       <enumeration value="sortOrder"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *         <element name="LegalName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="GivenName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="PreferredGivenName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="MiddleName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="FamilyName" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                 <attribute name="primary" default="undefined">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                       <enumeration value="true"/>
- *                       <enumeration value="false"/>
- *                       <enumeration value="undefined"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *                 <attribute name="prefix" type="{http://www.w3.org/2001/XMLSchema}string" />
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *         <element name="Affix" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                 <attribute name="type" use="required">
- *                   <simpleType>
- *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *                       <enumeration value="academicGrade"/>
- *                       <enumeration value="aristocraticPrefix"/>
- *                       <enumeration value="aristocraticTitle"/>
- *                       <enumeration value="familyNamePrefix"/>
- *                       <enumeration value="familyNameSuffix"/>
- *                       <enumeration value="formOfAddress"/>
- *                       <enumeration value="generation"/>
- *                       <enumeration value="qualification"/>
- *                     </restriction>
- *                   </simpleType>
- *                 </attribute>
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PersonNameType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="FormattedName" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                 <attribute name="type" default="presentation">
+ *                   <simpleType>
+ *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                       <enumeration value="presentation"/>
+ *                       <enumeration value="legal"/>
+ *                       <enumeration value="sortOrder"/>
+ *                     </restriction>
+ *                   </simpleType>
+ *                 </attribute>
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="LegalName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="GivenName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="PreferredGivenName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="MiddleName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="FamilyName" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                 <attribute name="primary" default="undefined">
+ *                   <simpleType>
+ *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                       <enumeration value="true"/>
+ *                       <enumeration value="false"/>
+ *                       <enumeration value="undefined"/>
+ *                     </restriction>
+ *                   </simpleType>
+ *                 </attribute>
+ *                 <attribute name="prefix" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="Affix" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <simpleContent>
+ *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *                 <attribute name="type" use="required">
+ *                   <simpleType>
+ *                     <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                       <enumeration value="academicGrade"/>
+ *                       <enumeration value="aristocraticPrefix"/>
+ *                       <enumeration value="aristocraticTitle"/>
+ *                       <enumeration value="familyNamePrefix"/>
+ *                       <enumeration value="familyNameSuffix"/>
+ *                       <enumeration value="formOfAddress"/>
+ *                       <enumeration value="generation"/>
+ *                       <enumeration value="qualification"/>
+ *                     </restriction>
+ *                   </simpleType>
+ *                 </attribute>
+ *               </extension>
+ *             </simpleContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -323,26 +323,26 @@ public class PersonNameType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *       <attribute name="type" use="required">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *             <enumeration value="academicGrade"/>
-     *             <enumeration value="aristocraticPrefix"/>
-     *             <enumeration value="aristocraticTitle"/>
-     *             <enumeration value="familyNamePrefix"/>
-     *             <enumeration value="familyNameSuffix"/>
-     *             <enumeration value="formOfAddress"/>
-     *             <enumeration value="generation"/>
-     *             <enumeration value="qualification"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *       <attribute name="type" use="required">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *             <enumeration value="academicGrade"/>
+     *             <enumeration value="aristocraticPrefix"/>
+     *             <enumeration value="aristocraticTitle"/>
+     *             <enumeration value="familyNamePrefix"/>
+     *             <enumeration value="familyNameSuffix"/>
+     *             <enumeration value="formOfAddress"/>
+     *             <enumeration value="generation"/>
+     *             <enumeration value="qualification"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -415,22 +415,22 @@ public class PersonNameType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *       <attribute name="primary" default="undefined">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *             <enumeration value="true"/>
-     *             <enumeration value="false"/>
-     *             <enumeration value="undefined"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *       <attribute name="prefix" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *       <attribute name="primary" default="undefined">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *             <enumeration value="true"/>
+     *             <enumeration value="false"/>
+     *             <enumeration value="undefined"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *       <attribute name="prefix" type="{http://www.w3.org/2001/XMLSchema}string" />
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -533,21 +533,21 @@ public class PersonNameType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *       <attribute name="type" default="presentation">
-     *         <simpleType>
-     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
-     *             <enumeration value="presentation"/>
-     *             <enumeration value="legal"/>
-     *             <enumeration value="sortOrder"/>
-     *           </restriction>
-     *         </simpleType>
-     *       </attribute>
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
+     * <complexType>
+     *   <simpleContent>
+     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+     *       <attribute name="type" default="presentation">
+     *         <simpleType>
+     *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+     *             <enumeration value="presentation"/>
+     *             <enumeration value="legal"/>
+     *             <enumeration value="sortOrder"/>
+     *           </restriction>
+     *         </simpleType>
+     *       </attribute>
+     *     </extension>
+     *   </simpleContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PhysicalPersonType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PhysicalPersonType.java
index 45904d91..7512a657 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PhysicalPersonType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PhysicalPersonType.java
@@ -30,45 +30,45 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="PhysicalPersonType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractPersonType">
- *       <sequence minOccurs="0">
- *         <element name="Name" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType" minOccurs="0"/>
- *         <element name="AlternativeName" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType">
- *                 <attribute name="Type" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AlternativeNameTypeType" />
- *               </extension>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="MaritalStatus" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}MaritalStatusType" minOccurs="0"/>
- *         <element name="Sex" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}SexType" minOccurs="0"/>
- *         <element name="DateOfBirth" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}DateOfBirthType" minOccurs="0"/>
- *         <element name="PlaceOfBirth" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
- *         <element name="CountryOfBirth" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
- *         <element name="Nationality" type="{http://www.w3.org/2001/XMLSchema}token" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Confession" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
- *         <element name="relatedPerson" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="TypeOfRelation" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}RelationType" maxOccurs="unbounded"/>
- *                   <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Person"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PhysicalPersonType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractPersonType">
+ *       <sequence minOccurs="0">
+ *         <element name="Name" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType" minOccurs="0"/>
+ *         <element name="AlternativeName" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType">
+ *                 <attribute name="Type" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AlternativeNameTypeType" />
+ *               </extension>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="MaritalStatus" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}MaritalStatusType" minOccurs="0"/>
+ *         <element name="Sex" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}SexType" minOccurs="0"/>
+ *         <element name="DateOfBirth" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}DateOfBirthType" minOccurs="0"/>
+ *         <element name="PlaceOfBirth" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
+ *         <element name="CountryOfBirth" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
+ *         <element name="Nationality" type="{http://www.w3.org/2001/XMLSchema}token" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Confession" type="{http://www.w3.org/2001/XMLSchema}token" minOccurs="0"/>
+ *         <element name="relatedPerson" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="TypeOfRelation" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}RelationType" maxOccurs="unbounded"/>
+ *                   <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Person"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <anyAttribute namespace='##other'/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -413,13 +413,13 @@ public class PhysicalPersonType
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType">
-     *       <attribute name="Type" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AlternativeNameTypeType" />
-     *     </extension>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType">
+     *       <attribute name="Type" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AlternativeNameTypeType" />
+     *     </extension>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -466,16 +466,16 @@ public class PhysicalPersonType
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="TypeOfRelation" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}RelationType" maxOccurs="unbounded"/>
-     *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Person"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="TypeOfRelation" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}RelationType" maxOccurs="unbounded"/>
+     *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Person"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PostalAddressType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PostalAddressType.java
index 08301039..e34dd9ff 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PostalAddressType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/PostalAddressType.java
@@ -23,63 +23,63 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="PostalAddressType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CountryCode" minOccurs="0">
- *           <simpleType>
- *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *               <pattern value="[A-Z]{2}"/>
- *             </restriction>
- *           </simpleType>
- *         </element>
- *         <element name="PostalCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Region" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Municipality" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="DeliveryAddress" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="AddressLine" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *                   <element name="StreetName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                   <element name="BuildingNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                   <element name="Unit" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                   <element name="PostOfficeBox" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <element name="Recipient" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="PersonName" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType" minOccurs="0"/>
- *                   <element name="AdditionalText" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
- *                   <element name="Organization" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                   <element name="OrganizationName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute name="type" default="undefined">
- *         <simpleType>
- *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             <enumeration value="postOfficeBoxAddress"/>
- *             <enumeration value="streetAddress"/>
- *             <enumeration value="militaryAddress"/>
- *             <enumeration value="undefined"/>
- *           </restriction>
- *         </simpleType>
- *       </attribute>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PostalAddressType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CountryCode" minOccurs="0">
+ *           <simpleType>
+ *             <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               <pattern value="[A-Z]{2}"/>
+ *             </restriction>
+ *           </simpleType>
+ *         </element>
+ *         <element name="PostalCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="Region" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Municipality" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="DeliveryAddress" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="AddressLine" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                   <element name="StreetName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   <element name="BuildingNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   <element name="Unit" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   <element name="PostOfficeBox" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *         <element name="Recipient" maxOccurs="unbounded" minOccurs="0">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <sequence>
+ *                   <element name="PersonName" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType" minOccurs="0"/>
+ *                   <element name="AdditionalText" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                   <element name="Organization" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   <element name="OrganizationName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                 </sequence>
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </sequence>
+ *       <attribute name="type" default="undefined">
+ *         <simpleType>
+ *           <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             <enumeration value="postOfficeBoxAddress"/>
+ *             <enumeration value="streetAddress"/>
+ *             <enumeration value="militaryAddress"/>
+ *             <enumeration value="undefined"/>
+ *           </restriction>
+ *         </simpleType>
+ *       </attribute>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -299,19 +299,19 @@ public class PostalAddressType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="AddressLine" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
-     *         <element name="StreetName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *         <element name="BuildingNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *         <element name="Unit" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *         <element name="PostOfficeBox" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="AddressLine" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+     *         <element name="StreetName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         <element name="BuildingNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         <element name="Unit" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         <element name="PostOfficeBox" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
@@ -471,18 +471,18 @@ public class PostalAddressType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="PersonName" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType" minOccurs="0"/>
-     *         <element name="AdditionalText" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
-     *         <element name="Organization" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *         <element name="OrganizationName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <sequence>
+     *         <element name="PersonName" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PersonNameType" minOccurs="0"/>
+     *         <element name="AdditionalText" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+     *         <element name="Organization" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *         <element name="OrganizationName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+     *       </sequence>
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/SexType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/SexType.java
index 9b3ae45c..3ae795ce 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/SexType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/SexType.java
@@ -19,13 +19,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="SexType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     <enumeration value="male"/>
- *     <enumeration value="female"/>
- *     <enumeration value="unknown"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="SexType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     <enumeration value="male"/>
+ *     <enumeration value="female"/>
+ *     <enumeration value="unknown"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelcomNumberListType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelcomNumberListType.java
index e17a9399..524637ac 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelcomNumberListType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelcomNumberListType.java
@@ -20,19 +20,19 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="TelcomNumberListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Telephone" minOccurs="0"/>
- *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Mobile" minOccurs="0"/>
- *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Fax" minOccurs="0"/>
- *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Pager" minOccurs="0"/>
- *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}TTYTDD" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TelcomNumberListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Telephone" minOccurs="0"/>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Mobile" minOccurs="0"/>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Fax" minOccurs="0"/>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}Pager" minOccurs="0"/>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}TTYTDD" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelcomNumberType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelcomNumberType.java
index b1723ab2..45540d6b 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelcomNumberType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelcomNumberType.java
@@ -21,16 +21,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="TelcomNumberType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}FormattedNumber"/>
- *         <group ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}TelcomNumberGroup"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TelcomNumberType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}FormattedNumber"/>
+ *         <group ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}TelcomNumberGroup"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelephoneAddressType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelephoneAddressType.java
index 7b1f53c8..0f812757 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelephoneAddressType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TelephoneAddressType.java
@@ -27,18 +27,18 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="TelephoneAddressType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractAddressType">
- *       <sequence minOccurs="0">
- *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Number" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}TelcomNumberType"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TelephoneAddressType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractAddressType">
+ *       <sequence minOccurs="0">
+ *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Number" type="{http://reference.e-government.gv.at/namespace/persondata/20020228#}TelcomNumberType"/>
+ *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <anyAttribute namespace='##other'/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TypedPostalAddressType.java b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TypedPostalAddressType.java
index 0b29343a..15ffa0a2 100644
--- a/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TypedPostalAddressType.java
+++ b/utils/src/main/java/at/gv/e_government/reference/namespace/persondata/_20020228_/TypedPostalAddressType.java
@@ -27,18 +27,18 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="TypedPostalAddressType">
- *   <complexContent>
- *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractAddressType">
- *       <sequence minOccurs="0">
- *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PostalAddress"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TypedPostalAddressType">
+ *   <complexContent>
+ *     <extension base="{http://reference.e-government.gv.at/namespace/persondata/20020228#}AbstractAddressType">
+ *       <sequence minOccurs="0">
+ *         <element name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element ref="{http://reference.e-government.gv.at/namespace/persondata/20020228#}PostalAddress"/>
+ *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <anyAttribute namespace='##other'/>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/at/gv/egiz/bku/utils/URLEncodingOutputStream.java b/utils/src/main/java/at/gv/egiz/bku/utils/URLEncodingOutputStream.java
index 1b4561da..4e6fabef 100644
--- a/utils/src/main/java/at/gv/egiz/bku/utils/URLEncodingOutputStream.java
+++ b/utils/src/main/java/at/gv/egiz/bku/utils/URLEncodingOutputStream.java
@@ -74,7 +74,7 @@ public class URLEncodingOutputStream extends OutputStream {
    * 
    
    * Note: According to
    * http://www.w3.org/TR/html40/appendix/notes.html#non-ascii-chars the input
-   * for the {@link #write()} methods should be the UTF-8.
+   * for the {@link #write(int)} methods should be the UTF-8.
    * 
    
    * 
    * @param out
diff --git a/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URIResolverAdapter.java b/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URIResolverAdapter.java
index b08993e6..11a8b7f2 100644
--- a/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URIResolverAdapter.java
+++ b/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URIResolverAdapter.java
@@ -51,15 +51,14 @@ public class URIResolverAdapter implements URIResolver {
 
   /**
    * 
-   * @param deferecencer
+   * @param dereferencer
    *          must not be null
-   * @param ctx may be null
    */
-  public URIResolverAdapter(URLDereferencer deferecencer) {
-    if (deferecencer == null) {
+  public URIResolverAdapter(URLDereferencer dereferencer) {
+    if (dereferencer == null) {
       throw new NullPointerException("Urlderefencer must not be set to null");
     }
-    this.urlDereferencer = deferecencer;
+    this.urlDereferencer = dereferencer;
   }
 
   @Override
diff --git a/utils/src/main/java/at/gv/egiz/idlink/IdentityLinkFactory.java b/utils/src/main/java/at/gv/egiz/idlink/IdentityLinkFactory.java
index ae5cbbd6..4675c403 100644
--- a/utils/src/main/java/at/gv/egiz/idlink/IdentityLinkFactory.java
+++ b/utils/src/main/java/at/gv/egiz/idlink/IdentityLinkFactory.java
@@ -268,15 +268,9 @@ public class IdentityLinkFactory {
    *          the parent node
    * @param nextSibling
    *          the next sibling node (may be null)
-   * @param applyWorkarounds
-   *          apply workarounds as spefiyed by
-   *          {@link #applyWorkarounds(Element, int)}
    * 
    * @throws JAXBException
    *           if an unexpected error occurs while marshalling
-   * @throws NullPointerException
-   *           if compressdIdentityLink or parent is
-   *           null
    */
   public void marshallIdentityLink(
       JAXBElement identityLink,
diff --git a/utils/src/main/java/at/gv/egiz/marshal/MarshallerFactory.java b/utils/src/main/java/at/gv/egiz/marshal/MarshallerFactory.java
index f4dee552..2d522c83 100644
--- a/utils/src/main/java/at/gv/egiz/marshal/MarshallerFactory.java
+++ b/utils/src/main/java/at/gv/egiz/marshal/MarshallerFactory.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  *
- * @author Clemens Orthacker 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class MarshallerFactory {
 
diff --git a/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefixMapperImpl.java b/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefixMapperImpl.java
index 799e8b69..6d289124 100644
--- a/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefixMapperImpl.java
+++ b/utils/src/main/java/at/gv/egiz/marshal/NamespacePrefixMapperImpl.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  *
- * @author Clemens Orthacker 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class NamespacePrefixMapperImpl extends NamespacePrefixMapper {
 
diff --git a/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java b/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java
index 8bc90ec8..4bde19b0 100644
--- a/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java
+++ b/utils/src/main/java/at/gv/egiz/slbinding/RedirectEventFilter.java
@@ -59,8 +59,7 @@ public class RedirectEventFilter implements EventFilter {
    *
    * @param redirectStream
    *          if null, no events are redirected
-   * @param redirectTriggers
-   *          if null, all events are redirected
+   * @param encoding
    */
   public RedirectEventFilter(OutputStream redirectStream, String encoding)
           throws XMLStreamException { // , List redirectTriggers
@@ -164,7 +163,7 @@ public class RedirectEventFilter implements EventFilter {
    * Enable/disable redirection of all events from now on.
    * The redirected events will be UTF-8 encoded and written to the stream.
    *
-   * @param redirectstream
+   * @param redirectStream
    *          if null, redirection is disabled
    */
   public void setRedirectStream(OutputStream redirectStream) throws XMLStreamException {
@@ -186,7 +185,7 @@ public class RedirectEventFilter implements EventFilter {
    * Enable/disable redirection of all (child) elements contained in redirect triggers.
    * The redirected events will be UTF-8 encoded and written to the stream.
    *
-   * @param redirectstream
+   * @param redirectStream
    *          if null, redirection is disabled
    * @param redirectTriggers elements that trigger the redirection
    */
@@ -199,7 +198,7 @@ public class RedirectEventFilter implements EventFilter {
    *
    * TODO: don't set redirect stream from caller (caller does not know whether redirection will be triggered)
    * rather create on trigger and pass to caller
-   * @param redirectstream
+   * @param redirectStream
    *          if null, redirection is disabled
    * @param encoding The encoding for the redirect stream
    * @param redirectTriggers elements that trigger the redirection
diff --git a/utils/src/main/java/at/gv/egiz/validation/ReportingValidationEventHandler.java b/utils/src/main/java/at/gv/egiz/validation/ReportingValidationEventHandler.java
index a9686ca7..c3e196c9 100644
--- a/utils/src/main/java/at/gv/egiz/validation/ReportingValidationEventHandler.java
+++ b/utils/src/main/java/at/gv/egiz/validation/ReportingValidationEventHandler.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  *
- * @author Clemens Orthacker 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class ReportingValidationEventHandler implements ValidationEventHandler {
 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ActionType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ActionType.java
index d5a84e81..91a51702 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ActionType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ActionType.java
@@ -22,13 +22,13 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ActionType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="Namespace" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="ActionType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="Namespace" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AdviceType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AdviceType.java
index 6009576c..6c172e6e 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AdviceType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AdviceType.java
@@ -26,17 +26,17 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AdviceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion"/>
- *         <any processContents='lax' namespace='##other'/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AdviceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion"/>
+ *         <any processContents='lax' namespace='##other'/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AnyType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AnyType.java
index b9b3773c..e88681aa 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AnyType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AnyType.java
@@ -23,15 +23,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AnyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AnyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java
index 314ff36e..0d73e0e5 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AssertionType.java
@@ -29,29 +29,29 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AssertionType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Conditions" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Advice" minOccurs="0"/>
- *         <choice maxOccurs="unbounded">
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Statement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthenticationStatement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorizationDecisionStatement"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeStatement"/>
- *         </choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="MajorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="MinorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="AssertionID" use="required" type="{urn:oasis:names:tc:SAML:1.0:assertion}IDType" />
- *       <attribute name="Issuer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AssertionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Conditions" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Advice" minOccurs="0"/>
+ *         <choice maxOccurs="unbounded">
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Statement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthenticationStatement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorizationDecisionStatement"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeStatement"/>
+ *         </choice>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="MajorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="MinorVersion" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       <attribute name="AssertionID" use="required" type="{urn:oasis:names:tc:SAML:1.0:assertion}IDType" />
+ *       <attribute name="Issuer" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeDesignatorType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeDesignatorType.java
index fc111d12..eb180e69 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeDesignatorType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeDesignatorType.java
@@ -22,14 +22,14 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AttributeDesignatorType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="AttributeName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="AttributeNamespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeDesignatorType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="AttributeName" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="AttributeNamespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeStatementType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeStatementType.java
index ad518a96..888e4fa6 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeStatementType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeStatementType.java
@@ -22,15 +22,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AttributeStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Attribute" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Attribute" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeType.java
index d6f13089..ac0a96c1 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AttributeType.java
@@ -22,15 +22,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AttributeType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeDesignatorType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeValue" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AttributeType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeDesignatorType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AttributeValue" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AudienceRestrictionConditionType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AudienceRestrictionConditionType.java
index 2492fb97..79de6741 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AudienceRestrictionConditionType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AudienceRestrictionConditionType.java
@@ -23,15 +23,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AudienceRestrictionConditionType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Audience" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AudienceRestrictionConditionType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}ConditionAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Audience" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthenticationStatementType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthenticationStatementType.java
index 6a3910af..e93d9beb 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthenticationStatementType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthenticationStatementType.java
@@ -25,18 +25,18 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AuthenticationStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectLocality" minOccurs="0"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorityBinding" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="AuthenticationMethod" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="AuthenticationInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthenticationStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectLocality" minOccurs="0"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AuthorityBinding" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="AuthenticationMethod" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="AuthenticationInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorityBindingType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorityBindingType.java
index 259a9349..2369b750 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorityBindingType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorityBindingType.java
@@ -22,15 +22,15 @@ import javax.xml.namespace.QName;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AuthorityBindingType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="AuthorityKind" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
- *       <attribute name="Location" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Binding" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthorityBindingType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="AuthorityKind" use="required" type="{http://www.w3.org/2001/XMLSchema}QName" />
+ *       <attribute name="Location" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Binding" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorizationDecisionStatementType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorizationDecisionStatementType.java
index 9e5bdd45..10294d1b 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorizationDecisionStatementType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/AuthorizationDecisionStatementType.java
@@ -24,18 +24,18 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AuthorizationDecisionStatementType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Action" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Evidence" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Decision" use="required" type="{urn:oasis:names:tc:SAML:1.0:assertion}DecisionType" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AuthorizationDecisionStatementType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectStatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Action" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Evidence" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Decision" use="required" type="{urn:oasis:names:tc:SAML:1.0:assertion}DecisionType" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionAbstractType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionAbstractType.java
index 9055688b..4b26a029 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionAbstractType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionAbstractType.java
@@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ConditionAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ConditionAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionsType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionsType.java
index c62de41b..d9c77258 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionsType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/ConditionsType.java
@@ -26,18 +26,18 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ConditionsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AudienceRestrictionCondition"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Condition"/>
- *       </choice>
- *       <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ConditionsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AudienceRestrictionCondition"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Condition"/>
+ *       </choice>
+ *       <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/DecisionType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/DecisionType.java
index 1a06a4ca..cc998313 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/DecisionType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/DecisionType.java
@@ -19,13 +19,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="DecisionType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Permit"/>
- *     <enumeration value="Deny"/>
- *     <enumeration value="Indeterminate"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="DecisionType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="Permit"/>
+ *     <enumeration value="Deny"/>
+ *     <enumeration value="Indeterminate"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/EvidenceType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/EvidenceType.java
index 89f09632..580b6624 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/EvidenceType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/EvidenceType.java
@@ -23,16 +23,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="EvidenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="EvidenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}AssertionIDReference"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Assertion"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/NameIdentifierType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/NameIdentifierType.java
index 73d2dbcb..37f78685 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/NameIdentifierType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/NameIdentifierType.java
@@ -22,14 +22,14 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="NameIdentifierType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="NameQualifier" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Format" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="NameIdentifierType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
+ *       <attribute name="NameQualifier" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="Format" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/StatementAbstractType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/StatementAbstractType.java
index e29030c9..acdd74ca 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/StatementAbstractType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/StatementAbstractType.java
@@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="StatementAbstractType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="StatementAbstractType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectConfirmationType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectConfirmationType.java
index 0b13dd6e..b75b48cb 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectConfirmationType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectConfirmationType.java
@@ -25,17 +25,17 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SubjectConfirmationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}ConfirmationMethod" maxOccurs="unbounded"/>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmationData" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectConfirmationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}ConfirmationMethod" maxOccurs="unbounded"/>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmationData" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectLocalityType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectLocalityType.java
index 2ffa9d9d..cce99ba1 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectLocalityType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectLocalityType.java
@@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SubjectLocalityType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="IPAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="DNSAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectLocalityType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="IPAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="DNSAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectStatementAbstractType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectStatementAbstractType.java
index 99f503fa..edf185f0 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectStatementAbstractType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectStatementAbstractType.java
@@ -21,15 +21,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SubjectStatementAbstractType">
- *   <complexContent>
- *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}StatementAbstractType">
- *       <sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Subject"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectStatementAbstractType">
+ *   <complexContent>
+ *     <extension base="{urn:oasis:names:tc:SAML:1.0:assertion}StatementAbstractType">
+ *       <sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}Subject"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectType.java b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectType.java
index abb08c4d..ba04a960 100644
--- a/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectType.java
+++ b/utils/src/main/java/oasis/names/tc/saml/_1_0/assertion/SubjectType.java
@@ -24,19 +24,19 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SubjectType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
- *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmation" minOccurs="0"/>
- *         </sequence>
- *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmation"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SubjectType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}NameIdentifier"/>
+ *           <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmation" minOccurs="0"/>
+ *         </sequence>
+ *         <element ref="{urn:oasis:names:tc:SAML:1.0:assertion}SubjectConfirmation"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/AnyType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/AnyType.java
index eca6838c..e39b1ba9 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/AnyType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/AnyType.java
@@ -51,15 +51,15 @@ import javax.xml.namespace.QName;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AnyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AnyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLIdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLIdentifierType.java
index a5fedc3b..fb8ed620 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLIdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLIdentifierType.java
@@ -48,18 +48,18 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CRLIdentifierType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="IssueTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
- *         <element name="Number" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CRLIdentifierType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="IssueTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
+ *         <element name="Number" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLRefType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLRefType.java
index e68a1ff9..cad020e6 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLRefType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLRefType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CRLRefType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DigestAlgAndValue" type="{http://uri.etsi.org/01903/v1.1.1#}DigestAlgAndValueType"/>
- *         <element name="CRLIdentifier" type="{http://uri.etsi.org/01903/v1.1.1#}CRLIdentifierType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CRLRefType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DigestAlgAndValue" type="{http://uri.etsi.org/01903/v1.1.1#}DigestAlgAndValueType"/>
+ *         <element name="CRLIdentifier" type="{http://uri.etsi.org/01903/v1.1.1#}CRLIdentifierType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLRefsType.java
index 7199f4dc..cde75aed 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLRefsType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CRLRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CRLRef" type="{http://uri.etsi.org/01903/v1.1.1#}CRLRefType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CRLRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CRLRef" type="{http://uri.etsi.org/01903/v1.1.1#}CRLRefType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLValuesType.java
index 0afac463..b232de78 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CRLValuesType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CRLValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncapsulatedCRLValue" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CRLValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncapsulatedCRLValue" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertIDListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertIDListType.java
index 81d1eae3..6cf99709 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertIDListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertIDListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CertIDListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Cert" type="{http://uri.etsi.org/01903/v1.1.1#}CertIDType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CertIDListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Cert" type="{http://uri.etsi.org/01903/v1.1.1#}CertIDType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertIDType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertIDType.java
index 31c5bb80..f5a686cf 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertIDType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertIDType.java
@@ -45,16 +45,16 @@ import org.w3._2000._09.xmldsig_.X509IssuerSerialType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CertIDType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CertDigest" type="{http://uri.etsi.org/01903/v1.1.1#}DigestAlgAndValueType"/>
- *         <element name="IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CertIDType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CertDigest" type="{http://uri.etsi.org/01903/v1.1.1#}DigestAlgAndValueType"/>
+ *         <element name="IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertificateValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertificateValuesType.java
index f781d1e8..38b121e0 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertificateValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertificateValuesType.java
@@ -52,17 +52,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CertificateValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element name="EncapsulatedX509Certificate" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType"/>
- *         <element name="OtherCertificate" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType"/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CertificateValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element name="EncapsulatedX509Certificate" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType"/>
+ *         <element name="OtherCertificate" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType"/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertifiedRolesListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertifiedRolesListType.java
index b643f3c4..0943c009 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertifiedRolesListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CertifiedRolesListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CertifiedRolesListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CertifiedRole" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CertifiedRolesListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CertifiedRole" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/ClaimedRolesListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/ClaimedRolesListType.java
index 968b5478..7be41b02 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/ClaimedRolesListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/ClaimedRolesListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ClaimedRolesListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ClaimedRole" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ClaimedRolesListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ClaimedRole" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CommitmentTypeIndicationType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CommitmentTypeIndicationType.java
index 2b178e1c..2832c1e9 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CommitmentTypeIndicationType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CommitmentTypeIndicationType.java
@@ -47,20 +47,20 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CommitmentTypeIndicationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CommitmentTypeId" type="{http://uri.etsi.org/01903/v1.1.1#}ObjectIdentifierType"/>
- *         <choice>
- *           <element name="ObjectReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
- *           <element name="AllSignedDataObjects" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *         </choice>
- *         <element name="CommitmentTypeQualifiers" type="{http://uri.etsi.org/01903/v1.1.1#}CommitmentTypeQualifiersListType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CommitmentTypeIndicationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CommitmentTypeId" type="{http://uri.etsi.org/01903/v1.1.1#}ObjectIdentifierType"/>
+ *         <choice>
+ *           <element name="ObjectReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="AllSignedDataObjects" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
+ *         </choice>
+ *         <element name="CommitmentTypeQualifiers" type="{http://uri.etsi.org/01903/v1.1.1#}CommitmentTypeQualifiersListType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CommitmentTypeQualifiersListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CommitmentTypeQualifiersListType.java
index 0f8a81fe..8c6f4f5e 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CommitmentTypeQualifiersListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CommitmentTypeQualifiersListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CommitmentTypeQualifiersListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CommitmentTypeQualifier" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CommitmentTypeQualifiersListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CommitmentTypeQualifier" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CompleteCertificateRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CompleteCertificateRefsType.java
index 64c602d6..d7fe1ad3 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CompleteCertificateRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CompleteCertificateRefsType.java
@@ -49,16 +49,16 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CompleteCertificateRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CertRefs" type="{http://uri.etsi.org/01903/v1.1.1#}CertIDListType"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CompleteCertificateRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CertRefs" type="{http://uri.etsi.org/01903/v1.1.1#}CertIDListType"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CompleteRevocationRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CompleteRevocationRefsType.java
index e06ac734..be0e8ff6 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CompleteRevocationRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CompleteRevocationRefsType.java
@@ -49,18 +49,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CompleteRevocationRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CRLRefs" type="{http://uri.etsi.org/01903/v1.1.1#}CRLRefsType" minOccurs="0"/>
- *         <element name="OCSPRefs" type="{http://uri.etsi.org/01903/v1.1.1#}OCSPRefsType" minOccurs="0"/>
- *         <element name="OtherRefs" type="{http://uri.etsi.org/01903/v1.1.1#}OtherCertStatusRefsType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CompleteRevocationRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CRLRefs" type="{http://uri.etsi.org/01903/v1.1.1#}CRLRefsType" minOccurs="0"/>
+ *         <element name="OCSPRefs" type="{http://uri.etsi.org/01903/v1.1.1#}OCSPRefsType" minOccurs="0"/>
+ *         <element name="OtherRefs" type="{http://uri.etsi.org/01903/v1.1.1#}OtherCertStatusRefsType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CounterSignatureType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CounterSignatureType.java
index ce0ae1ca..01e99e65 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/CounterSignatureType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/CounterSignatureType.java
@@ -45,15 +45,15 @@ import org.w3._2000._09.xmldsig_.SignatureType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CounterSignatureType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CounterSignatureType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/DataObjectFormatType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/DataObjectFormatType.java
index 4cfe6b52..34e68522 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/DataObjectFormatType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/DataObjectFormatType.java
@@ -46,19 +46,19 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DataObjectFormatType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ObjectIdentifier" type="{http://uri.etsi.org/01903/v1.1.1#}ObjectIdentifierType" minOccurs="0"/>
- *         <element name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ObjectReference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DataObjectFormatType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="ObjectIdentifier" type="{http://uri.etsi.org/01903/v1.1.1#}ObjectIdentifierType" minOccurs="0"/>
+ *         <element name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ObjectReference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/DigestAlgAndValueType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/DigestAlgAndValueType.java
index c01ee005..a7c7be8b 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/DigestAlgAndValueType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/DigestAlgAndValueType.java
@@ -45,16 +45,16 @@ import org.w3._2000._09.xmldsig_.DigestMethodType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DigestAlgAndValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DigestMethod" type="{http://www.w3.org/2000/09/xmldsig#}DigestMethodType"/>
- *         <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DigestAlgAndValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DigestMethod" type="{http://www.w3.org/2000/09/xmldsig#}DigestMethodType"/>
+ *         <element name="DigestValue" type="{http://www.w3.org/2000/09/xmldsig#}DigestValueType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/DocumentationReferencesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/DocumentationReferencesType.java
index a222655e..a241aaaf 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/DocumentationReferencesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/DocumentationReferencesType.java
@@ -47,15 +47,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DocumentationReferencesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="DocumentationReference" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DocumentationReferencesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="DocumentationReference" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/EncapsulatedPKIDataType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/EncapsulatedPKIDataType.java
index 1ff681bd..f2e2dfb3 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/EncapsulatedPKIDataType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/EncapsulatedPKIDataType.java
@@ -49,13 +49,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="EncapsulatedPKIDataType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="EncapsulatedPKIDataType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/HashDataInfoType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/HashDataInfoType.java
index 853c4935..841a2783 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/HashDataInfoType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/HashDataInfoType.java
@@ -47,16 +47,16 @@ import org.w3._2000._09.xmldsig_.TransformsType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="HashDataInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="uri" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="HashDataInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="uri" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/IdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/IdentifierType.java
index cd3fdeef..022478cb 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/IdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/IdentifierType.java
@@ -46,13 +46,13 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="IdentifierType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute name="Qualifier" type="{http://uri.etsi.org/01903/v1.1.1#}QualifierType" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="IdentifierType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="Qualifier" type="{http://uri.etsi.org/01903/v1.1.1#}QualifierType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/IntegerListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/IntegerListType.java
index 0a891de4..40776fe2 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/IntegerListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/IntegerListType.java
@@ -47,15 +47,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="IntegerListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="int" type="{http://www.w3.org/2001/XMLSchema}integer" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IntegerListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="int" type="{http://www.w3.org/2001/XMLSchema}integer" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/NoticeReferenceType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/NoticeReferenceType.java
index d74a0d25..8c2c2a94 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/NoticeReferenceType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/NoticeReferenceType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="NoticeReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Organization" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="NoticeNumbers" type="{http://uri.etsi.org/01903/v1.1.1#}IntegerListType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="NoticeReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Organization" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="NoticeNumbers" type="{http://uri.etsi.org/01903/v1.1.1#}IntegerListType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPIdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPIdentifierType.java
index 9a027043..89ba4fa1 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPIdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPIdentifierType.java
@@ -47,17 +47,17 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OCSPIdentifierType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ResponderID" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="ProducedAt" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
- *       </sequence>
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OCSPIdentifierType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ResponderID" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="ProducedAt" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
+ *       </sequence>
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPRefType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPRefType.java
index db68919c..7d39c317 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPRefType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPRefType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OCSPRefType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OCSPIdentifier" type="{http://uri.etsi.org/01903/v1.1.1#}OCSPIdentifierType"/>
- *         <element name="DigestAlgAndValue" type="{http://uri.etsi.org/01903/v1.1.1#}DigestAlgAndValueType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OCSPRefType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="OCSPIdentifier" type="{http://uri.etsi.org/01903/v1.1.1#}OCSPIdentifierType"/>
+ *         <element name="DigestAlgAndValue" type="{http://uri.etsi.org/01903/v1.1.1#}DigestAlgAndValueType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPRefsType.java
index 73ac0b38..d7a529d0 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPRefsType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OCSPRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OCSPRef" type="{http://uri.etsi.org/01903/v1.1.1#}OCSPRefType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OCSPRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="OCSPRef" type="{http://uri.etsi.org/01903/v1.1.1#}OCSPRefType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPValuesType.java
index 0f4b77f7..f3c4e479 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OCSPValuesType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OCSPValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncapsulatedOCSPValue" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OCSPValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncapsulatedOCSPValue" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/ObjectIdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/ObjectIdentifierType.java
index 1399943c..eec48066 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/ObjectIdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/ObjectIdentifierType.java
@@ -44,17 +44,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ObjectIdentifierType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Identifier" type="{http://uri.etsi.org/01903/v1.1.1#}IdentifierType"/>
- *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="DocumentationReferences" type="{http://uri.etsi.org/01903/v1.1.1#}DocumentationReferencesType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObjectIdentifierType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Identifier" type="{http://uri.etsi.org/01903/v1.1.1#}IdentifierType"/>
+ *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="DocumentationReferences" type="{http://uri.etsi.org/01903/v1.1.1#}DocumentationReferencesType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OtherCertStatusRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OtherCertStatusRefsType.java
index 07c6e2e9..3296c630 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OtherCertStatusRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OtherCertStatusRefsType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OtherCertStatusRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OtherRef" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OtherCertStatusRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="OtherRef" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OtherCertStatusValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OtherCertStatusValuesType.java
index 0ec25a51..eef1ca32 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/OtherCertStatusValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/OtherCertStatusValuesType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OtherCertStatusValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OtherValue" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OtherCertStatusValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="OtherValue" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifierType.java
index feed0ae7..e46be617 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifierType.java
@@ -43,12 +43,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="QualifierType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="OIDAsURI"/>
- *     <enumeration value="OIDAsURN"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="QualifierType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="OIDAsURI"/>
+ *     <enumeration value="OIDAsURN"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifyingPropertiesReferenceType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifyingPropertiesReferenceType.java
index 8449c8d5..e1405e32 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifyingPropertiesReferenceType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifyingPropertiesReferenceType.java
@@ -50,17 +50,17 @@ import org.w3._2000._09.xmldsig_.TransformsType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="QualifyingPropertiesReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QualifyingPropertiesReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Transforms" type="{http://www.w3.org/2000/09/xmldsig#}TransformsType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifyingPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifyingPropertiesType.java
index a3bcd37c..9ba480da 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifyingPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/QualifyingPropertiesType.java
@@ -49,18 +49,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="QualifyingPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SignedProperties" type="{http://uri.etsi.org/01903/v1.1.1#}SignedPropertiesType" minOccurs="0"/>
- *         <element name="UnsignedProperties" type="{http://uri.etsi.org/01903/v1.1.1#}UnsignedPropertiesType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QualifyingPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SignedProperties" type="{http://uri.etsi.org/01903/v1.1.1#}SignedPropertiesType" minOccurs="0"/>
+ *         <element name="UnsignedProperties" type="{http://uri.etsi.org/01903/v1.1.1#}UnsignedPropertiesType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/RevocationValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/RevocationValuesType.java
index 4d0ca907..0c60b6cc 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/RevocationValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/RevocationValuesType.java
@@ -49,18 +49,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="RevocationValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CRLValues" type="{http://uri.etsi.org/01903/v1.1.1#}CRLValuesType" minOccurs="0"/>
- *         <element name="OCSPValues" type="{http://uri.etsi.org/01903/v1.1.1#}OCSPValuesType" minOccurs="0"/>
- *         <element name="OtherValues" type="{http://uri.etsi.org/01903/v1.1.1#}OtherCertStatusValuesType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RevocationValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CRLValues" type="{http://uri.etsi.org/01903/v1.1.1#}CRLValuesType" minOccurs="0"/>
+ *         <element name="OCSPValues" type="{http://uri.etsi.org/01903/v1.1.1#}OCSPValuesType" minOccurs="0"/>
+ *         <element name="OtherValues" type="{http://uri.etsi.org/01903/v1.1.1#}OtherCertStatusValuesType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SPUserNoticeType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SPUserNoticeType.java
index 3d6e132d..bfed3807 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SPUserNoticeType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SPUserNoticeType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SPUserNoticeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="NoticeRef" type="{http://uri.etsi.org/01903/v1.1.1#}NoticeReferenceType" minOccurs="0"/>
- *         <element name="ExplicitText" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SPUserNoticeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="NoticeRef" type="{http://uri.etsi.org/01903/v1.1.1#}NoticeReferenceType" minOccurs="0"/>
+ *         <element name="ExplicitText" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SigPolicyQualifiersListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SigPolicyQualifiersListType.java
index d5df04db..8afa0c85 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SigPolicyQualifiersListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SigPolicyQualifiersListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SigPolicyQualifiersListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SigPolicyQualifier" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SigPolicyQualifiersListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SigPolicyQualifier" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignaturePolicyIdType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignaturePolicyIdType.java
index 433d3718..87cea0c2 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignaturePolicyIdType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignaturePolicyIdType.java
@@ -45,18 +45,18 @@ import org.w3._2000._09.xmldsig_.TransformsType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignaturePolicyIdType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SigPolicyId" type="{http://uri.etsi.org/01903/v1.1.1#}ObjectIdentifierType"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element name="SigPolicyHash" type="{http://uri.etsi.org/01903/v1.1.1#}DigestAlgAndValueType"/>
- *         <element name="SigPolicyQualifiers" type="{http://uri.etsi.org/01903/v1.1.1#}SigPolicyQualifiersListType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePolicyIdType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SigPolicyId" type="{http://uri.etsi.org/01903/v1.1.1#}ObjectIdentifierType"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element name="SigPolicyHash" type="{http://uri.etsi.org/01903/v1.1.1#}DigestAlgAndValueType"/>
+ *         <element name="SigPolicyQualifiers" type="{http://uri.etsi.org/01903/v1.1.1#}SigPolicyQualifiersListType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignaturePolicyIdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignaturePolicyIdentifierType.java
index aeaea415..319ea383 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignaturePolicyIdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignaturePolicyIdentifierType.java
@@ -44,23 +44,23 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignaturePolicyIdentifierType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="SignaturePolicyId" type="{http://uri.etsi.org/01903/v1.1.1#}SignaturePolicyIdType"/>
- *         <element name="SignaturePolicyImplied">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePolicyIdentifierType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="SignaturePolicyId" type="{http://uri.etsi.org/01903/v1.1.1#}SignaturePolicyIdType"/>
+ *         <element name="SignaturePolicyImplied">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -132,12 +132,12 @@ public class SignaturePolicyIdentifierType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignatureProductionPlaceType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignatureProductionPlaceType.java
index 4da4f507..01cb7360 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignatureProductionPlaceType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignatureProductionPlaceType.java
@@ -44,18 +44,18 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignatureProductionPlaceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="City" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="StateOrProvince" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="PostalCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="CountryName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureProductionPlaceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="City" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="StateOrProvince" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="PostalCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="CountryName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedDataObjectPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedDataObjectPropertiesType.java
index f3e3e2ec..71d09876 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedDataObjectPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedDataObjectPropertiesType.java
@@ -46,18 +46,18 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignedDataObjectPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DataObjectFormat" type="{http://uri.etsi.org/01903/v1.1.1#}DataObjectFormatType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="CommitmentTypeIndication" type="{http://uri.etsi.org/01903/v1.1.1#}CommitmentTypeIndicationType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="AllDataObjectsTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="IndividualDataObjectsTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedDataObjectPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DataObjectFormat" type="{http://uri.etsi.org/01903/v1.1.1#}DataObjectFormatType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="CommitmentTypeIndication" type="{http://uri.etsi.org/01903/v1.1.1#}CommitmentTypeIndicationType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="AllDataObjectsTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="IndividualDataObjectsTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedPropertiesType.java
index b324d13b..25e1afa2 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedPropertiesType.java
@@ -49,17 +49,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignedPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SignedSignatureProperties" type="{http://uri.etsi.org/01903/v1.1.1#}SignedSignaturePropertiesType"/>
- *         <element name="SignedDataObjectProperties" type="{http://uri.etsi.org/01903/v1.1.1#}SignedDataObjectPropertiesType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SignedSignatureProperties" type="{http://uri.etsi.org/01903/v1.1.1#}SignedSignaturePropertiesType"/>
+ *         <element name="SignedDataObjectProperties" type="{http://uri.etsi.org/01903/v1.1.1#}SignedDataObjectPropertiesType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedSignaturePropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedSignaturePropertiesType.java
index 88560263..fb4c3f7c 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedSignaturePropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignedSignaturePropertiesType.java
@@ -46,19 +46,19 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignedSignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SigningTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
- *         <element name="SigningCertificate" type="{http://uri.etsi.org/01903/v1.1.1#}CertIDListType"/>
- *         <element name="SignaturePolicyIdentifier" type="{http://uri.etsi.org/01903/v1.1.1#}SignaturePolicyIdentifierType"/>
- *         <element name="SignatureProductionPlace" type="{http://uri.etsi.org/01903/v1.1.1#}SignatureProductionPlaceType" minOccurs="0"/>
- *         <element name="SignerRole" type="{http://uri.etsi.org/01903/v1.1.1#}SignerRoleType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedSignaturePropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SigningTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
+ *         <element name="SigningCertificate" type="{http://uri.etsi.org/01903/v1.1.1#}CertIDListType"/>
+ *         <element name="SignaturePolicyIdentifier" type="{http://uri.etsi.org/01903/v1.1.1#}SignaturePolicyIdentifierType"/>
+ *         <element name="SignatureProductionPlace" type="{http://uri.etsi.org/01903/v1.1.1#}SignatureProductionPlaceType" minOccurs="0"/>
+ *         <element name="SignerRole" type="{http://uri.etsi.org/01903/v1.1.1#}SignerRoleType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignerRoleType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignerRoleType.java
index c60b31a7..dcf8f117 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignerRoleType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/SignerRoleType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignerRoleType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ClaimedRoles" type="{http://uri.etsi.org/01903/v1.1.1#}ClaimedRolesListType" minOccurs="0"/>
- *         <element name="CertifiedRoles" type="{http://uri.etsi.org/01903/v1.1.1#}CertifiedRolesListType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignerRoleType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ClaimedRoles" type="{http://uri.etsi.org/01903/v1.1.1#}ClaimedRolesListType" minOccurs="0"/>
+ *         <element name="CertifiedRoles" type="{http://uri.etsi.org/01903/v1.1.1#}CertifiedRolesListType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/TimeStampType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/TimeStampType.java
index c4f9d522..47085915 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/TimeStampType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/TimeStampType.java
@@ -46,19 +46,19 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="TimeStampType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HashDataInfo" type="{http://uri.etsi.org/01903/v1.1.1#}HashDataInfoType" maxOccurs="unbounded"/>
- *         <choice>
- *           <element name="EncapsulatedTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType"/>
- *           <element name="XMLTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType"/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TimeStampType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HashDataInfo" type="{http://uri.etsi.org/01903/v1.1.1#}HashDataInfoType" maxOccurs="unbounded"/>
+ *         <choice>
+ *           <element name="EncapsulatedTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}EncapsulatedPKIDataType"/>
+ *           <element name="XMLTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType"/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedDataObjectPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedDataObjectPropertiesType.java
index 49b1b613..40b66871 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedDataObjectPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedDataObjectPropertiesType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="UnsignedDataObjectPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="UnsignedDataObjectProperty" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UnsignedDataObjectPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="UnsignedDataObjectProperty" type="{http://uri.etsi.org/01903/v1.1.1#}AnyType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedPropertiesType.java
index 9d2eba67..1ec9a2fc 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedPropertiesType.java
@@ -49,17 +49,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="UnsignedPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="UnsignedSignatureProperties" type="{http://uri.etsi.org/01903/v1.1.1#}UnsignedSignaturePropertiesType" minOccurs="0"/>
- *         <element name="UnsignedDataObjectProperties" type="{http://uri.etsi.org/01903/v1.1.1#}UnsignedDataObjectPropertiesType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UnsignedPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="UnsignedSignatureProperties" type="{http://uri.etsi.org/01903/v1.1.1#}UnsignedSignaturePropertiesType" minOccurs="0"/>
+ *         <element name="UnsignedDataObjectProperties" type="{http://uri.etsi.org/01903/v1.1.1#}UnsignedDataObjectPropertiesType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedSignaturePropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedSignaturePropertiesType.java
index 265b5d4b..34c15863 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedSignaturePropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_1/UnsignedSignaturePropertiesType.java
@@ -46,25 +46,25 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="UnsignedSignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CounterSignature" type="{http://uri.etsi.org/01903/v1.1.1#}CounterSignatureType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="SignatureTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="CompleteCertificateRefs" type="{http://uri.etsi.org/01903/v1.1.1#}CompleteCertificateRefsType" minOccurs="0"/>
- *         <element name="CompleteRevocationRefs" type="{http://uri.etsi.org/01903/v1.1.1#}CompleteRevocationRefsType" minOccurs="0"/>
- *         <choice>
- *           <element name="SigAndRefsTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
- *           <element name="RefsOnlyTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
- *         </choice>
- *         <element name="CertificateValues" type="{http://uri.etsi.org/01903/v1.1.1#}CertificateValuesType" minOccurs="0"/>
- *         <element name="RevocationValues" type="{http://uri.etsi.org/01903/v1.1.1#}RevocationValuesType" minOccurs="0"/>
- *         <element name="ArchiveTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UnsignedSignaturePropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CounterSignature" type="{http://uri.etsi.org/01903/v1.1.1#}CounterSignatureType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="SignatureTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="CompleteCertificateRefs" type="{http://uri.etsi.org/01903/v1.1.1#}CompleteCertificateRefsType" minOccurs="0"/>
+ *         <element name="CompleteRevocationRefs" type="{http://uri.etsi.org/01903/v1.1.1#}CompleteRevocationRefsType" minOccurs="0"/>
+ *         <choice>
+ *           <element name="SigAndRefsTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="RefsOnlyTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
+ *         </choice>
+ *         <element name="CertificateValues" type="{http://uri.etsi.org/01903/v1.1.1#}CertificateValuesType" minOccurs="0"/>
+ *         <element name="RevocationValues" type="{http://uri.etsi.org/01903/v1.1.1#}RevocationValuesType" minOccurs="0"/>
+ *         <element name="ArchiveTimeStamp" type="{http://uri.etsi.org/01903/v1.1.1#}TimeStampType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/AnyType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/AnyType.java
index 468c2876..5c037408 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/AnyType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/AnyType.java
@@ -52,16 +52,16 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="AnyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any processContents='lax'/>
- *       </sequence>
- *       <anyAttribute/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="AnyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <any processContents='lax'/>
+ *       </sequence>
+ *       <anyAttribute/>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLIdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLIdentifierType.java
index 02c0d503..7f501a55 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLIdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLIdentifierType.java
@@ -48,18 +48,18 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CRLIdentifierType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="IssueTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
- *         <element name="Number" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CRLIdentifierType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Issuer" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="IssueTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
+ *         <element name="Number" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLRefType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLRefType.java
index d1855135..3a69c251 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLRefType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLRefType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CRLRefType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DigestAlgAndValue" type="{http://uri.etsi.org/01903/v1.3.2#}DigestAlgAndValueType"/>
- *         <element name="CRLIdentifier" type="{http://uri.etsi.org/01903/v1.3.2#}CRLIdentifierType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CRLRefType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DigestAlgAndValue" type="{http://uri.etsi.org/01903/v1.3.2#}DigestAlgAndValueType"/>
+ *         <element name="CRLIdentifier" type="{http://uri.etsi.org/01903/v1.3.2#}CRLIdentifierType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLRefsType.java
index a9ccec8f..57674168 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLRefsType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CRLRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CRLRef" type="{http://uri.etsi.org/01903/v1.3.2#}CRLRefType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CRLRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CRLRef" type="{http://uri.etsi.org/01903/v1.3.2#}CRLRefType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLValuesType.java
index fcd6ec49..52be3322 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CRLValuesType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CRLValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncapsulatedCRLValue" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CRLValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncapsulatedCRLValue" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertIDListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertIDListType.java
index 29037071..a29dd61f 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertIDListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertIDListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CertIDListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Cert" type="{http://uri.etsi.org/01903/v1.3.2#}CertIDType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CertIDListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Cert" type="{http://uri.etsi.org/01903/v1.3.2#}CertIDType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertIDType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertIDType.java
index 52338b27..4742405d 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertIDType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertIDType.java
@@ -47,17 +47,17 @@ import org.w3._2000._09.xmldsig_.X509IssuerSerialType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CertIDType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CertDigest" type="{http://uri.etsi.org/01903/v1.3.2#}DigestAlgAndValueType"/>
- *         <element name="IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *       </sequence>
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CertIDType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CertDigest" type="{http://uri.etsi.org/01903/v1.3.2#}DigestAlgAndValueType"/>
+ *         <element name="IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+ *       </sequence>
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertificateValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertificateValuesType.java
index 2ff207a1..52c032ba 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertificateValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertificateValuesType.java
@@ -52,17 +52,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CertificateValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element name="EncapsulatedX509Certificate" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType"/>
- *         <element name="OtherCertificate" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType"/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CertificateValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <element name="EncapsulatedX509Certificate" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType"/>
+ *         <element name="OtherCertificate" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType"/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertifiedRolesListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertifiedRolesListType.java
index 50b44942..f2973033 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertifiedRolesListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CertifiedRolesListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CertifiedRolesListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CertifiedRole" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CertifiedRolesListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CertifiedRole" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/ClaimedRolesListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/ClaimedRolesListType.java
index c7a468d4..9f3d5792 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/ClaimedRolesListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/ClaimedRolesListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ClaimedRolesListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ClaimedRole" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ClaimedRolesListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ClaimedRole" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CommitmentTypeIndicationType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CommitmentTypeIndicationType.java
index ad5001fe..e2e2f73e 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CommitmentTypeIndicationType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CommitmentTypeIndicationType.java
@@ -47,20 +47,20 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CommitmentTypeIndicationType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CommitmentTypeId" type="{http://uri.etsi.org/01903/v1.3.2#}ObjectIdentifierType"/>
- *         <choice>
- *           <element name="ObjectReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
- *           <element name="AllSignedDataObjects" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *         </choice>
- *         <element name="CommitmentTypeQualifiers" type="{http://uri.etsi.org/01903/v1.3.2#}CommitmentTypeQualifiersListType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CommitmentTypeIndicationType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CommitmentTypeId" type="{http://uri.etsi.org/01903/v1.3.2#}ObjectIdentifierType"/>
+ *         <choice>
+ *           <element name="ObjectReference" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded"/>
+ *           <element name="AllSignedDataObjects" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
+ *         </choice>
+ *         <element name="CommitmentTypeQualifiers" type="{http://uri.etsi.org/01903/v1.3.2#}CommitmentTypeQualifiersListType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CommitmentTypeQualifiersListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CommitmentTypeQualifiersListType.java
index d39c5827..ea36833e 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CommitmentTypeQualifiersListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CommitmentTypeQualifiersListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CommitmentTypeQualifiersListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CommitmentTypeQualifier" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CommitmentTypeQualifiersListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CommitmentTypeQualifier" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CompleteCertificateRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CompleteCertificateRefsType.java
index 8a82544d..f57c0047 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CompleteCertificateRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CompleteCertificateRefsType.java
@@ -49,16 +49,16 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CompleteCertificateRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CertRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CertIDListType"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CompleteCertificateRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CertRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CertIDListType"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CompleteRevocationRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CompleteRevocationRefsType.java
index d7aeaf14..a8e1f264 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CompleteRevocationRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CompleteRevocationRefsType.java
@@ -49,18 +49,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CompleteRevocationRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CRLRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CRLRefsType" minOccurs="0"/>
- *         <element name="OCSPRefs" type="{http://uri.etsi.org/01903/v1.3.2#}OCSPRefsType" minOccurs="0"/>
- *         <element name="OtherRefs" type="{http://uri.etsi.org/01903/v1.3.2#}OtherCertStatusRefsType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CompleteRevocationRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CRLRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CRLRefsType" minOccurs="0"/>
+ *         <element name="OCSPRefs" type="{http://uri.etsi.org/01903/v1.3.2#}OCSPRefsType" minOccurs="0"/>
+ *         <element name="OtherRefs" type="{http://uri.etsi.org/01903/v1.3.2#}OtherCertStatusRefsType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CounterSignatureType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CounterSignatureType.java
index fae46f3a..cfba3ad0 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/CounterSignatureType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/CounterSignatureType.java
@@ -45,15 +45,15 @@ import org.w3._2000._09.xmldsig_.SignatureType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CounterSignatureType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CounterSignatureType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/DataObjectFormatType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/DataObjectFormatType.java
index 3c326e2d..a00e0247 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/DataObjectFormatType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/DataObjectFormatType.java
@@ -46,19 +46,19 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DataObjectFormatType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="ObjectIdentifier" type="{http://uri.etsi.org/01903/v1.3.2#}ObjectIdentifierType" minOccurs="0"/>
- *         <element name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="ObjectReference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DataObjectFormatType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="ObjectIdentifier" type="{http://uri.etsi.org/01903/v1.3.2#}ObjectIdentifierType" minOccurs="0"/>
+ *         <element name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="ObjectReference" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/DigestAlgAndValueType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/DigestAlgAndValueType.java
index 2b126c60..d13e3c89 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/DigestAlgAndValueType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/DigestAlgAndValueType.java
@@ -45,16 +45,16 @@ import org.w3._2000._09.xmldsig_.DigestMethodType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DigestAlgAndValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DigestAlgAndValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/DocumentationReferencesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/DocumentationReferencesType.java
index 5907ded8..ea4875a6 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/DocumentationReferencesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/DocumentationReferencesType.java
@@ -47,15 +47,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DocumentationReferencesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="DocumentationReference" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DocumentationReferencesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="DocumentationReference" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/EncapsulatedPKIDataType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/EncapsulatedPKIDataType.java
index 5a51cc00..699d0a30 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/EncapsulatedPKIDataType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/EncapsulatedPKIDataType.java
@@ -49,14 +49,14 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="EncapsulatedPKIDataType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="EncapsulatedPKIDataType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/GenericTimeStampType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/GenericTimeStampType.java
index 9ebb6178..b277ecc4 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/GenericTimeStampType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/GenericTimeStampType.java
@@ -54,24 +54,24 @@ import org.w3._2000._09.xmldsig_.CanonicalizationMethodType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="GenericTimeStampType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <choice minOccurs="0">
- *           <element ref="{http://uri.etsi.org/01903/v1.3.2#}Include" maxOccurs="unbounded" minOccurs="0"/>
- *           <element ref="{http://uri.etsi.org/01903/v1.3.2#}ReferenceInfo" maxOccurs="unbounded"/>
- *         </choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod" minOccurs="0"/>
- *         <choice maxOccurs="unbounded">
- *           <element name="EncapsulatedTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType"/>
- *           <element name="XMLTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="GenericTimeStampType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <choice minOccurs="0">
+ *           <element ref="{http://uri.etsi.org/01903/v1.3.2#}Include" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element ref="{http://uri.etsi.org/01903/v1.3.2#}ReferenceInfo" maxOccurs="unbounded"/>
+ *         </choice>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod" minOccurs="0"/>
+ *         <choice maxOccurs="unbounded">
+ *           <element name="EncapsulatedTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType"/>
+ *           <element name="XMLTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/IdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/IdentifierType.java
index 6e3ea320..1dc9db63 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/IdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/IdentifierType.java
@@ -46,13 +46,13 @@ import javax.xml.bind.annotation.XmlValue;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="IdentifierType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
- *       <attribute name="Qualifier" type="{http://uri.etsi.org/01903/v1.3.2#}QualifierType" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="IdentifierType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="Qualifier" type="{http://uri.etsi.org/01903/v1.3.2#}QualifierType" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/IncludeType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/IncludeType.java
index 8ee0f1da..a61758c5 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/IncludeType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/IncludeType.java
@@ -45,14 +45,14 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="IncludeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="referencedData" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IncludeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="referencedData" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/IntegerListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/IntegerListType.java
index d4441950..979609e2 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/IntegerListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/IntegerListType.java
@@ -47,15 +47,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="IntegerListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="int" type="{http://www.w3.org/2001/XMLSchema}integer" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="IntegerListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="int" type="{http://www.w3.org/2001/XMLSchema}integer" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/NoticeReferenceType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/NoticeReferenceType.java
index 0a130b1b..4ce18d6f 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/NoticeReferenceType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/NoticeReferenceType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="NoticeReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Organization" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="NoticeNumbers" type="{http://uri.etsi.org/01903/v1.3.2#}IntegerListType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="NoticeReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Organization" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="NoticeNumbers" type="{http://uri.etsi.org/01903/v1.3.2#}IntegerListType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPIdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPIdentifierType.java
index 2632ce2c..91751a8f 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPIdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPIdentifierType.java
@@ -47,17 +47,17 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OCSPIdentifierType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ResponderID" type="{http://uri.etsi.org/01903/v1.3.2#}ResponderIDType"/>
- *         <element name="ProducedAt" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
- *       </sequence>
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OCSPIdentifierType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ResponderID" type="{http://uri.etsi.org/01903/v1.3.2#}ResponderIDType"/>
+ *         <element name="ProducedAt" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
+ *       </sequence>
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPRefType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPRefType.java
index 1bb2acd8..d2930ab7 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPRefType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPRefType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OCSPRefType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OCSPIdentifier" type="{http://uri.etsi.org/01903/v1.3.2#}OCSPIdentifierType"/>
- *         <element name="DigestAlgAndValue" type="{http://uri.etsi.org/01903/v1.3.2#}DigestAlgAndValueType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OCSPRefType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="OCSPIdentifier" type="{http://uri.etsi.org/01903/v1.3.2#}OCSPIdentifierType"/>
+ *         <element name="DigestAlgAndValue" type="{http://uri.etsi.org/01903/v1.3.2#}DigestAlgAndValueType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPRefsType.java
index e521b1cd..1faf6ce9 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPRefsType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OCSPRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OCSPRef" type="{http://uri.etsi.org/01903/v1.3.2#}OCSPRefType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OCSPRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="OCSPRef" type="{http://uri.etsi.org/01903/v1.3.2#}OCSPRefType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPValuesType.java
index 09622c76..6df59c7a 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OCSPValuesType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OCSPValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="EncapsulatedOCSPValue" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OCSPValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="EncapsulatedOCSPValue" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/ObjectIdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/ObjectIdentifierType.java
index e97ba9b4..d7a0fa5b 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/ObjectIdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/ObjectIdentifierType.java
@@ -44,17 +44,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ObjectIdentifierType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Identifier" type="{http://uri.etsi.org/01903/v1.3.2#}IdentifierType"/>
- *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="DocumentationReferences" type="{http://uri.etsi.org/01903/v1.3.2#}DocumentationReferencesType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObjectIdentifierType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Identifier" type="{http://uri.etsi.org/01903/v1.3.2#}IdentifierType"/>
+ *         <element name="Description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="DocumentationReferences" type="{http://uri.etsi.org/01903/v1.3.2#}DocumentationReferencesType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherCertStatusRefsType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherCertStatusRefsType.java
index 8ff73f68..29f2a0f6 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherCertStatusRefsType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherCertStatusRefsType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OtherCertStatusRefsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OtherRef" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OtherCertStatusRefsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="OtherRef" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherCertStatusValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherCertStatusValuesType.java
index c26deb57..93be53aa 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherCertStatusValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherCertStatusValuesType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OtherCertStatusValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="OtherValue" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OtherCertStatusValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="OtherValue" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherTimeStampType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherTimeStampType.java
index df3b43b7..36874f33 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherTimeStampType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/OtherTimeStampType.java
@@ -43,21 +43,21 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OtherTimeStampType">
- *   <complexContent>
- *     <restriction base="{http://uri.etsi.org/01903/v1.3.2#}GenericTimeStampType">
- *       <sequence>
- *         <element ref="{http://uri.etsi.org/01903/v1.3.2#}ReferenceInfo" maxOccurs="unbounded"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod" minOccurs="0"/>
- *         <choice>
- *           <element name="EncapsulatedTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType"/>
- *           <element name="XMLTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OtherTimeStampType">
+ *   <complexContent>
+ *     <restriction base="{http://uri.etsi.org/01903/v1.3.2#}GenericTimeStampType">
+ *       <sequence>
+ *         <element ref="{http://uri.etsi.org/01903/v1.3.2#}ReferenceInfo" maxOccurs="unbounded"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod" minOccurs="0"/>
+ *         <choice>
+ *           <element name="EncapsulatedTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType"/>
+ *           <element name="XMLTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifierType.java
index 95b4723b..d0d81b02 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifierType.java
@@ -43,12 +43,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
    
  * 
    - * <simpleType name="QualifierType">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="OIDAsURI"/>
- *     <enumeration value="OIDAsURN"/>
- *   </restriction>
- * </simpleType>
+ * <simpleType name="QualifierType">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="OIDAsURI"/>
+ *     <enumeration value="OIDAsURN"/>
+ *   </restriction>
+ * </simpleType>
  * 
    
  * 
  */
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifyingPropertiesReferenceType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifyingPropertiesReferenceType.java
index b89ff6c0..5e577071 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifyingPropertiesReferenceType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifyingPropertiesReferenceType.java
@@ -48,14 +48,14 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="QualifyingPropertiesReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QualifyingPropertiesReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attribute name="URI" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifyingPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifyingPropertiesType.java
index a26a6a6e..e9a6788b 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifyingPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/QualifyingPropertiesType.java
@@ -49,18 +49,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="QualifyingPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SignedProperties" type="{http://uri.etsi.org/01903/v1.3.2#}SignedPropertiesType" minOccurs="0"/>
- *         <element name="UnsignedProperties" type="{http://uri.etsi.org/01903/v1.3.2#}UnsignedPropertiesType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="QualifyingPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SignedProperties" type="{http://uri.etsi.org/01903/v1.3.2#}SignedPropertiesType" minOccurs="0"/>
+ *         <element name="UnsignedProperties" type="{http://uri.etsi.org/01903/v1.3.2#}UnsignedPropertiesType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/ReferenceInfoType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/ReferenceInfoType.java
index 3b400990..4e656a7e 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/ReferenceInfoType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/ReferenceInfoType.java
@@ -50,18 +50,18 @@ import org.w3._2000._09.xmldsig_.DigestMethodType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ReferenceInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/ResponderIDType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/ResponderIDType.java
index ba17b448..0908f489 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/ResponderIDType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/ResponderIDType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ResponderIDType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="ByName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="ByKey" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ResponderIDType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="ByName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="ByKey" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/RevocationValuesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/RevocationValuesType.java
index 6283c51a..6f789805 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/RevocationValuesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/RevocationValuesType.java
@@ -49,18 +49,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="RevocationValuesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="CRLValues" type="{http://uri.etsi.org/01903/v1.3.2#}CRLValuesType" minOccurs="0"/>
- *         <element name="OCSPValues" type="{http://uri.etsi.org/01903/v1.3.2#}OCSPValuesType" minOccurs="0"/>
- *         <element name="OtherValues" type="{http://uri.etsi.org/01903/v1.3.2#}OtherCertStatusValuesType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RevocationValuesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="CRLValues" type="{http://uri.etsi.org/01903/v1.3.2#}CRLValuesType" minOccurs="0"/>
+ *         <element name="OCSPValues" type="{http://uri.etsi.org/01903/v1.3.2#}OCSPValuesType" minOccurs="0"/>
+ *         <element name="OtherValues" type="{http://uri.etsi.org/01903/v1.3.2#}OtherCertStatusValuesType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SPUserNoticeType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SPUserNoticeType.java
index a9bcf528..4c21d24f 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SPUserNoticeType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SPUserNoticeType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SPUserNoticeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="NoticeRef" type="{http://uri.etsi.org/01903/v1.3.2#}NoticeReferenceType" minOccurs="0"/>
- *         <element name="ExplicitText" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SPUserNoticeType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="NoticeRef" type="{http://uri.etsi.org/01903/v1.3.2#}NoticeReferenceType" minOccurs="0"/>
+ *         <element name="ExplicitText" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SigPolicyQualifiersListType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SigPolicyQualifiersListType.java
index dc5755d9..9d85f882 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SigPolicyQualifiersListType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SigPolicyQualifiersListType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SigPolicyQualifiersListType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SigPolicyQualifier" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SigPolicyQualifiersListType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SigPolicyQualifier" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignaturePolicyIdType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignaturePolicyIdType.java
index b73bf6ab..b7f3b53f 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignaturePolicyIdType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignaturePolicyIdType.java
@@ -45,18 +45,18 @@ import org.w3._2000._09.xmldsig_.TransformsType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignaturePolicyIdType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SigPolicyId" type="{http://uri.etsi.org/01903/v1.3.2#}ObjectIdentifierType"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element name="SigPolicyHash" type="{http://uri.etsi.org/01903/v1.3.2#}DigestAlgAndValueType"/>
- *         <element name="SigPolicyQualifiers" type="{http://uri.etsi.org/01903/v1.3.2#}SigPolicyQualifiersListType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePolicyIdType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SigPolicyId" type="{http://uri.etsi.org/01903/v1.3.2#}ObjectIdentifierType"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element name="SigPolicyHash" type="{http://uri.etsi.org/01903/v1.3.2#}DigestAlgAndValueType"/>
+ *         <element name="SigPolicyQualifiers" type="{http://uri.etsi.org/01903/v1.3.2#}SigPolicyQualifiersListType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignaturePolicyIdentifierType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignaturePolicyIdentifierType.java
index 2e85716c..fa257bd3 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignaturePolicyIdentifierType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignaturePolicyIdentifierType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignaturePolicyIdentifierType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="SignaturePolicyId" type="{http://uri.etsi.org/01903/v1.3.2#}SignaturePolicyIdType"/>
- *         <element name="SignaturePolicyImplied" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePolicyIdentifierType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="SignaturePolicyId" type="{http://uri.etsi.org/01903/v1.3.2#}SignaturePolicyIdType"/>
+ *         <element name="SignaturePolicyImplied" type="{http://www.w3.org/2001/XMLSchema}anyType"/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignatureProductionPlaceType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignatureProductionPlaceType.java
index 0047ccc3..9c356648 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignatureProductionPlaceType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignatureProductionPlaceType.java
@@ -44,18 +44,18 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignatureProductionPlaceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="City" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="StateOrProvince" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="PostalCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="CountryName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureProductionPlaceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="City" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="StateOrProvince" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="PostalCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="CountryName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedDataObjectPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedDataObjectPropertiesType.java
index 1e1f16ab..7d017eed 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedDataObjectPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedDataObjectPropertiesType.java
@@ -51,19 +51,19 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignedDataObjectPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DataObjectFormat" type="{http://uri.etsi.org/01903/v1.3.2#}DataObjectFormatType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="CommitmentTypeIndication" type="{http://uri.etsi.org/01903/v1.3.2#}CommitmentTypeIndicationType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="AllDataObjectsTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="IndividualDataObjectsTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedDataObjectPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DataObjectFormat" type="{http://uri.etsi.org/01903/v1.3.2#}DataObjectFormatType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="CommitmentTypeIndication" type="{http://uri.etsi.org/01903/v1.3.2#}CommitmentTypeIndicationType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="AllDataObjectsTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="IndividualDataObjectsTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedPropertiesType.java
index a6674d14..a1c6cdf6 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedPropertiesType.java
@@ -49,17 +49,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignedPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SignedSignatureProperties" type="{http://uri.etsi.org/01903/v1.3.2#}SignedSignaturePropertiesType" minOccurs="0"/>
- *         <element name="SignedDataObjectProperties" type="{http://uri.etsi.org/01903/v1.3.2#}SignedDataObjectPropertiesType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SignedSignatureProperties" type="{http://uri.etsi.org/01903/v1.3.2#}SignedSignaturePropertiesType" minOccurs="0"/>
+ *         <element name="SignedDataObjectProperties" type="{http://uri.etsi.org/01903/v1.3.2#}SignedDataObjectPropertiesType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedSignaturePropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedSignaturePropertiesType.java
index 46d0a9a2..406984b5 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedSignaturePropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignedSignaturePropertiesType.java
@@ -50,20 +50,20 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignedSignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="SigningTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="SigningCertificate" type="{http://uri.etsi.org/01903/v1.3.2#}CertIDListType" minOccurs="0"/>
- *         <element name="SignaturePolicyIdentifier" type="{http://uri.etsi.org/01903/v1.3.2#}SignaturePolicyIdentifierType" minOccurs="0"/>
- *         <element name="SignatureProductionPlace" type="{http://uri.etsi.org/01903/v1.3.2#}SignatureProductionPlaceType" minOccurs="0"/>
- *         <element name="SignerRole" type="{http://uri.etsi.org/01903/v1.3.2#}SignerRoleType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedSignaturePropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="SigningTime" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
+ *         <element name="SigningCertificate" type="{http://uri.etsi.org/01903/v1.3.2#}CertIDListType" minOccurs="0"/>
+ *         <element name="SignaturePolicyIdentifier" type="{http://uri.etsi.org/01903/v1.3.2#}SignaturePolicyIdentifierType" minOccurs="0"/>
+ *         <element name="SignatureProductionPlace" type="{http://uri.etsi.org/01903/v1.3.2#}SignatureProductionPlaceType" minOccurs="0"/>
+ *         <element name="SignerRole" type="{http://uri.etsi.org/01903/v1.3.2#}SignerRoleType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignerRoleType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignerRoleType.java
index 3cfea5bb..5c848a47 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignerRoleType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/SignerRoleType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignerRoleType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="ClaimedRoles" type="{http://uri.etsi.org/01903/v1.3.2#}ClaimedRolesListType" minOccurs="0"/>
- *         <element name="CertifiedRoles" type="{http://uri.etsi.org/01903/v1.3.2#}CertifiedRolesListType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignerRoleType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="ClaimedRoles" type="{http://uri.etsi.org/01903/v1.3.2#}ClaimedRolesListType" minOccurs="0"/>
+ *         <element name="CertifiedRoles" type="{http://uri.etsi.org/01903/v1.3.2#}CertifiedRolesListType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedDataObjectPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedDataObjectPropertiesType.java
index 8a5c15fe..30f10e08 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedDataObjectPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedDataObjectPropertiesType.java
@@ -51,16 +51,16 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="UnsignedDataObjectPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="UnsignedDataObjectProperty" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UnsignedDataObjectPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="UnsignedDataObjectProperty" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedPropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedPropertiesType.java
index 3c817fd8..d973d38e 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedPropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedPropertiesType.java
@@ -49,17 +49,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="UnsignedPropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="UnsignedSignatureProperties" type="{http://uri.etsi.org/01903/v1.3.2#}UnsignedSignaturePropertiesType" minOccurs="0"/>
- *         <element name="UnsignedDataObjectProperties" type="{http://uri.etsi.org/01903/v1.3.2#}UnsignedDataObjectPropertiesType" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UnsignedPropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="UnsignedSignatureProperties" type="{http://uri.etsi.org/01903/v1.3.2#}UnsignedSignaturePropertiesType" minOccurs="0"/>
+ *         <element name="UnsignedDataObjectProperties" type="{http://uri.etsi.org/01903/v1.3.2#}UnsignedDataObjectPropertiesType" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedSignaturePropertiesType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedSignaturePropertiesType.java
index 046fa3e9..888ecb5e 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedSignaturePropertiesType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/UnsignedSignaturePropertiesType.java
@@ -54,29 +54,29 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="UnsignedSignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element name="CounterSignature" type="{http://uri.etsi.org/01903/v1.3.2#}CounterSignatureType"/>
- *         <element name="SignatureTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType"/>
- *         <element name="CompleteCertificateRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CompleteCertificateRefsType"/>
- *         <element name="CompleteRevocationRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CompleteRevocationRefsType"/>
- *         <element name="AttributeCertificateRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CompleteCertificateRefsType"/>
- *         <element name="AttributeRevocationRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CompleteRevocationRefsType"/>
- *         <element name="SigAndRefsTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType"/>
- *         <element name="RefsOnlyTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType"/>
- *         <element name="CertificateValues" type="{http://uri.etsi.org/01903/v1.3.2#}CertificateValuesType"/>
- *         <element name="RevocationValues" type="{http://uri.etsi.org/01903/v1.3.2#}RevocationValuesType"/>
- *         <element name="AttrAuthoritiesCertValues" type="{http://uri.etsi.org/01903/v1.3.2#}CertificateValuesType"/>
- *         <element name="AttributeRevocationValues" type="{http://uri.etsi.org/01903/v1.3.2#}RevocationValuesType"/>
- *         <element name="ArchiveTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType"/>
- *         <any namespace='##other'/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="UnsignedSignaturePropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element name="CounterSignature" type="{http://uri.etsi.org/01903/v1.3.2#}CounterSignatureType"/>
+ *         <element name="SignatureTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType"/>
+ *         <element name="CompleteCertificateRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CompleteCertificateRefsType"/>
+ *         <element name="CompleteRevocationRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CompleteRevocationRefsType"/>
+ *         <element name="AttributeCertificateRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CompleteCertificateRefsType"/>
+ *         <element name="AttributeRevocationRefs" type="{http://uri.etsi.org/01903/v1.3.2#}CompleteRevocationRefsType"/>
+ *         <element name="SigAndRefsTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType"/>
+ *         <element name="RefsOnlyTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType"/>
+ *         <element name="CertificateValues" type="{http://uri.etsi.org/01903/v1.3.2#}CertificateValuesType"/>
+ *         <element name="RevocationValues" type="{http://uri.etsi.org/01903/v1.3.2#}RevocationValuesType"/>
+ *         <element name="AttrAuthoritiesCertValues" type="{http://uri.etsi.org/01903/v1.3.2#}CertificateValuesType"/>
+ *         <element name="AttributeRevocationValues" type="{http://uri.etsi.org/01903/v1.3.2#}RevocationValuesType"/>
+ *         <element name="ArchiveTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}XAdESTimeStampType"/>
+ *         <any namespace='##other'/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_3/XAdESTimeStampType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_3/XAdESTimeStampType.java
index a5e2dbfb..6188ac21 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_3/XAdESTimeStampType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_3/XAdESTimeStampType.java
@@ -43,21 +43,21 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="XAdESTimeStampType">
- *   <complexContent>
- *     <restriction base="{http://uri.etsi.org/01903/v1.3.2#}GenericTimeStampType">
- *       <sequence>
- *         <element ref="{http://uri.etsi.org/01903/v1.3.2#}Include" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod" minOccurs="0"/>
- *         <choice maxOccurs="unbounded">
- *           <element name="EncapsulatedTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType"/>
- *           <element name="XMLTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType"/>
- *         </choice>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="XAdESTimeStampType">
+ *   <complexContent>
+ *     <restriction base="{http://uri.etsi.org/01903/v1.3.2#}GenericTimeStampType">
+ *       <sequence>
+ *         <element ref="{http://uri.etsi.org/01903/v1.3.2#}Include" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod" minOccurs="0"/>
+ *         <choice maxOccurs="unbounded">
+ *           <element name="EncapsulatedTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}EncapsulatedPKIDataType"/>
+ *           <element name="XMLTimeStamp" type="{http://uri.etsi.org/01903/v1.3.2#}AnyType"/>
+ *         </choice>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/etsi/uri/_01903/v1_4/ValidationDataType.java b/utils/src/main/java/org/etsi/uri/_01903/v1_4/ValidationDataType.java
index b2381b07..3ac7f645 100644
--- a/utils/src/main/java/org/etsi/uri/_01903/v1_4/ValidationDataType.java
+++ b/utils/src/main/java/org/etsi/uri/_01903/v1_4/ValidationDataType.java
@@ -51,18 +51,18 @@ import org.etsi.uri._01903.v1_3.RevocationValuesType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ValidationDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://uri.etsi.org/01903/v1.3.2#}CertificateValues" minOccurs="0"/>
- *         <element ref="{http://uri.etsi.org/01903/v1.3.2#}RevocationValues" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ValidationDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://uri.etsi.org/01903/v1.3.2#}CertificateValues" minOccurs="0"/>
+ *         <element ref="{http://uri.etsi.org/01903/v1.3.2#}RevocationValues" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java
index da23ff41..c7490b3e 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java
@@ -49,16 +49,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CanonicalizationMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CanonicalizationMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java
index 8cd5260b..b3940aac 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java
@@ -44,25 +44,25 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <sequence minOccurs="0">
- *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <sequence minOccurs="0">
- *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <sequence minOccurs="0">
+ *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         <sequence minOccurs="0">
+ *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         </sequence>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java
index f4febfb4..52b8c417 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java
@@ -50,16 +50,16 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DigestMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DigestMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java
index e64924a6..4ea98ec6 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java
@@ -56,23 +56,23 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="KeyInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         <any processContents='lax' namespace='##other'/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
+ *         <any processContents='lax' namespace='##other'/>
+ *       </choice>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java
index 3270e784..0efdc1f3 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java
@@ -51,17 +51,17 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="KeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         <any processContents='lax' namespace='##other'/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="KeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
+ *         <any processContents='lax' namespace='##other'/>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java
index b06c66da..2dd60af1 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java
@@ -51,16 +51,16 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ManifestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ManifestType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java
index 18122572..4e8dfbc0 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java
@@ -53,18 +53,18 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ObjectType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any processContents='lax'/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ObjectType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded" minOccurs="0">
+ *         <any processContents='lax'/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java
index 6a1f57d2..a9b09c2c 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java
@@ -50,23 +50,23 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="PGPDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *           <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *         <sequence>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PGPDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <sequence>
+ *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *           <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *         <sequence>
+ *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *         </sequence>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java
index e4be9468..dde912f5 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="RSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java
index 7956bb2e..0a58a6a2 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java
@@ -49,20 +49,20 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ReferenceType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java
index 3f72831b..8f437a66 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java
@@ -46,17 +46,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="RetrievalMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="RetrievalMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java
index 28d8e369..7bb4c692 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java
@@ -49,16 +49,16 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SPKIDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <any processContents='lax' namespace='##other' minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SPKIDataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         <any processContents='lax' namespace='##other' minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java
index 7d782d38..cdd5a89f 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java
@@ -52,17 +52,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignatureMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
- *         <any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureMethodType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
+ *         <any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java
index cff9b047..17682d83 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java
@@ -51,16 +51,16 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java
index 8049f341..c189adbc 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java
@@ -53,17 +53,17 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignaturePropertyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <any processContents='lax' namespace='##other'/>
- *       </choice>
- *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignaturePropertyType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded">
+ *         <any processContents='lax' namespace='##other'/>
+ *       </choice>
+ *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java
index 7d304105..4fd8493d 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java
@@ -51,19 +51,19 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignatureType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignatureType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java
index b5e0f360..070a9e0a 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java
@@ -49,13 +49,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignatureValueType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
+ * <complexType name="SignatureValueType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java
index dd43c123..15468a25 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java
@@ -51,18 +51,18 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="SignedInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="SignedInfoType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       </sequence>
+ *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java
index 653f3b95..bdae9748 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java
@@ -52,17 +52,17 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="TransformType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any processContents='lax' namespace='##other'/>
- *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </choice>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice maxOccurs="unbounded" minOccurs="0">
+ *         <any processContents='lax' namespace='##other'/>
+ *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </choice>
+ *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java
index 930e5ca4..7a0d4485 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TransformsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java
index 53637954..0a010ef1 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java
@@ -50,22 +50,22 @@ import org.w3c.dom.Element;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="X509DataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <choice>
- *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any processContents='lax' namespace='##other'/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509DataType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence maxOccurs="unbounded">
+ *         <choice>
+ *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+ *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           <any processContents='lax' namespace='##other'/>
+ *         </choice>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java
index fee484cc..9e2c04e4 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java
@@ -45,16 +45,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="X509IssuerSerialType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="X509IssuerSerialType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/BasePointParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/BasePointParamsType.java
index d0b9ce5c..8568dd3d 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/BasePointParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/BasePointParamsType.java
@@ -46,17 +46,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="BasePointParamsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="BasePoint" type="{http://www.w3.org/2001/04/xmldsig-more#}ECPointType"/>
- *         <element name="Order" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         <element name="Cofactor" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="BasePointParamsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="BasePoint" type="{http://www.w3.org/2001/04/xmldsig-more#}ECPointType"/>
+ *         <element name="Order" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *         <element name="Cofactor" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CharTwoFieldElemType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CharTwoFieldElemType.java
index cce96bc9..f452f4b3 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CharTwoFieldElemType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CharTwoFieldElemType.java
@@ -47,13 +47,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CharTwoFieldElemType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType">
- *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CharTwoFieldElemType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType">
+ *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}hexBinary" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CharTwoFieldParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CharTwoFieldParamsType.java
index 7d392a1d..5c541592 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CharTwoFieldParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CharTwoFieldParamsType.java
@@ -47,15 +47,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CharTwoFieldParamsType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldParamsType">
- *       <sequence>
- *         <element name="M" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CharTwoFieldParamsType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldParamsType">
+ *       <sequence>
+ *         <element name="M" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CurveParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CurveParamsType.java
index 66928ca9..0cf133be 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CurveParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/CurveParamsType.java
@@ -47,17 +47,17 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="CurveParamsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="A" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType"/>
- *         <element name="B" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType"/>
- *         <element name="Seed" type="{http://www.w3.org/2001/XMLSchema}hexBinary" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="CurveParamsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="A" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType"/>
+ *         <element name="B" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType"/>
+ *         <element name="Seed" type="{http://www.w3.org/2001/XMLSchema}hexBinary" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/DomainParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/DomainParamsType.java
index c388373a..d58864fb 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/DomainParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/DomainParamsType.java
@@ -46,24 +46,24 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="DomainParamsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="ExplicitParams" type="{http://www.w3.org/2001/04/xmldsig-more#}ExplicitParamsType"/>
- *         <element name="NamedCurve">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="URN" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="DomainParamsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <choice>
+ *         <element name="ExplicitParams" type="{http://www.w3.org/2001/04/xmldsig-more#}ExplicitParamsType"/>
+ *         <element name="NamedCurve">
+ *           <complexType>
+ *             <complexContent>
+ *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 <attribute name="URN" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *               </restriction>
+ *             </complexContent>
+ *           </complexType>
+ *         </element>
+ *       </choice>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
@@ -135,13 +135,13 @@ public class DomainParamsType {
      * 
    The following schema fragment specifies the expected content contained within this class.
      * 
      * 
    -     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="URN" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
+     * <complexType>
+     *   <complexContent>
+     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       <attribute name="URN" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+     *     </restriction>
+     *   </complexContent>
+     * </complexType>
      * 
    
      * 
      * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ECDSAKeyValueType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ECDSAKeyValueType.java
index 5d40da23..888bcc2b 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ECDSAKeyValueType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ECDSAKeyValueType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ECDSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="DomainParameters" type="{http://www.w3.org/2001/04/xmldsig-more#}DomainParamsType" minOccurs="0"/>
- *         <element name="PublicKey" type="{http://www.w3.org/2001/04/xmldsig-more#}ECPointType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ECDSAKeyValueType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="DomainParameters" type="{http://www.w3.org/2001/04/xmldsig-more#}DomainParamsType" minOccurs="0"/>
+ *         <element name="PublicKey" type="{http://www.w3.org/2001/04/xmldsig-more#}ECPointType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ECPointType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ECPointType.java
index 5501d4c1..c755ea2c 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ECPointType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ECPointType.java
@@ -44,16 +44,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ECPointType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence minOccurs="0">
- *         <element name="X" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType"/>
- *         <element name="Y" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ECPointType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence minOccurs="0">
+ *         <element name="X" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType"/>
+ *         <element name="Y" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ExplicitParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ExplicitParamsType.java
index 7a757d51..c17a4fb0 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ExplicitParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/ExplicitParamsType.java
@@ -44,17 +44,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="ExplicitParamsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="FieldParams" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldParamsType"/>
- *         <element name="CurveParams" type="{http://www.w3.org/2001/04/xmldsig-more#}CurveParamsType"/>
- *         <element name="BasePointParams" type="{http://www.w3.org/2001/04/xmldsig-more#}BasePointParamsType"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="ExplicitParamsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="FieldParams" type="{http://www.w3.org/2001/04/xmldsig-more#}FieldParamsType"/>
+ *         <element name="CurveParams" type="{http://www.w3.org/2001/04/xmldsig-more#}CurveParamsType"/>
+ *         <element name="BasePointParams" type="{http://www.w3.org/2001/04/xmldsig-more#}BasePointParamsType"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/FieldElemType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/FieldElemType.java
index c34a1caf..59e2f147 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/FieldElemType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/FieldElemType.java
@@ -44,12 +44,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="FieldElemType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FieldElemType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/FieldParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/FieldParamsType.java
index af70cd96..c8382fe9 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/FieldParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/FieldParamsType.java
@@ -44,12 +44,12 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="FieldParamsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
+ * <complexType name="FieldParamsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/OddCharExtensionFieldElemType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/OddCharExtensionFieldElemType.java
index 3489a2fa..d6381fa0 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/OddCharExtensionFieldElemType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/OddCharExtensionFieldElemType.java
@@ -46,13 +46,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OddCharExtensionFieldElemType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType">
- *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OddCharExtensionFieldElemType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType">
+ *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/OddCharExtensionFieldParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/OddCharExtensionFieldParamsType.java
index e2e25c5f..b6c9db06 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/OddCharExtensionFieldParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/OddCharExtensionFieldParamsType.java
@@ -46,16 +46,16 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="OddCharExtensionFieldParamsType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldParamsType">
- *       <sequence>
- *         <element name="M" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         <element name="W" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="OddCharExtensionFieldParamsType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldParamsType">
+ *       <sequence>
+ *         <element name="M" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *         <element name="W" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PnBFieldParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PnBFieldParamsType.java
index 059a404c..9bf83ecf 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PnBFieldParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PnBFieldParamsType.java
@@ -46,17 +46,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="PnBFieldParamsType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}CharTwoFieldParamsType">
- *       <sequence>
- *         <element name="K1" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         <element name="K2" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *         <element name="K3" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PnBFieldParamsType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}CharTwoFieldParamsType">
+ *       <sequence>
+ *         <element name="K1" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *         <element name="K2" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *         <element name="K3" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PrimeFieldElemType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PrimeFieldElemType.java
index d510e1d4..8d2dbb53 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PrimeFieldElemType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PrimeFieldElemType.java
@@ -46,13 +46,13 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="PrimeFieldElemType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType">
- *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PrimeFieldElemType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldElemType">
+ *       <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PrimeFieldParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PrimeFieldParamsType.java
index 04f90d5d..2ecb7d5c 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PrimeFieldParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/PrimeFieldParamsType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="PrimeFieldParamsType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldParamsType">
- *       <sequence>
- *         <element name="P" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="PrimeFieldParamsType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}FieldParamsType">
+ *       <sequence>
+ *         <element name="P" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/TnBFieldParamsType.java b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/TnBFieldParamsType.java
index 0c5727a7..7b630f9a 100644
--- a/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/TnBFieldParamsType.java
+++ b/utils/src/main/java/org/w3/_2001/_04/xmldsig_more_/TnBFieldParamsType.java
@@ -46,15 +46,15 @@ import javax.xml.bind.annotation.XmlType;
  * 
    The following schema fragment specifies the expected content contained within this class.
  * 
  * 
    - * <complexType name="TnBFieldParamsType">
- *   <complexContent>
- *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}CharTwoFieldParamsType">
- *       <sequence>
- *         <element name="K" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
+ * <complexType name="TnBFieldParamsType">
+ *   <complexContent>
+ *     <extension base="{http://www.w3.org/2001/04/xmldsig-more#}CharTwoFieldParamsType">
+ *       <sequence>
+ *         <element name="K" type="{http://www.w3.org/2001/XMLSchema}positiveInteger"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
  * 
    
  * 
  * 
diff --git a/utils/src/test/java/cardchannel/UnmarshalTest.java b/utils/src/test/java/cardchannel/UnmarshalTest.java
index 02ab45ab..3b4a8d8f 100644
--- a/utils/src/test/java/cardchannel/UnmarshalTest.java
+++ b/utils/src/test/java/cardchannel/UnmarshalTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 
 /**
  *
- * @author Clemens Orthacker 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 public class UnmarshalTest {
 
diff --git a/utils/src/test/java/saml/KeyValueAttributeTypeTest.java b/utils/src/test/java/saml/KeyValueAttributeTypeTest.java
index c83f8c7c..cd49672f 100644
--- a/utils/src/test/java/saml/KeyValueAttributeTypeTest.java
+++ b/utils/src/test/java/saml/KeyValueAttributeTypeTest.java
@@ -48,7 +48,7 @@ import org.w3c.dom.Element;
 
 /**
  *
- * @author Clemens Orthacker 
+ * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
  */
 @Ignore
 public class KeyValueAttributeTypeTest {
-- 
cgit v1.2.3