From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 5 May 2010 15:29:01 +0000 Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk. git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../org/w3/_2000/_09/xmldsig_/KeyValueType.java | 26 +++++----------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java') 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 8bfa9f17..6d4e7b40 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 @@ -1,24 +1,8 @@ -/* -* Copyright 2008 Federal Chancellery Austria and -* Graz University of Technology -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.07.21 at 09:30:44 AM GMT +// Generated on: 2010.02.24 at 05:42:21 PM MEZ // @@ -49,7 +33,7 @@ import org.w3c.dom.Element; * <choice> * <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/> * <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/> - * <any/> + * <any processContents='lax' namespace='##other'/> * </choice> * </restriction> * </complexContent> @@ -90,10 +74,10 @@ public class KeyValueType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} - * {@link String } * {@link Object } * {@link Element } + * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * {@link String } * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} * * -- cgit v1.2.3