Author: anil.saldhana(a)jboss.com Date: 2011-01-24 18:24:18 -0500 (Mon, 24 Jan 2011) New Revision: 645 Removed: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/xmlenc/factories/XMLEncryptionFactory.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ObjectFactory.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ObjectFactory.java Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/w3/xmldsig/KeyInfoBuilder.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/StandardRequestHandler.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/CanonicalizationMethodType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/DSAKeyValueType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/DigestMethodType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/KeyInfoType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/KeyValueType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ManifestType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ObjectType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/PGPDataType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/RSAKeyValueType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ReferenceType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/RetrievalMethodType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SPKIDataType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureMethodType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignaturePropertiesType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignaturePropertyType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureValueType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignedInfoType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/TransformType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/TransformsType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509CertificateType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509DataType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509IssuerSerialType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/package-info.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/AgreementMethodType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/CipherDataType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/CipherReferenceType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedDataType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedKeyType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionMethodType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionPropertiesType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionPropertyType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ReferenceList.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ReferenceType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/TransformsType.java federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/package-info.java Log: get rid of jaxb in xmlsec model Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java 2011-01-24 23:24:18 UTC (rev 645) @@ -28,6 +28,7 @@ import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyTypes; import org.picketlink.identity.xmlsec.w3.xmlenc.EncryptionMethodType; +import org.picketlink.identity.xmlsec.w3.xmlenc.EncryptionMethodType.EncryptionMethod; import org.w3c.dom.Element; /** @@ -56,10 +57,9 @@ if(isNotNull(algorithm)) { - EncryptionMethodType encryptionMethod = new EncryptionMethodType(); - encryptionMethod.setAlgorithm(algorithm); + EncryptionMethodType encryptionMethod = new EncryptionMethodType( algorithm ); - encryptionMethod.getContent().add(BigInteger.valueOf(keySize)); + encryptionMethod.setEncryptionMethod( new EncryptionMethod( BigInteger.valueOf(keySize), null )); keyDescriptor.addEncryptionMethod( encryptionMethod ); } Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java 2011-01-24 23:24:18 UTC (rev 645) @@ -37,8 +37,7 @@ import org.picketlink.identity.federation.core.exceptions.ProcessingException; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.util.Base64; -import org.picketlink.identity.federation.core.util.JAXBUtil; -import org.picketlink.identity.xmlsec.w3.xmldsig.ObjectFactory; +import org.picketlink.identity.federation.core.util.JAXBUtil; import org.w3c.dom.Element; /** @@ -48,10 +47,8 @@ */ public class KeyUtil { - private static String EOL = getSystemProperty("line.separator", "\n"); + private static String EOL = getSystemProperty("line.separator", "\n"); - private static ObjectFactory of = new ObjectFactory(); - /** * Base64 encode the certificate * @param certificate @@ -101,17 +98,8 @@ return DocumentUtil.getDocument(builder.toString()).getDocumentElement(); } - + /** - * Get the object factory for the w3 xml-dsig - * @return - */ - public static ObjectFactory getObjectFactory() - { - return of; - } - - /** * Get the Unmarshaller for the W3 XMLDSIG * @return * @throws JAXBException Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/w3/xmldsig/KeyInfoBuilder.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/w3/xmldsig/KeyInfoBuilder.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/w3/xmldsig/KeyInfoBuilder.java 2011-01-24 23:24:18 UTC (rev 645) @@ -24,8 +24,7 @@ import org.picketlink.identity.federation.core.exceptions.ConfigurationException; import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants; import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; -import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; -import org.picketlink.identity.xmlsec.w3.xmldsig.ObjectFactory; +import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -36,8 +35,7 @@ * @since Apr 20, 2009 */ public class KeyInfoBuilder -{ - private static ObjectFactory oFact = new ObjectFactory(); +{ /** * Create a KeyInfoType @@ -57,14 +55,5 @@ Element keyInfoEl = doc.createElementNS( JBossSAMLURIConstants.XMLDSIG_NSURI.get(), JBossSAMLConstants.KEY_INFO.get() ); keyInfoEl.setAttribute( "Id", id ); return keyInfoEl; - } - - /** - * Return the object factory. Useful in method chaining - * @return - */ - public static ObjectFactory getObjectFactory() - { - return oFact; - } + } } \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2011-01-24 23:24:18 UTC (rev 645) @@ -229,7 +229,7 @@ tag = StaxParserUtil.getStartElementName(startElement); if (tag.equals(WSTrustConstants.XMLEnc.ENCRYPTED_KEY)) { - keyInfo.getContent().add(StaxParserUtil.getDOMElement(xmlEventReader)); + keyInfo.addContent( StaxParserUtil.getDOMElement(xmlEventReader) ); } else if (tag.equals(WSTrustConstants.XMLDSig.X509DATA)) { @@ -243,11 +243,11 @@ X509CertificateType cert = new X509CertificateType(); String certValue = StaxParserUtil.getElementText(xmlEventReader); cert.setEncodedCertificate(certValue.getBytes()); - x509.getX509IssuerSerialOrX509SKIOrX509SubjectName().add(cert); + x509.add( cert ); EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); StaxParserUtil.validate(endElement, WSTrustConstants.XMLDSig.X509DATA); - keyInfo.getContent().add(x509); + keyInfo.addContent( x509 ); } else if (tag.equals(WSTrustConstants.XMLDSig.KEYVALUE)) { @@ -270,7 +270,7 @@ EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); StaxParserUtil.validate(endElement, WSTrustConstants.XMLDSig.KEYVALUE); - keyInfo.getContent().add(keyValue); + keyInfo.addContent( keyValue ) ; } } return keyInfo; Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java 2011-01-24 23:24:18 UTC (rev 645) @@ -63,8 +63,7 @@ import org.apache.log4j.Logger; import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; -import org.picketlink.identity.federation.core.util.JAXBUtil; -import org.picketlink.identity.xmlsec.w3.xmldsig.ObjectFactory; +import org.picketlink.identity.federation.core.util.JAXBUtil; import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -86,10 +85,8 @@ private static String pkgName = "org.picketlink.identity.federation.w3.xmldsig"; private static String schemaLocation = "schema/saml/v2/xmldsig-core-schema.xsd"; - private static String canonicalizationMethodType = CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS; + private static String canonicalizationMethodType = CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS; - private static ObjectFactory objectFactory = new ObjectFactory(); - private static XMLSignatureFactory fac = getXMLSignatureFactory(); private static XMLSignatureFactory getXMLSignatureFactory() @@ -332,9 +329,10 @@ */ public static void marshall(SignatureType signature, OutputStream os) throws JAXBException, SAXException { - JAXBElement<SignatureType> jsig = objectFactory.createSignature(signature); + throw new RuntimeException( "NYI" ); + /*JAXBElement<SignatureType> jsig = objectFactory.createSignature(signature); Marshaller marshaller = JAXBUtil.getValidatingMarshaller(pkgName, schemaLocation); - marshaller.marshal(jsig, os); + marshaller.marshal(jsig, os);*/ } /** Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/StandardRequestHandler.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/StandardRequestHandler.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/StandardRequestHandler.java 2011-01-24 23:24:18 UTC (rev 645) @@ -249,11 +249,11 @@ if (elementName.equals("X509Certificate")) { X509DataType data = new X509DataType(); - data.getX509IssuerSerialOrX509SKIOrX509SubjectName().add(value); + data.add( value ); value = data; } KeyInfoType keyInfo = new KeyInfoType(); - keyInfo.getContent().add(value); + keyInfo.addContent( value ); requestContext.setProofTokenInfo(keyInfo); } } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2011-01-24 23:24:18 UTC (rev 645) @@ -415,7 +415,7 @@ secret.length * 8); Element encryptedKeyElement = XMLCipher.getInstance().martial(key); keyInfo = new KeyInfoType(); - keyInfo.getContent().add(encryptedKeyElement); + keyInfo.addContent( encryptedKeyElement ); } catch (Exception e) { @@ -450,11 +450,11 @@ X509DataType x509 = new X509DataType(); X509CertificateType cert = new X509CertificateType(); cert.setEncodedCertificate(Base64.encodeBytes(encodedCert).getBytes()); - x509.getX509IssuerSerialOrX509SKIOrX509SubjectName().add(cert); + x509.add( cert ); // set the X509DataType in the KeyInfoType. keyInfo = new KeyInfoType(); - keyInfo.getContent().add(x509); + keyInfo.addContent( x509 ); } catch (Exception e) { Deleted: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/xmlenc/factories/XMLEncryptionFactory.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/xmlenc/factories/XMLEncryptionFactory.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/xmlenc/factories/XMLEncryptionFactory.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.picketlink.identity.federation.core.xmlenc.factories; - -import org.picketlink.identity.xmlsec.w3.xmlenc.ObjectFactory; - - -/** - * Get the XML Encryption Model Object Factory - * @author Anil.Saldhana(a)redhat.com - * @since Feb 5, 2009 - */ -public class XMLEncryptionFactory -{ - private static ObjectFactory factory = new ObjectFactory(); - - public static ObjectFactory getObjectFactory() - { - return factory; - } -} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/CanonicalizationMethodType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/CanonicalizationMethodType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/CanonicalizationMethodType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,25 +1,29 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; -import java.util.ArrayList; -import java.util.List; +import java.net.URI; -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.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - /** * <p>Java class for CanonicalizationMethodType complex type. * @@ -39,72 +43,37 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CanonicalizationMethodType", propOrder = { - "content" -}) -public class CanonicalizationMethodType { + */ +public class CanonicalizationMethodType +{ + protected URI algorithm; + private Object content; - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; + public CanonicalizationMethodType( URI algorithm) + { + this.algorithm = algorithm; + } - /** - * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link String } - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; - } + public void setContent( Object content ) + { + this.content = content; + } - /** - * Gets the value of the algorithm property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } + public Object getContent() + { + return this.content; + } - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - -} + /** + * Gets the value of the algorithm property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getAlgorithm() + { + return algorithm; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/DSAKeyValueType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/DSAKeyValueType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/DSAKeyValueType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,19 +1,28 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ - package org.picketlink.identity.xmlsec.w3.xmldsig; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - /** * <p>Java class for DSAKeyValueType complex type. * @@ -42,32 +51,15 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DSAKeyValueType", propOrder = { - "p", - "q", - "g", - "y", - "j", - "seed", - "pgenCounter" -}) -public class DSAKeyValueType { - - @XmlElement(name = "P") + */ +public class DSAKeyValueType +{ protected byte[] p; - @XmlElement(name = "Q") protected byte[] q; - @XmlElement(name = "G") protected byte[] g; - @XmlElement(name = "Y", required = true) protected byte[] y; - @XmlElement(name = "J") protected byte[] j; - @XmlElement(name = "Seed") protected byte[] seed; - @XmlElement(name = "PgenCounter") protected byte[] pgenCounter; /** @@ -223,5 +215,4 @@ public void setPgenCounter(byte[] value) { this.pgenCounter = ((byte[]) value); } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/DigestMethodType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/DigestMethodType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/DigestMethodType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,27 +1,29 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; -import java.util.ArrayList; -import java.util.List; +import java.net.URI; -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.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - - /** * <p>Java class for DigestMethodType complex type. * @@ -41,73 +43,36 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DigestMethodType", propOrder = { - "content" -}) -public class DigestMethodType { + */ +public class DigestMethodType +{ + protected URI algorithm; + private Object content; - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; + public DigestMethodType(URI algorithm) + { + this.algorithm = algorithm; + } - /** - * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } - * {@link String } - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; - } + public void setContent( Object content ) + { + this.content = content; + } - /** - * Gets the value of the algorithm property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } + public Object getContent() + { + return this.content; + } - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - -} + /** + * Gets the value of the algorithm property. + * + * @return + * possible object is + * {@link URI } + * + */ + public URI getAlgorithm() { + return algorithm; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/KeyInfoType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/KeyInfoType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/KeyInfoType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,33 +1,31 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.JAXBElement; -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.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -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; - - /** * <p>Java class for KeyInfoType complex type. * @@ -54,70 +52,30 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "KeyInfoType", propOrder = { - "content" -}) -public class KeyInfoType { + */ +public class KeyInfoType +{ + protected String id; + + protected List<Object> contentList = new ArrayList<Object>(); + + public void addContent( Object content ) + { + this.contentList.add(content); + } + + public void removeContent( Object content ) + { + this.contentList.remove(content); + } + + public List<Object> getContent() + { + return Collections.unmodifiableList( contentList ); + } - @XmlElementRefs({ - @XmlElementRef(name = "X509Data", 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), - @XmlElementRef(name = "KeyName", 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 = "PGPData", 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) - }) - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - + /** - * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link String } - * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} - * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} - * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link Object } - * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} - * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; - } - - /** * Gets the value of the id property. * * @return @@ -125,7 +83,8 @@ * {@link String } * */ - public String getId() { + public String getId() + { return id; } @@ -137,8 +96,8 @@ * {@link String } * */ - public void setId(String value) { + public void setId(String value) + { this.id = value; - } - -} + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/KeyValueType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/KeyValueType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/KeyValueType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,25 +1,29 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlType; - import org.w3c.dom.Element; @@ -43,52 +47,25 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "KeyValueType", propOrder = { - "content" -}) -public class KeyValueType { + */ +public class KeyValueType +{ + protected List<Object> content = new ArrayList<Object>(); - @XmlElementRefs({ - @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) - }) - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - - /** - * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link String } - * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} - * {@link Object } - * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; - } - -} + /** + * Gets the value of the content property. + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Element } + * {@link String } + * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} + * {@link Object } + * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * + * + */ + public List<Object> getContent() + { + return this.content; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ManifestType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ManifestType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ManifestType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,27 +1,30 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -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; - - /** * <p>Java class for ManifestType complex type. * @@ -38,51 +41,33 @@ * &lt;/restriction> * &lt;/complexContent> * &lt;/complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ManifestType", propOrder = { - "reference" -}) -public class ManifestType { - - @XmlElement(name = "Reference", required = true) - protected List<ReferenceType> reference; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") + * </pre> + */ +public class ManifestType +{ + protected List<ReferenceType> reference = new ArrayList<ReferenceType>(); protected String id; + + public void addReference( ReferenceType ref ) + { + this.reference.add(ref); + } + public void removeReference( ReferenceType ref ) + { + this.reference.remove( ref ); + } + /** * Gets the value of the reference property. * * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the reference property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getReference().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list * {@link ReferenceType } - * - * */ - public List<ReferenceType> getReference() { - if (reference == null) { - reference = new ArrayList<ReferenceType>(); - } - return this.reference; + public List<ReferenceType> getReference() + { + return Collections.unmodifiableList( this.reference ); } /** @@ -93,7 +78,8 @@ * {@link String } * */ - public String getId() { + public String getId() + { return id; } @@ -105,8 +91,8 @@ * {@link String } * */ - public void setId(String value) { + public void setId(String value) + { this.id = value; } - -} +} \ No newline at end of file Deleted: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ObjectFactory.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ObjectFactory.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ObjectFactory.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,560 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.xmlsec.w3.xmldsig; - -import java.math.BigInteger; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.w3._2000._09.xmldsig_ package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "X509SKI"); - private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "X509Certificate"); - private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "X509IssuerSerial"); - 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 _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 _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "KeyValue"); - private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "DigestValue"); - private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "Object"); - private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "DSAKeyValue"); - private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "Signature"); - private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureProperties"); - private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "Transforms"); - private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureMethod"); - private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "MgmtData"); - private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "Manifest"); - private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "X509Data"); - private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "SignedInfo"); - private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "KeyName"); - private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "KeyInfo"); - private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "Reference"); - private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "SPKIData"); - private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "DigestMethod"); - private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "PGPData"); - private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "Transform"); - private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "RetrievalMethod"); - private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureProperty"); - private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "CanonicalizationMethod"); - private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "RSAKeyValue"); - private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "SignatureValue"); - private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "XPath"); - private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "PGPKeyPacket"); - private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#";, "PGPKeyID"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig_ - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link ObjectType } - * - */ - public ObjectType createObjectType() { - return new ObjectType(); - } - - /** - * Create an instance of {@link SPKIDataType } - * - */ - public SPKIDataType createSPKIDataType() { - return new SPKIDataType(); - } - - /** - * Create an instance of {@link X509DataType } - * - */ - public X509DataType createX509DataType() { - return new X509DataType(); - } - - /** - * Create an instance of {@link SignaturePropertyType } - * - */ - public SignaturePropertyType createSignaturePropertyType() { - return new SignaturePropertyType(); - } - - /** - * Create an instance of {@link TransformType } - * - */ - public TransformType createTransformType() { - return new TransformType(); - } - - /** - * Create an instance of {@link X509IssuerSerialType } - * - */ - public X509IssuerSerialType createX509IssuerSerialType() { - return new X509IssuerSerialType(); - } - - /** - * Create an instance of {@link SignedInfoType } - * - */ - public SignedInfoType createSignedInfoType() { - return new SignedInfoType(); - } - - /** - * Create an instance of {@link RetrievalMethodType } - * - */ - public RetrievalMethodType createRetrievalMethodType() { - return new RetrievalMethodType(); - } - - /** - * Create an instance of {@link RSAKeyValueType } - * - */ - public RSAKeyValueType createRSAKeyValueType() { - return new RSAKeyValueType(); - } - - /** - * Create an instance of {@link KeyValueType } - * - */ - public KeyValueType createKeyValueType() { - return new KeyValueType(); - } - - /** - * Create an instance of {@link ManifestType } - * - */ - public ManifestType createManifestType() { - return new ManifestType(); - } - - /** - * Create an instance of {@link DigestMethodType } - * - */ - public DigestMethodType createDigestMethodType() { - return new DigestMethodType(); - } - - /** - * Create an instance of {@link KeyInfoType } - * - */ - public KeyInfoType createKeyInfoType() { - return new KeyInfoType(); - } - - /** - * Create an instance of {@link ReferenceType } - * - */ - public ReferenceType createReferenceType() { - return new ReferenceType(); - } - - /** - * Create an instance of {@link SignaturePropertiesType } - * - */ - public SignaturePropertiesType createSignaturePropertiesType() { - return new SignaturePropertiesType(); - } - - /** - * Create an instance of {@link SignatureMethodType } - * - */ - public SignatureMethodType createSignatureMethodType() { - return new SignatureMethodType(); - } - - /** - * Create an instance of {@link PGPDataType } - * - */ - public PGPDataType createPGPDataType() { - return new PGPDataType(); - } - - /** - * Create an instance of {@link SignatureType } - * - */ - public SignatureType createSignatureType() { - return new SignatureType(); - } - - /** - * Create an instance of {@link SignatureValueType } - * - */ - public SignatureValueType createSignatureValueType() { - return new SignatureValueType(); - } - - /** - * Create an instance of {@link CanonicalizationMethodType } - * - */ - public CanonicalizationMethodType createCanonicalizationMethodType() { - return new CanonicalizationMethodType(); - } - - /** - * Create an instance of {@link DSAKeyValueType } - * - */ - public DSAKeyValueType createDSAKeyValueType() { - return new DSAKeyValueType(); - } - - /** - * Create an instance of {@link TransformsType } - * - */ - public TransformsType createTransformsType() { - return new TransformsType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class) - public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) { - return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class) - public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) { - return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class) - public JAXBElement<X509IssuerSerialType> createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) { - return new JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class) - public JAXBElement<String> createX509DataTypeX509SubjectName(String value) { - return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class) - public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) { - return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value)); - } - - /** - * 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 >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class) - public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) { - return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue") - public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) { - return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue") - public JAXBElement<byte[]> createDigestValue(byte[] value) { - return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object") - public JAXBElement<ObjectType> createObject(ObjectType value) { - return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue") - public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) { - return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") - public JAXBElement<SignatureType> createSignature(SignatureType value) { - return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@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); - } - - /** - * 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 SignatureMethodType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod") - public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) { - return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest") - public JAXBElement<ManifestType> createManifest(ManifestType value) { - return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data") - public JAXBElement<X509DataType> createX509Data(X509DataType value) { - return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo") - public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) { - return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName") - public JAXBElement<String> createKeyName(String value) { - return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo") - public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) { - return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference") - public JAXBElement<ReferenceType> createReference(ReferenceType value) { - return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData") - public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) { - return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod") - public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) { - return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData") - public JAXBElement<PGPDataType> createPGPData(PGPDataType value) { - return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform") - public JAXBElement<TransformType> createTransform(TransformType value) { - return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod") - public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) { - return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty") - public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) { - return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod") - public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) { - return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue") - public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) { - return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue") - public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) { - return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) - public JAXBElement<String> createTransformTypeXPath(String value) { - return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, 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)); - } - - /** - * 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)); - } - -} Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ObjectType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ObjectType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ObjectType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,27 +1,30 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; +import java.util.Collections; 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.XmlID; -import javax.xml.bind.annotation.XmlMixed; -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; @@ -46,56 +49,35 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ObjectType", propOrder = { - "content" -}) -public class ObjectType { - - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - @XmlAttribute(name = "MimeType") - protected String mimeType; - @XmlAttribute(name = "Encoding") - @XmlSchemaType(name = "anyURI") + */ +public class ObjectType +{ + protected List<Object> content = new ArrayList<Object>(); + protected String id; + protected String mimeType; protected String encoding; + public void add( Object obj ) + { + this.content.add(obj); + } + + public void remove( Object obj ) + { + this.content.remove( obj ); + } + /** - * Gets the value of the content property. - * + * Gets the value of the content property. * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list * {@link Element } * {@link Object } * {@link String } - * - * */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; + public List<Object> getContent() + { + return Collections.unmodifiableList( this.content ); } /** @@ -106,7 +88,8 @@ * {@link String } * */ - public String getId() { + public String getId() + { return id; } @@ -118,7 +101,8 @@ * {@link String } * */ - public void setId(String value) { + public void setId(String value) + { this.id = value; } @@ -130,7 +114,8 @@ * {@link String } * */ - public String getMimeType() { + public String getMimeType() + { return mimeType; } @@ -142,7 +127,8 @@ * {@link String } * */ - public void setMimeType(String value) { + public void setMimeType(String value) + { this.mimeType = value; } @@ -154,7 +140,8 @@ * {@link String } * */ - public String getEncoding() { + public String getEncoding() + { return encoding; } @@ -166,8 +153,8 @@ * {@link String } * */ - public void setEncoding(String value) { + public void setEncoding(String value) + { this.encoding = value; } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/PGPDataType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/PGPDataType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/PGPDataType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,24 +1,30 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; - import org.w3c.dom.Element; @@ -48,60 +54,31 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PGPDataType", propOrder = { - "content" -}) -public class PGPDataType { + */ +public class PGPDataType +{ + protected List<Object> content = new ArrayList<Object>(); - @XmlElementRefs({ - @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; + public void add( Object obj ) + { + this.content.add(obj); + } - /** - * Gets the rest of the content model. - * - * <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 218 of http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd - * line 213 of http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/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: - * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Object } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; - } + public void remove( Object obj ) + { + this.content.remove( obj ); + } -} + /** + * Gets the value of the content property. + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Element } + * {@link Object } + * {@link String } + */ + public List<Object> getContent() + { + return Collections.unmodifiableList( this.content ); + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/RSAKeyValueType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/RSAKeyValueType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/RSAKeyValueType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,19 +1,29 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ - package org.picketlink.identity.xmlsec.w3.xmldsig; + -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - /** * <p>Java class for RSAKeyValueType complex type. * @@ -33,17 +43,10 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "RSAKeyValueType", propOrder = { - "modulus", - "exponent" -}) -public class RSAKeyValueType { - - @XmlElement(name = "Modulus", required = true) + */ +public class RSAKeyValueType +{ protected byte[] modulus; - @XmlElement(name = "Exponent", required = true) protected byte[] exponent; /** Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ReferenceType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ReferenceType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/ReferenceType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,24 +1,27 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -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; - /** * <p>Java class for ReferenceType complex type. * @@ -42,173 +45,155 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ReferenceType", propOrder = { - "transforms", - "digestMethod", - "digestValue" -}) -public class ReferenceType { + */ +public class ReferenceType +{ + protected TransformsType transforms; + protected DigestMethodType digestMethod; + protected byte[] digestValue; + protected String id; + protected String uri; + protected String type; - @XmlElement(name = "Transforms") - protected TransformsType transforms; - @XmlElement(name = "DigestMethod", required = true) - protected DigestMethodType digestMethod; - @XmlElement(name = "DigestValue", required = true) - protected byte[] digestValue; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - @XmlAttribute(name = "URI") - @XmlSchemaType(name = "anyURI") - protected String uri; - @XmlAttribute(name = "Type") - @XmlSchemaType(name = "anyURI") - protected String type; + /** + * Gets the value of the transforms property. + * + * @return + * possible object is + * {@link TransformsType } + * + */ + public TransformsType getTransforms() { + return transforms; + } - /** - * Gets the value of the transforms property. - * - * @return - * possible object is - * {@link TransformsType } - * - */ - public TransformsType getTransforms() { - return transforms; - } + /** + * Sets the value of the transforms property. + * + * @param value + * allowed object is + * {@link TransformsType } + * + */ + public void setTransforms(TransformsType value) { + this.transforms = value; + } - /** - * Sets the value of the transforms property. - * - * @param value - * allowed object is - * {@link TransformsType } - * - */ - public void setTransforms(TransformsType value) { - this.transforms = value; - } + /** + * Gets the value of the digestMethod property. + * + * @return + * possible object is + * {@link DigestMethodType } + * + */ + public DigestMethodType getDigestMethod() { + return digestMethod; + } - /** - * Gets the value of the digestMethod property. - * - * @return - * possible object is - * {@link DigestMethodType } - * - */ - public DigestMethodType getDigestMethod() { - return digestMethod; - } + /** + * Sets the value of the digestMethod property. + * + * @param value + * allowed object is + * {@link DigestMethodType } + * + */ + public void setDigestMethod(DigestMethodType value) { + this.digestMethod = value; + } - /** - * Sets the value of the digestMethod property. - * - * @param value - * allowed object is - * {@link DigestMethodType } - * - */ - public void setDigestMethod(DigestMethodType value) { - this.digestMethod = value; - } + /** + * Gets the value of the digestValue property. + * + * @return + * possible object is + * byte[] + */ + public byte[] getDigestValue() { + return digestValue; + } - /** - * Gets the value of the digestValue property. - * - * @return - * possible object is - * byte[] - */ - public byte[] getDigestValue() { - return digestValue; - } + /** + * Sets the value of the digestValue property. + * + * @param value + * allowed object is + * byte[] + */ + public void setDigestValue(byte[] value) { + this.digestValue = ((byte[]) value); + } - /** - * Sets the value of the digestValue property. - * - * @param value - * allowed object is - * byte[] - */ - public void setDigestValue(byte[] value) { - this.digestValue = ((byte[]) value); - } + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } + /** + * Gets the value of the uri property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getURI() { + return uri; + } - /** - * Gets the value of the uri property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getURI() { - return uri; - } + /** + * Sets the value of the uri property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setURI(String value) { + this.uri = value; + } - /** - * Sets the value of the uri property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setURI(String value) { - this.uri = value; - } + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setType(String value) { - this.type = value; - } - -} + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/RetrievalMethodType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/RetrievalMethodType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/RetrievalMethodType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,21 +1,27 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; + -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - - /** * <p>Java class for RetrievalMethodType complex type. * @@ -36,20 +42,11 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "RetrievalMethodType", propOrder = { - "transforms" -}) -public class RetrievalMethodType { - - @XmlElement(name = "Transforms") + */ +public class RetrievalMethodType +{ protected TransformsType transforms; - @XmlAttribute(name = "URI") - @XmlSchemaType(name = "anyURI") protected String uri; - @XmlAttribute(name = "Type") - @XmlSchemaType(name = "anyURI") protected String type; /** Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SPKIDataType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SPKIDataType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SPKIDataType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,23 +1,31 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ - package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; - import org.w3c.dom.Element; @@ -40,46 +48,31 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SPKIDataType", propOrder = { - "spkiSexpAndAny" -}) -public class SPKIDataType { + */ +public class SPKIDataType +{ + protected List<Object> spkiSexpAndAny = new ArrayList<Object>(); - @XmlElementRef(name = "SPKISexp", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) - @XmlAnyElement(lax = true) - protected List<Object> spkiSexpAndAny; - + public void addSPKI( Object obj ) + { + this.spkiSexpAndAny.add(obj); + } + + public void removeSPKI( Object obj ) + { + this.spkiSexpAndAny.remove(obj); + } + /** - * Gets the value of the spkiSexpAndAny property. - * + * Gets the value of the spkiSexpAndAny property. * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the spkiSexpAndAny property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getSPKISexpAndAny().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list * {@link Element } * {@link Object } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - * + * */ - public List<Object> getSPKISexpAndAny() { - if (spkiSexpAndAny == null) { - spkiSexpAndAny = new ArrayList<Object>(); - } - return this.spkiSexpAndAny; - } - -} + public List<Object> getSPKISexpAndAny() + { + return Collections.unmodifiableList( this.spkiSexpAndAny ); + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureMethodType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureMethodType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureMethodType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,28 +1,31 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; -import java.math.BigInteger; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.JAXBElement; -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.XmlElementRef; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - /** * <p>Java class for SignatureMethodType complex type. * @@ -43,50 +46,29 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignatureMethodType", propOrder = { - "content" -}) -public class SignatureMethodType { - - @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") + */ +public class SignatureMethodType { + protected List<Object> content= new ArrayList<Object>(); protected String algorithm; + public void add( Object obj ) + { + this.content.add(obj); + } + + public void remove( Object obj ) + { + this.content.remove( obj ); + } + /** * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} + * * {@link Object } * {@link String } - * - * */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; + public List<Object> getContent() { + return Collections.unmodifiableList( this.content ); } /** Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignaturePropertiesType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignaturePropertiesType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignaturePropertiesType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,27 +1,30 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -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; - - /** * <p>Java class for SignaturePropertiesType complex type. * @@ -41,48 +44,33 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignaturePropertiesType", propOrder = { - "signatureProperty" -}) -public class SignaturePropertiesType { - - @XmlElement(name = "SignatureProperty", required = true) - protected List<SignaturePropertyType> signatureProperty; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") + */ +public class SignaturePropertiesType +{ + protected List<SignaturePropertyType> signatureProperty = new ArrayList<SignaturePropertyType>(); protected String id; + public void addSignatureProperty( SignaturePropertyType sig ) + { + this.signatureProperty.add(sig); + } + + public void removeSignatureProperty( SignaturePropertyType sig ) + { + this.signatureProperty.remove(sig); + } + /** * Gets the value of the signatureProperty property. - * + * * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the signatureProperty property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getSignatureProperty().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list * {@link SignaturePropertyType } * * */ - public List<SignaturePropertyType> getSignatureProperty() { - if (signatureProperty == null) { - signatureProperty = new ArrayList<SignaturePropertyType>(); - } - return this.signatureProperty; + public List<SignaturePropertyType> getSignatureProperty() { + return Collections.unmodifiableList( this.signatureProperty ); } /** Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignaturePropertyType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignaturePropertyType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignaturePropertyType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,27 +1,29 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; 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.XmlID; -import javax.xml.bind.annotation.XmlMixed; -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; @@ -45,53 +47,24 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignaturePropertyType", propOrder = { - "content" -}) -public class SignaturePropertyType { - - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Target", required = true) - @XmlSchemaType(name = "anyURI") + */ +public class SignaturePropertyType +{ + protected List<Object> content = new ArrayList<Object>(); protected String target; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") protected String id; /** * Gets the value of the content property. * * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list * {@link Element } * {@link Object } * {@link String } - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } + */ + public List<Object> getContent() + { return this.content; } @@ -142,5 +115,4 @@ public void setId(String value) { this.id = value; } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,27 +1,31 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -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; - /** * <p>Java class for SignatureType complex type. * @@ -44,28 +48,13 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignatureType", propOrder = { - "signedInfo", - "signatureValue", - "keyInfo", - "object" -}) -public class SignatureType { - - @XmlElement(name = "SignedInfo", required = true) + */ +public class SignatureType +{ protected SignedInfoType signedInfo; - @XmlElement(name = "SignatureValue", required = true) protected SignatureValueType signatureValue; - @XmlElement(name = "KeyInfo") protected KeyInfoType keyInfo; - @XmlElement(name = "Object") - protected List<ObjectType> object; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") + protected List<ObjectType> object = new ArrayList<ObjectType>(); protected String id; /** @@ -139,34 +128,28 @@ public void setKeyInfo(KeyInfoType value) { this.keyInfo = value; } + + public void addObject( ObjectType obj ) + { + this.object.add(obj); + } + + public void removeObject( ObjectType obj ) + { + this.object.remove( obj ); + } /** * Gets the value of the object property. - * + * * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the object property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getObject().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list * {@link ObjectType } * * */ - public List<ObjectType> getObject() { - if (object == null) { - object = new ArrayList<ObjectType>(); - } - return this.object; + public List<ObjectType> getObject() { + return Collections.unmodifiableList( this.object ); } /** @@ -192,5 +175,4 @@ public void setId(String value) { this.id = value; } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureValueType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureValueType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignatureValueType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,24 +1,26 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - - /** * <p>Java class for SignatureValueType complex type. * @@ -35,19 +37,10 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignatureValueType", propOrder = { - "value" -}) -public class SignatureValueType { - - @XmlValue + */ +public class SignatureValueType +{ protected byte[] value; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") protected String id; /** @@ -95,5 +88,4 @@ public void setId(String value) { this.id = value; } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignedInfoType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignedInfoType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/SignedInfoType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,27 +1,30 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -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; - - /** * <p>Java class for SignedInfoType complex type. * @@ -43,25 +46,12 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignedInfoType", propOrder = { - "canonicalizationMethod", - "signatureMethod", - "reference" -}) -public class SignedInfoType { - - @XmlElement(name = "CanonicalizationMethod", required = true) + */ +public class SignedInfoType +{ protected CanonicalizationMethodType canonicalizationMethod; - @XmlElement(name = "SignatureMethod", required = true) protected SignatureMethodType signatureMethod; - @XmlElement(name = "Reference", required = true) - protected List<ReferenceType> reference; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") + protected List<ReferenceType> reference = new ArrayList<ReferenceType>(); protected String id; /** @@ -112,33 +102,27 @@ this.signatureMethod = value; } + public void add( ReferenceType ref ) + { + this.reference.add( ref ); + } + + public void remove( ReferenceType ref ) + { + this.reference.remove( ref ); + } + /** - * Gets the value of the reference property. + * Gets the value of the reference property. * * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the reference property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getReference().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list * {@link ReferenceType } * * */ - public List<ReferenceType> getReference() { - if (reference == null) { - reference = new ArrayList<ReferenceType>(); - } - return this.reference; + public List<ReferenceType> getReference() { + return Collections.unmodifiableList( this.reference ); } /** Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/TransformType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/TransformType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/TransformType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,25 +1,31 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; +import java.net.URI; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.JAXBElement; -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.XmlElementRef; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; import org.w3c.dom.Element; @@ -44,75 +50,52 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TransformType", propOrder = { - "content" -}) -public class TransformType { + */ +public class TransformType +{ - @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; + protected List<Object> content = new ArrayList<Object>(); + protected URI algorithm; - /** - * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link String } - * {@link Object } - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; - } + public TransformType(URI algorithm) + { + this.algorithm = algorithm; + } + + public void addTransform( Object obj ) + { + this.content.add(obj); + } + + public void removeTransform( Object obj ) + { + this.content.remove(obj); + } - /** - * Gets the value of the algorithm property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } + /** + * Gets the value of the content property. + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Element } + * {@link String } + * {@link Object } + * + */ + public List<Object> getContent() { + return Collections.unmodifiableList( this.content ); + } - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } + /** + * Gets the value of the algorithm property. + * + * @return + * possible object is + * {@link String } + * + */ + public URI getAlgorithm() { + return algorithm; + } -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/TransformsType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/TransformsType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/TransformsType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,22 +1,31 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ - package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; -import java.util.List; +import java.util.Collections; +import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - /** * <p>Java class for TransformsType complex type. * @@ -35,43 +44,32 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TransformsType", propOrder = { - "transform" -}) -public class TransformsType { + */ +public class TransformsType +{ + protected List<TransformType> transform = new ArrayList<TransformType>(); - @XmlElement(name = "Transform", required = true) - protected List<TransformType> transform; - + public void addTransformsType( TransformType tt ) + { + this.transform.add(tt); + } + + public void removeTransformsType( TransformType tt ) + { + this.transform.remove( tt ); + } + /** - * Gets the value of the transform property. - * + * Gets the value of the transform property. * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the transform property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getTransform().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list * {@link TransformType } * * */ - public List<TransformType> getTransform() { - if (transform == null) { - transform = new ArrayList<TransformType>(); - } - return this.transform; + public List<TransformType> getTransform() + { + return Collections.unmodifiableList( this.transform ); } -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509CertificateType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509CertificateType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509CertificateType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,8 +1,28 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; public class X509CertificateType -{ - +{ private byte[] encodedCertificate; public byte[] getEncodedCertificate() Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509DataType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509DataType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509DataType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,24 +1,31 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.util.ArrayList; +import java.util.Collections; import java.util.List; + -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; - import org.w3c.dom.Element; @@ -47,56 +54,31 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "X509DataType", propOrder = { - "x509IssuerSerialOrX509SKIOrX509SubjectName" -}) -public class X509DataType { + */ +public class X509DataType +{ + protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName = new ArrayList<Object>(); - @XmlElementRefs({ - @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 = "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 = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) - }) - @XmlAnyElement(lax = true) - protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName; - + public void add( Object obj ) + { + this.x509IssuerSerialOrX509SKIOrX509SubjectName.add(obj); + } + + public void remove( Object obj ) + { + this.x509IssuerSerialOrX509SKIOrX509SubjectName.remove( obj ); + } + /** * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName property. * * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the x509IssuerSerialOrX509SKIOrX509SubjectName property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Element } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Object } - * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - * + * Objects of the following type(s) are allowed in the list + * {@link Element } + * {@link Object } */ - public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() { - if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) { - x509IssuerSerialOrX509SKIOrX509SubjectName = new ArrayList<Object>(); - } - return this.x509IssuerSerialOrX509SKIOrX509SubjectName; + public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() + { + return Collections.unmodifiableList( this.x509IssuerSerialOrX509SKIOrX509SubjectName ); } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509IssuerSerialType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509IssuerSerialType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/X509IssuerSerialType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,21 +1,30 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; import java.math.BigInteger; + -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - /** * <p>Java class for X509IssuerSerialType complex type. * @@ -35,17 +44,10 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "X509IssuerSerialType", propOrder = { - "x509IssuerName", - "x509SerialNumber" -}) -public class X509IssuerSerialType { - - @XmlElement(name = "X509IssuerName", required = true) + */ +public class X509IssuerSerialType +{ protected String x509IssuerName; - @XmlElement(name = "X509SerialNumber", required = true) protected BigInteger x509SerialNumber; /** @@ -56,7 +58,8 @@ * {@link String } * */ - public String getX509IssuerName() { + public String getX509IssuerName() + { return x509IssuerName; } @@ -68,7 +71,8 @@ * {@link String } * */ - public void setX509IssuerName(String value) { + public void setX509IssuerName(String value) + { this.x509IssuerName = value; } @@ -80,7 +84,8 @@ * {@link BigInteger } * */ - public BigInteger getX509SerialNumber() { + public BigInteger getX509SerialNumber() + { return x509SerialNumber; } @@ -92,8 +97,8 @@ * {@link BigInteger } * */ - public void setX509SerialNumber(BigInteger value) { + public void setX509SerialNumber(BigInteger value) + { this.x509SerialNumber = value; } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/package-info.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/package-info.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmldsig/package-info.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,9 +1,22 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmldsig; Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/AgreementMethodType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/AgreementMethodType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/AgreementMethodType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,31 +1,28 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.JAXBElement; -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.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - import org.picketlink.identity.xmlsec.w3.xmldsig.KeyInfoType; - - /** * <p>Java class for AgreementMethodType complex type. * @@ -48,80 +45,51 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AgreementMethodType", propOrder = { - "content" -}) -public class AgreementMethodType { + */ +public class AgreementMethodType +{ + protected String algorithm; - @XmlElementRefs({ - @XmlElementRef(name = "RecipientKeyInfo", namespace = "http://www.w3.org/2001/04/xmlenc#", type = JAXBElement.class), - @XmlElementRef(name = "KA-Nonce", namespace = "http://www.w3.org/2001/04/xmlenc#", type = JAXBElement.class), - @XmlElementRef(name = "OriginatorKeyInfo", namespace = "http://www.w3.org/2001/04/xmlenc#", type = JAXBElement.class) - }) - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; + public static class AggrementMethod + { + protected byte[] kANonce; + protected KeyInfoType originatorKeyInfo; + protected KeyInfoType recipientKeyInfo; + public AggrementMethod(byte[] kANonce, KeyInfoType originatorKeyInfo, KeyInfoType recipientKeyInfo) + { + this.kANonce = kANonce; + this.originatorKeyInfo = originatorKeyInfo; + this.recipientKeyInfo = recipientKeyInfo; + } + public byte[] getkANonce() + { + return kANonce; + } + public KeyInfoType getOriginatorKeyInfo() + { + return originatorKeyInfo; + } + public KeyInfoType getRecipientKeyInfo() + { + return recipientKeyInfo; + } + } + + public AgreementMethodType( String algo ) + { + this.algorithm = algo; + } - /** - * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link String } - * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >} - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Object } - * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >} - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; - } + /** + * Gets the value of the algorithm property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAlgorithm() { + return algorithm; + } - /** - * Gets the value of the algorithm property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } - - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - } Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/CipherDataType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/CipherDataType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/CipherDataType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,19 +1,27 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; + -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - /** * <p>Java class for CipherDataType complex type. * @@ -33,17 +41,10 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CipherDataType", propOrder = { - "cipherValue", - "cipherReference" -}) -public class CipherDataType { - - @XmlElement(name = "CipherValue") - protected byte[] cipherValue; - @XmlElement(name = "CipherReference") + */ +public class CipherDataType +{ + protected byte[] cipherValue; protected CipherReferenceType cipherReference; /** @@ -91,5 +92,4 @@ public void setCipherReference(CipherReferenceType value) { this.cipherReference = value; } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/CipherReferenceType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/CipherReferenceType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/CipherReferenceType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,21 +1,29 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.xmlsec.w3.xmlenc; +import java.net.URI; -package org.picketlink.identity.xmlsec.w3.xmlenc; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - - /** * <p>Java class for CipherReferenceType complex type. * @@ -35,19 +43,16 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CipherReferenceType", propOrder = { - "transforms" -}) + */ public class CipherReferenceType { + + protected TransformsType transforms; + protected URI uri; - @XmlElement(name = "Transforms") - protected TransformsType transforms; - @XmlAttribute(name = "URI", required = true) - @XmlSchemaType(name = "anyURI") - protected String uri; - + public CipherReferenceType( URI uri ) + { + + } /** * Gets the value of the transforms property. * @@ -80,20 +85,9 @@ * {@link String } * */ - public String getURI() { + public URI getURI() { return uri; } + - /** - * Sets the value of the uri property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setURI(String value) { - this.uri = value; - } - } Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedDataType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedDataType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedDataType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,18 +1,26 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - + /** * <p>Java class for EncryptedDataType complex type. * @@ -28,12 +36,8 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "EncryptedDataType") + */ public class EncryptedDataType extends EncryptedType { - - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedKeyType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedKeyType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedKeyType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,20 +1,28 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ - package org.picketlink.identity.xmlsec.w3.xmlenc; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - /** * <p>Java class for EncryptedKeyType complex type. * @@ -35,21 +43,13 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "EncryptedKeyType", propOrder = { - "referenceList", - "carriedKeyName" -}) + */ public class EncryptedKeyType extends EncryptedType { - - @XmlElement(name = "ReferenceList") - protected ReferenceList referenceList; - @XmlElement(name = "CarriedKeyName") - protected String carriedKeyName; - @XmlAttribute(name = "Recipient") + + protected ReferenceList referenceList; + protected String carriedKeyName; protected String recipient; /** Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptedType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,24 +1,27 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; + -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.picketlink.identity.xmlsec.w3.xmldsig.KeyInfoType; @@ -47,40 +50,16 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "EncryptedType", propOrder = { - "encryptionMethod", - "keyInfo", - "cipherData", - "encryptionProperties" -}) -@XmlSeeAlso({ - EncryptedDataType.class, - EncryptedKeyType.class -}) + */ public abstract class EncryptedType { - @XmlElement(name = "EncryptionMethod") protected EncryptionMethodType encryptionMethod; - @XmlElement(name = "KeyInfo", namespace = "http://www.w3.org/2000/09/xmldsig#") protected KeyInfoType keyInfo; - @XmlElement(name = "CipherData", required = true) protected CipherDataType cipherData; - @XmlElement(name = "EncryptionProperties") protected EncryptionPropertiesType encryptionProperties; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") protected String id; - @XmlAttribute(name = "Type") - @XmlSchemaType(name = "anyURI") protected String type; - @XmlAttribute(name = "MimeType") protected String mimeType; - @XmlAttribute(name = "Encoding") - @XmlSchemaType(name = "anyURI") protected String encoding; /** Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionMethodType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionMethodType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionMethodType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,27 +1,28 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -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.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; /** @@ -45,78 +46,62 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "EncryptionMethodType", propOrder = { - "content" -}) -public class EncryptionMethodType { + */ +public class EncryptionMethodType +{ + protected String algorithm; - @XmlElementRefs({ - @XmlElementRef(name = "KeySize", namespace = "http://www.w3.org/2001/04/xmlenc#", type = JAXBElement.class), - @XmlElementRef(name = "OAEPparams", namespace = "http://www.w3.org/2001/04/xmlenc#", type = JAXBElement.class) - }) - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; + protected EncryptionMethod encryptionMethod; + + public static class EncryptionMethod + { + protected BigInteger keySize; + protected byte[] OAEPparams; + public EncryptionMethod(BigInteger bigInteger, byte[] oAEPparams) + { + this.keySize = bigInteger; + OAEPparams = oAEPparams; + } + public BigInteger getKeySize() + { + return keySize; + } + public byte[] getOAEPparams() + { + return OAEPparams; + } + } - /** - * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} - * {@link String } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link Object } - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; - } + public EncryptionMethodType( String algo ) + { + this.algorithm = algo; + } - /** - * Gets the value of the algorithm property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } + - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } + public EncryptionMethod getEncryptionMethod() + { + return encryptionMethod; + } -} + + + public void setEncryptionMethod(EncryptionMethod encryptionMethod) + { + this.encryptionMethod = encryptionMethod; + } + + + + /** + * Gets the value of the algorithm property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAlgorithm() { + return algorithm; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionPropertiesType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionPropertiesType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionPropertiesType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,27 +1,31 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; import java.util.ArrayList; +import java.util.Collections; import java.util.List; + -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -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; - - /** * <p>Java class for EncryptionPropertiesType complex type. * @@ -41,48 +45,33 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "EncryptionPropertiesType", propOrder = { - "encryptionProperty" -}) + */ public class EncryptionPropertiesType { - - @XmlElement(name = "EncryptionProperty", required = true) - protected List<EncryptionPropertyType> encryptionProperty; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") + + protected List<EncryptionPropertyType> encryptionProperty = new ArrayList<EncryptionPropertyType>() ; protected String id; + public void addEncryptionProperty( EncryptionPropertyType enc ) + { + this.encryptionProperty.add(enc); + } + + public void removeEncryptionProperty( EncryptionPropertyType enc ) + { + this.encryptionProperty.remove( enc ); + } + /** - * Gets the value of the encryptionProperty property. + * Gets the value of the encryptionProperty property. * * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the encryptionProperty property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getEncryptionProperty().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list * {@link EncryptionPropertyType } * * */ - public List<EncryptionPropertyType> getEncryptionProperty() { - if (encryptionProperty == null) { - encryptionProperty = new ArrayList<EncryptionPropertyType>(); - } - return this.encryptionProperty; + public List<EncryptionPropertyType> getEncryptionProperty() { + return Collections.unmodifiableList( this.encryptionProperty ); } /** @@ -108,5 +97,4 @@ public void setId(String value) { this.id = value; } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionPropertyType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionPropertyType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/EncryptionPropertyType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,34 +1,34 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; -import java.util.ArrayList; +import java.net.URI; +import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -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 javax.xml.namespace.QName; -import org.w3c.dom.Element; - /** * <p>Java class for EncryptionPropertyType complex type. * @@ -49,67 +49,24 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "EncryptionPropertyType", propOrder = { - "content" -}) + */ public class EncryptionPropertyType { - - @XmlMixed - @XmlAnyElement(lax = true) - protected List<Object> content; - @XmlAttribute(name = "Target") - @XmlSchemaType(name = "anyURI") - protected String target; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") + + protected URI target; protected String id; - @XmlAnyAttribute private Map<QName, String> otherAttributes = new HashMap<QName, String>(); - /** - * Gets the value of the content property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the content property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getContent().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } - * {@link String } - * - * - */ - public List<Object> getContent() { - if (content == null) { - content = new ArrayList<Object>(); - } - return this.content; - } + /** * Gets the value of the target property. * * @return * possible object is - * {@link String } + * {@link URI } * */ - public String getTarget() { + public URI getTarget() { return target; } @@ -118,10 +75,10 @@ * * @param value * allowed object is - * {@link String } + * {@link URI } * */ - public void setTarget(String value) { + public void setTarget( URI value) { this.target = value; } @@ -149,22 +106,26 @@ this.id = value; } + public void addOtherAttribute( QName key, String val ) + { + this.otherAttributes.put(key, val); + } + + public void addOtherAttributes( Map< QName, String> otherMap ) + { + this.otherAttributes.putAll(otherMap); + } + + public void removeOtherAttribute( QName key ) + { + this.otherAttributes.remove(key); + } /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - * <p> - * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * + * Gets a map that contains attributes that aren't bound to any typed property on this class. * @return * always non-null */ public Map<QName, String> getOtherAttributes() { - return otherAttributes; + return Collections.unmodifiableMap( otherAttributes ); } - -} +} \ No newline at end of file Deleted: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ObjectFactory.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ObjectFactory.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ObjectFactory.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,275 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.xmlsec.w3.xmlenc; - -import java.math.BigInteger; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -import org.picketlink.identity.xmlsec.w3.xmldsig.KeyInfoType; - - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.w3._2001._04.xmlenc_ package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _EncryptionMethodTypeOAEPparams_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "OAEPparams"); - private final static QName _EncryptionMethodTypeKeySize_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "KeySize"); - private final static QName _ReferenceListDataReference_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "DataReference"); - private final static QName _ReferenceListKeyReference_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "KeyReference"); - private final static QName _EncryptedKey_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "EncryptedKey"); - private final static QName _AgreementMethod_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "AgreementMethod"); - private final static QName _EncryptionProperty_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "EncryptionProperty"); - private final static QName _CipherData_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "CipherData"); - private final static QName _CipherReference_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "CipherReference"); - private final static QName _EncryptionProperties_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "EncryptionProperties"); - private final static QName _EncryptedData_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "EncryptedData"); - private final static QName _AgreementMethodTypeKANonce_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "KA-Nonce"); - private final static QName _AgreementMethodTypeRecipientKeyInfo_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "RecipientKeyInfo"); - private final static QName _AgreementMethodTypeOriginatorKeyInfo_QNAME = new QName("http://www.w3.org/2001/04/xmlenc#";, "OriginatorKeyInfo"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2001._04.xmlenc_ - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link EncryptedDataType } - * - */ - public EncryptedDataType createEncryptedDataType() { - return new EncryptedDataType(); - } - - /** - * Create an instance of {@link EncryptionPropertiesType } - * - */ - public EncryptionPropertiesType createEncryptionPropertiesType() { - return new EncryptionPropertiesType(); - } - - /** - * Create an instance of {@link TransformsType } - * - */ - public TransformsType createTransformsType() { - return new TransformsType(); - } - - /** - * Create an instance of {@link ReferenceType } - * - */ - public ReferenceType createReferenceType() { - return new ReferenceType(); - } - - /** - * Create an instance of {@link CipherDataType } - * - */ - public CipherDataType createCipherDataType() { - return new CipherDataType(); - } - - /** - * Create an instance of {@link EncryptedKeyType } - * - */ - public EncryptedKeyType createEncryptedKeyType() { - return new EncryptedKeyType(); - } - - /** - * Create an instance of {@link EncryptionMethodType } - * - */ - public EncryptionMethodType createEncryptionMethodType() { - return new EncryptionMethodType(); - } - - /** - * Create an instance of {@link AgreementMethodType } - * - */ - public AgreementMethodType createAgreementMethodType() { - return new AgreementMethodType(); - } - - /** - * Create an instance of {@link EncryptionPropertyType } - * - */ - public EncryptionPropertyType createEncryptionPropertyType() { - return new EncryptionPropertyType(); - } - - /** - * Create an instance of {@link ReferenceList } - * - */ - public ReferenceList createReferenceList() { - return new ReferenceList(); - } - - /** - * Create an instance of {@link CipherReferenceType } - * - */ - public CipherReferenceType createCipherReferenceType() { - return new CipherReferenceType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "OAEPparams", scope = EncryptionMethodType.class) - public JAXBElement<byte[]> createEncryptionMethodTypeOAEPparams(byte[] value) { - return new JAXBElement<byte[]>(_EncryptionMethodTypeOAEPparams_QNAME, byte[].class, EncryptionMethodType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "KeySize", scope = EncryptionMethodType.class) - public JAXBElement<BigInteger> createEncryptionMethodTypeKeySize(BigInteger value) { - return new JAXBElement<BigInteger>(_EncryptionMethodTypeKeySize_QNAME, BigInteger.class, EncryptionMethodType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "DataReference", scope = ReferenceList.class) - public JAXBElement<ReferenceType> createReferenceListDataReference(ReferenceType value) { - return new JAXBElement<ReferenceType>(_ReferenceListDataReference_QNAME, ReferenceType.class, ReferenceList.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "KeyReference", scope = ReferenceList.class) - public JAXBElement<ReferenceType> createReferenceListKeyReference(ReferenceType value) { - return new JAXBElement<ReferenceType>(_ReferenceListKeyReference_QNAME, ReferenceType.class, ReferenceList.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link EncryptedKeyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "EncryptedKey") - public JAXBElement<EncryptedKeyType> createEncryptedKey(EncryptedKeyType value) { - return new JAXBElement<EncryptedKeyType>(_EncryptedKey_QNAME, EncryptedKeyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AgreementMethodType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "AgreementMethod") - public JAXBElement<AgreementMethodType> createAgreementMethod(AgreementMethodType value) { - return new JAXBElement<AgreementMethodType>(_AgreementMethod_QNAME, AgreementMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link EncryptionPropertyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "EncryptionProperty") - public JAXBElement<EncryptionPropertyType> createEncryptionProperty(EncryptionPropertyType value) { - return new JAXBElement<EncryptionPropertyType>(_EncryptionProperty_QNAME, EncryptionPropertyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CipherDataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "CipherData") - public JAXBElement<CipherDataType> createCipherData(CipherDataType value) { - return new JAXBElement<CipherDataType>(_CipherData_QNAME, CipherDataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CipherReferenceType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "CipherReference") - public JAXBElement<CipherReferenceType> createCipherReference(CipherReferenceType value) { - return new JAXBElement<CipherReferenceType>(_CipherReference_QNAME, CipherReferenceType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link EncryptionPropertiesType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "EncryptionProperties") - public JAXBElement<EncryptionPropertiesType> createEncryptionProperties(EncryptionPropertiesType value) { - return new JAXBElement<EncryptionPropertiesType>(_EncryptionProperties_QNAME, EncryptionPropertiesType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link EncryptedDataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "EncryptedData") - public JAXBElement<EncryptedDataType> createEncryptedData(EncryptedDataType value) { - return new JAXBElement<EncryptedDataType>(_EncryptedData_QNAME, EncryptedDataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "KA-Nonce", scope = AgreementMethodType.class) - public JAXBElement<byte[]> createAgreementMethodTypeKANonce(byte[] value) { - return new JAXBElement<byte[]>(_AgreementMethodTypeKANonce_QNAME, byte[].class, AgreementMethodType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "RecipientKeyInfo", scope = AgreementMethodType.class) - public JAXBElement<KeyInfoType> createAgreementMethodTypeRecipientKeyInfo(KeyInfoType value) { - return new JAXBElement<KeyInfoType>(_AgreementMethodTypeRecipientKeyInfo_QNAME, KeyInfoType.class, AgreementMethodType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2001/04/xmlenc#", name = "OriginatorKeyInfo", scope = AgreementMethodType.class) - public JAXBElement<KeyInfoType> createAgreementMethodTypeOriginatorKeyInfo(KeyInfoType value) { - return new JAXBElement<KeyInfoType>(_AgreementMethodTypeOriginatorKeyInfo_QNAME, KeyInfoType.class, AgreementMethodType.class, value); - } - -} Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ReferenceList.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ReferenceList.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ReferenceList.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,25 +1,31 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - /** * <p>Java class for anonymous complex type. * @@ -39,48 +45,50 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "dataReferenceOrKeyReference" -}) -@XmlRootElement(name = "ReferenceList") -public class ReferenceList { + */ +public class ReferenceList +{ + public static class References + { + private ReferenceType dataReference; + private ReferenceType keyReference; + + public References(ReferenceType dataReference, ReferenceType keyReference) + { + this.dataReference = dataReference; + this.keyReference = keyReference; + } - @XmlElementRefs({ - @XmlElementRef(name = "DataReference", namespace = "http://www.w3.org/2001/04/xmlenc#", type = JAXBElement.class), - @XmlElementRef(name = "KeyReference", namespace = "http://www.w3.org/2001/04/xmlenc#", type = JAXBElement.class) - }) - protected List<JAXBElement<ReferenceType>> dataReferenceOrKeyReference; + public ReferenceType getDataReference() + { + return dataReference; + } - /** - * Gets the value of the dataReferenceOrKeyReference property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the dataReferenceOrKeyReference property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getDataReferenceOrKeyReference().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link ReferenceType }{@code >} - * {@link JAXBElement }{@code <}{@link ReferenceType }{@code >} - * - * - */ - public List<JAXBElement<ReferenceType>> getDataReferenceOrKeyReference() { - if (dataReferenceOrKeyReference == null) { - dataReferenceOrKeyReference = new ArrayList<JAXBElement<ReferenceType>>(); - } - return this.dataReferenceOrKeyReference; - } - -} + public ReferenceType getKeyReference() + { + return keyReference; + } + } + + private List<References> referencesList = new ArrayList<References>(); + + public void add( References ref ) + { + this.referencesList.add(ref); + } + + public void addAll( List<References> refs ) + { + this.referencesList.addAll(refs); + } + + public void remove( References ref ) + { + this.referencesList.remove( ref ); + } + + public List<References> getReferences() + { + return Collections.unmodifiableList( referencesList ); + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ReferenceType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ReferenceType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/ReferenceType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,24 +1,28 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; -import java.util.ArrayList; -import java.util.List; +import java.net.URI; -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.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - - /** * <p>Java class for ReferenceType complex type. * @@ -38,70 +42,40 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ReferenceType", propOrder = { - "any" -}) -public class ReferenceType { + */ +public class ReferenceType +{ + protected URI uri; - @XmlAnyElement(lax = true) - protected List<Object> any; - @XmlAttribute(name = "URI", required = true) - @XmlSchemaType(name = "anyURI") - protected String uri; + public Object reference; - /** - * Gets the value of the any property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the any property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getAny().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link Object } - * - * - */ - public List<Object> getAny() { - if (any == null) { - any = new ArrayList<Object>(); - } - return this.any; - } + public ReferenceType( URI uri ) + { + this.uri = uri; + } - /** - * Gets the value of the uri property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getURI() { - return uri; - } - /** - * Sets the value of the uri property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setURI(String value) { - this.uri = value; - } + public Object getReference() + { + return reference; + } -} + + public void setReference(Object reference) + { + this.reference = reference; + } + + + /** + * Gets the value of the uri property. + * + * @return + * possible object is + * {@link URI } + * + */ + public URI getURI() { + return uri; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/TransformsType.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/TransformsType.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/TransformsType.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,21 +1,30 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - - +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - import org.picketlink.identity.xmlsec.w3.xmldsig.TransformType; @@ -38,43 +47,33 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TransformsType", propOrder = { - "transform" -}) -public class TransformsType { + */ +public class TransformsType +{ + protected List<TransformType> transform = new ArrayList<TransformType>(); - @XmlElement(name = "Transform", namespace = "http://www.w3.org/2000/09/xmldsig#", required = true) - protected List<TransformType> transform; - + public void add( TransformType tt ) + { + this.transform.add( tt ); + } + + public void addAll( List<TransformType> ttlist ) + { + this.transform.addAll( ttlist ); + } + + public void remove( TransformType tt ) + { + this.transform.remove( tt ); + } + /** * Gets the value of the transform property. - * * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the transform property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getTransform().add(newItem); - * </pre> - * - * - * <p> * Objects of the following type(s) are allowed in the list - * {@link TransformType } - * - * + * {@link TransformType } */ public List<TransformType> getTransform() { - if (transform == null) { - transform = new ArrayList<TransformType>(); - } - return this.transform; + return Collections.unmodifiableList( this.transform ); } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/package-info.java =================================================================== --- federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/package-info.java 2011-01-24 16:50:28 UTC (rev 644) +++ federation/trunk/picketlink-xmlsec-model/src/main/java/org/picketlink/identity/xmlsec/w3/xmlenc/package-info.java 2011-01-24 23:24:18 UTC (rev 645) @@ -1,9 +1,22 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.12.08 at 05:45:20 PM CST -// - -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2001/04/xmlenc#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.picketlink.identity.xmlsec.w3.xmlenc;