summaryrefslogtreecommitdiff
path: root/utils/src/main/java/org/w3
diff options
context:
space:
mode:
authormcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-05-05 15:29:01 +0000
committermcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-05-05 15:29:01 +0000
commitb1c8641a63a67e3c64d948f9e8dce5c01e11e2dd (patch)
tree0883f08a408f89f758e9a1be629232e3dd055c3a /utils/src/main/java/org/w3
parent83a9b613836910f7edc370c2fe60fa2268dc4461 (diff)
downloadmocca-b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd.tar.gz
mocca-b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd.tar.bz2
mocca-b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd.zip
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
Diffstat (limited to 'utils/src/main/java/org/w3')
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/CanonicalizationMethodType.java22
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/DSAKeyValueType.java20
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/DigestMethodType.java24
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyInfoType.java42
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/KeyValueType.java26
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/ManifestType.java20
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java233
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectType.java24
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/PGPDataType.java34
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/RSAKeyValueType.java20
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/ReferenceType.java20
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/RetrievalMethodType.java20
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/SPKIDataType.java26
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureMethodType.java24
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertiesType.java20
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignaturePropertyType.java24
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureType.java34
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignatureValueType.java20
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/SignedInfoType.java20
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformType.java26
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/TransformsType.java22
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509DataType.java34
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/X509IssuerSerialType.java20
-rw-r--r--utils/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java20
24 files changed, 206 insertions, 589 deletions
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 675ded2d..c2c257aa 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@@ -45,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
- * &lt;any/>
+ * &lt;any maxOccurs="unbounded" minOccurs="0"/>
* &lt;/sequence>
* &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* &lt;/restriction>
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 6a9916f1..fe83fbb8 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
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 8a93927c..f1c1480b 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@@ -46,7 +30,7 @@ import org.w3c.dom.Element;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
- * &lt;any/>
+ * &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
* &lt;/sequence>
* &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* &lt;/restriction>
@@ -87,9 +71,9 @@ public class DigestMethodType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link String }
* {@link Object }
+ * {@link Element }
*
*
*/
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 982d4dc5..e2339e56 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@@ -59,7 +43,7 @@ import org.w3c.dom.Element;
* &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
* &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
* &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- * &lt;any/>
+ * &lt;any processContents='lax' namespace='##other'/>
* &lt;/choice>
* &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
* &lt;/restriction>
@@ -76,13 +60,13 @@ import org.w3c.dom.Element;
public class KeyInfoType {
@XmlElementRefs({
- @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
- @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
- @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
- @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
@XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
@XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
- @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+ @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlMixed
@XmlAnyElement(lax = true)
@@ -111,16 +95,16 @@ public class KeyInfoType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
* {@link Element }
- * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
* {@link String }
+ * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
* {@link Object }
- * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
* {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
- * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+ * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
*
*
*/
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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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;
* &lt;choice>
* &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
* &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- * &lt;any/>
+ * &lt;any processContents='lax' namespace='##other'/>
* &lt;/choice>
* &lt;/restriction>
* &lt;/complexContent>
@@ -90,10 +74,10 @@ public class KeyValueType {
*
* <p>
* 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 >}
*
*
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 b8e2d049..414dba2f 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java
index fae77451..b0379614 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/ObjectFactory.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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@@ -48,6 +32,8 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
+ private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
+ private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
@@ -57,31 +43,29 @@ public class ObjectFactory {
private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
+ private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
- private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
- private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
+ private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
- private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
- private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
- private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
+ private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig_
@@ -91,11 +75,27 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link RetrievalMethodType }
+ * Create an instance of {@link DigestMethodType }
*
*/
- public RetrievalMethodType createRetrievalMethodType() {
- return new RetrievalMethodType();
+ public DigestMethodType createDigestMethodType() {
+ return new DigestMethodType();
+ }
+
+ /**
+ * Create an instance of {@link ManifestType }
+ *
+ */
+ public ManifestType createManifestType() {
+ return new ManifestType();
+ }
+
+ /**
+ * Create an instance of {@link TransformType }
+ *
+ */
+ public TransformType createTransformType() {
+ return new TransformType();
}
/**
@@ -107,164 +107,165 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link DSAKeyValueType }
+ * Create an instance of {@link ReferenceType }
*
*/
- public DSAKeyValueType createDSAKeyValueType() {
- return new DSAKeyValueType();
+ public ReferenceType createReferenceType() {
+ return new ReferenceType();
}
/**
- * Create an instance of {@link DigestMethodType }
+ * Create an instance of {@link KeyValueType }
*
*/
- public DigestMethodType createDigestMethodType() {
- return new DigestMethodType();
+ public KeyValueType createKeyValueType() {
+ return new KeyValueType();
}
/**
- * Create an instance of {@link SignaturePropertiesType }
+ * Create an instance of {@link PGPDataType }
*
*/
- public SignaturePropertiesType createSignaturePropertiesType() {
- return new SignaturePropertiesType();
+ public PGPDataType createPGPDataType() {
+ return new PGPDataType();
}
/**
- * Create an instance of {@link ObjectType }
+ * Create an instance of {@link SignatureType }
*
*/
- public ObjectType createObjectType() {
- return new ObjectType();
+ public SignatureType createSignatureType() {
+ return new SignatureType();
}
/**
- * Create an instance of {@link X509DataType }
+ * Create an instance of {@link DSAKeyValueType }
*
*/
- public X509DataType createX509DataType() {
- return new X509DataType();
+ public DSAKeyValueType createDSAKeyValueType() {
+ return new DSAKeyValueType();
}
/**
- * Create an instance of {@link ReferenceType }
+ * Create an instance of {@link SignatureValueType }
*
*/
- public ReferenceType createReferenceType() {
- return new ReferenceType();
+ public SignatureValueType createSignatureValueType() {
+ return new SignatureValueType();
}
/**
- * Create an instance of {@link CanonicalizationMethodType }
+ * Create an instance of {@link SignaturePropertiesType }
*
*/
- public CanonicalizationMethodType createCanonicalizationMethodType() {
- return new CanonicalizationMethodType();
+ public SignaturePropertiesType createSignaturePropertiesType() {
+ return new SignaturePropertiesType();
}
/**
- * Create an instance of {@link TransformType }
+ * Create an instance of {@link SignaturePropertyType }
*
*/
- public TransformType createTransformType() {
-// return new at.gv.egiz.slbinding.impl.TransformType();
- return new TransformType();
+ public SignaturePropertyType createSignaturePropertyType() {
+ return new SignaturePropertyType();
}
/**
- * Create an instance of {@link SignatureMethodType }
+ * Create an instance of {@link RetrievalMethodType }
*
*/
- public SignatureMethodType createSignatureMethodType() {
- return new SignatureMethodType();
+ public RetrievalMethodType createRetrievalMethodType() {
+ return new RetrievalMethodType();
}
/**
- * Create an instance of {@link PGPDataType }
+ * Create an instance of {@link X509IssuerSerialType }
*
*/
- public PGPDataType createPGPDataType() {
- return new PGPDataType();
+ public X509IssuerSerialType createX509IssuerSerialType() {
+ return new X509IssuerSerialType();
}
/**
- * Create an instance of {@link KeyInfoType }
+ * Create an instance of {@link SPKIDataType }
*
*/
- public KeyInfoType createKeyInfoType() {
- return new KeyInfoType();
+ public SPKIDataType createSPKIDataType() {
+ return new SPKIDataType();
}
/**
- * Create an instance of {@link RSAKeyValueType }
+ * Create an instance of {@link ObjectType }
*
*/
- public RSAKeyValueType createRSAKeyValueType() {
- return new RSAKeyValueType();
+ public ObjectType createObjectType() {
+ return new ObjectType();
}
/**
- * Create an instance of {@link KeyValueType }
+ * Create an instance of {@link KeyInfoType }
*
*/
- public KeyValueType createKeyValueType() {
- return new KeyValueType();
+ public KeyInfoType createKeyInfoType() {
+ return new KeyInfoType();
}
/**
- * Create an instance of {@link SignaturePropertyType }
+ * Create an instance of {@link TransformsType }
*
*/
- public SignaturePropertyType createSignaturePropertyType() {
- return new SignaturePropertyType();
+ public TransformsType createTransformsType() {
+ return new TransformsType();
}
/**
- * Create an instance of {@link ManifestType }
+ * Create an instance of {@link SignatureMethodType }
*
*/
- public ManifestType createManifestType() {
- return new ManifestType();
+ public SignatureMethodType createSignatureMethodType() {
+ return new SignatureMethodType();
}
/**
- * Create an instance of {@link SignatureType }
+ * Create an instance of {@link X509DataType }
*
*/
- public SignatureType createSignatureType() {
- return new SignatureType();
+ public X509DataType createX509DataType() {
+ return new X509DataType();
}
/**
- * Create an instance of {@link TransformsType }
+ * Create an instance of {@link CanonicalizationMethodType }
*
*/
- public TransformsType createTransformsType() {
- return new TransformsType();
+ public CanonicalizationMethodType createCanonicalizationMethodType() {
+ return new CanonicalizationMethodType();
}
/**
- * Create an instance of {@link SignatureValueType }
+ * Create an instance of {@link RSAKeyValueType }
*
*/
- public SignatureValueType createSignatureValueType() {
- return new SignatureValueType();
+ public RSAKeyValueType createRSAKeyValueType() {
+ return new RSAKeyValueType();
}
/**
- * Create an instance of {@link X509IssuerSerialType }
+ * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- public X509IssuerSerialType createX509IssuerSerialType() {
- return new X509IssuerSerialType();
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
+ public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
+ return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
}
/**
- * Create an instance of {@link SPKIDataType }
+ * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- public SPKIDataType createSPKIDataType() {
- return new SPKIDataType();
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
+ public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
+ return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
}
/**
@@ -349,6 +350,15 @@ public class ObjectFactory {
}
/**
+ * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
+ public JAXBElement<TransformsType> createTransforms(TransformsType value) {
+ return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value);
+ }
+
+ /**
* Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}}
*
*/
@@ -367,15 +377,6 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
- public JAXBElement<TransformsType> createTransforms(TransformsType value) {
- return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value);
- }
-
- /**
* Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}}
*
*/
@@ -430,21 +431,21 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
- public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
- return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
+ public JAXBElement<String> createMgmtData(String value) {
+ return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
- public JAXBElement<String> createMgmtData(String value) {
- return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
+ public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
+ return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
}
/**
@@ -493,15 +494,6 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
- public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
- return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
- }
-
- /**
* Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
*
*/
@@ -559,18 +551,9 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
*
*/
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
- public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
- return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
- public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
- return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
+ @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
+ public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
+ return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
}
}
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 f63304c2..de805aee 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence maxOccurs="unbounded" minOccurs="0">
- * &lt;any/>
+ * &lt;any processContents='lax'/>
* &lt;/sequence>
* &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
* &lt;attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
@@ -99,9 +83,9 @@ public class ObjectType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link String }
* {@link Object }
+ * {@link Element }
*
*
*/
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 3f173371..43791f92 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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,11 +33,11 @@ import org.w3c.dom.Element;
* &lt;sequence>
* &lt;element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
* &lt;element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- * &lt;any/>
+ * &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
* &lt;/sequence>
* &lt;sequence>
* &lt;element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- * &lt;any/>
+ * &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
* &lt;/sequence>
* &lt;/choice>
* &lt;/restriction>
@@ -70,8 +54,8 @@ import org.w3c.dom.Element;
public class PGPDataType {
@XmlElementRefs({
- @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
- @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+ @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlAnyElement(lax = true)
protected List<Object> content;
@@ -82,8 +66,8 @@ public class PGPDataType {
* <p>
* You are getting this "catch-all" property because of the following reason:
* The field name "PGPKeyPacket" is used by two different parts of a schema. See:
- * line 208 of file:/home/clemens/workspace/bku/schema-base/src/main/schema/xmldsig-core-schema.xsd
- * line 203 of file:/home/clemens/workspace/bku/schema-base/src/main/schema/xmldsig-core-schema.xsd
+ * line 218 of http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd
+ * line 213 of http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd
* <p>
* To get rid of this property, apply a property customization to one
* of both of the following declarations to change their names:
@@ -104,10 +88,10 @@ public class PGPDataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
* {@link Object }
* {@link Element }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+ * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
*
*
*/
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 dd456bb5..74e9fa62 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
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 9c005a02..47f51aa8 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
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 179e3e2c..37b6717b 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
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 ec0ae5dc..2e2f904c 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@@ -46,7 +30,7 @@ import org.w3c.dom.Element;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence maxOccurs="unbounded">
* &lt;element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- * &lt;any/>
+ * &lt;any processContents='lax' namespace='##other' minOccurs="0"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
@@ -83,9 +67,9 @@ public class SPKIDataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
- * {@link Element }
* {@link Object }
+ * {@link Element }
+ * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
*
*
*/
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 b915a92f..6d73cea0 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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 javax.xml.bind.annotation.XmlType;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
- * &lt;any/>
+ * &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
* &lt;/sequence>
* &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* &lt;/restriction>
@@ -91,9 +75,9 @@ public class SignatureMethodType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
* {@link String }
* {@link Object }
+ * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
*
*
*/
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 722d3587..49527d45 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
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 10f15721..09838725 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;choice maxOccurs="unbounded">
- * &lt;any/>
+ * &lt;any processContents='lax' namespace='##other'/>
* &lt;/choice>
* &lt;attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
* &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
@@ -96,9 +80,9 @@ public class SignaturePropertyType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Element }
* {@link String }
* {@link Object }
+ * {@link Element }
*
*
*/
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 ce71624b..0611c217 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@@ -28,6 +12,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
@@ -35,6 +20,7 @@ import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.w3c.dom.Element;
/**
@@ -73,8 +59,8 @@ public class SignatureType {
protected SignedInfoType signedInfo;
@XmlElement(name = "SignatureValue", required = true)
protected SignatureValueType signatureValue;
- @XmlElement(name = "KeyInfo")
- protected KeyInfoType keyInfo;
+ @XmlAnyElement
+ protected Element keyInfo;
@XmlElement(name = "Object")
protected List<ObjectType> object;
@XmlAttribute(name = "Id")
@@ -136,10 +122,10 @@ public class SignatureType {
*
* @return
* possible object is
- * {@link KeyInfoType }
+ * {@link Element }
*
*/
- public KeyInfoType getKeyInfo() {
+ public Element getKeyInfo() {
return keyInfo;
}
@@ -148,10 +134,10 @@ public class SignatureType {
*
* @param value
* allowed object is
- * {@link KeyInfoType }
+ * {@link Element }
*
*/
- public void setKeyInfo(KeyInfoType value) {
+ public void setKeyInfo(Element value) {
this.keyInfo = value;
}
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 764a2092..b18f01d6 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
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 b045e668..db7d2d3c 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
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 5cfb679a..3e81e118 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@@ -48,7 +32,7 @@ import org.w3c.dom.Element;
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;choice maxOccurs="unbounded" minOccurs="0">
- * &lt;any/>
+ * &lt;any processContents='lax' namespace='##other'/>
* &lt;element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;/choice>
* &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
@@ -91,10 +75,10 @@ public class TransformType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link String }{@code >}
* {@link Object }
- * {@link String }
* {@link Element }
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link String }
*
*
*/
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 c7044c4c..29205150 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@@ -57,7 +41,7 @@ import javax.xml.bind.annotation.XmlType;
})
public class TransformsType {
- @XmlElement(name = "Transform", required = true) //, type=at.gv.egiz.slbinding.impl.TransformType.class)
+ @XmlElement(name = "Transform", required = true)
protected List<TransformType> transform;
/**
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 4c60f131..fcf07b84 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@@ -52,7 +36,7 @@ import org.w3c.dom.Element;
* &lt;element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
* &lt;element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
* &lt;element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- * &lt;any/>
+ * &lt;any processContents='lax' namespace='##other'/>
* &lt;/choice>
* &lt;/sequence>
* &lt;/restriction>
@@ -69,11 +53,11 @@ import org.w3c.dom.Element;
public class X509DataType {
@XmlElementRefs({
- @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
- @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
@XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
+ @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
@XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
- @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+ @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
})
@XmlAnyElement(lax = true)
protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
@@ -96,13 +80,13 @@ public class X509DataType {
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link JAXBElement }{@code <}{@link String }{@code >}
- * {@link Element }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+ * {@link Element }
+ * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
* {@link Object }
* {@link JAXBElement }{@code <}{@link byte[]}{@code >}
- * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
*
*
*/
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 dfb0c353..bb5957b9 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
@@ -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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
diff --git a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java
index f7f42cb4..db9f2dc4 100644
--- a/utils/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.java
+++ b/utils/src/main/java/org/w3/_2000/_09/xmldsig_/package-info.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 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// 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
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)