[picketlink-commits] Picketlink SVN: r1006 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility.

Author: anil.saldhana(a)jboss.com Date: 2011-06-16 16:55:45 -0400 (Thu, 16 Jun 2011) New Revision: 1006 Removed: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/ObjectFactory.java Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/package-info.java Log: use non-jaxb Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-06-16 20:29:31 UTC (rev 1005) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedDateTime.java 2011-06-16 20:55:45 UTC (rev 1006) @@ -1,29 +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.17 at 12:32: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.federation.ws.wss.utility; -import java.util.HashMap; -import java.util.Map; +import org.picketlink.identity.federation.ws.addressing.BaseAddressingType; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -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; -import javax.xml.namespace.QName; - - /** * * This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes. @@ -45,86 +44,62 @@ * * */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AttributedDateTime", propOrder = { - "value" -}) -public class AttributedDateTime { +public class AttributedDateTime extends BaseAddressingType +{ - @XmlValue - protected String value; - @XmlAttribute(name = "Id", namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - @XmlAnyAttribute - private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + protected String value; - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } + protected String id; - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() + { + return value; + } - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) + { + this.value = 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 id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() + { + return id; + } - /** - * 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. - * - * - * @return - * always non-null - */ - public Map<QName, String> getOtherAttributes() { - return otherAttributes; - } - -} + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) + { + this.id = value; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-06-16 20:29:31 UTC (rev 1005) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/AttributedURI.java 2011-06-16 20:55:45 UTC (rev 1006) @@ -1,29 +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.17 at 12:32: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.federation.ws.wss.utility; -import java.util.HashMap; -import java.util.Map; +import org.picketlink.identity.federation.ws.addressing.BaseAddressingType; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -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; -import javax.xml.namespace.QName; - - /** * * This type is for elements whose [children] is an anyURI and can have arbitrary attributes. @@ -45,87 +44,63 @@ * * */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AttributedURI", propOrder = { - "value" -}) -public class AttributedURI { - @XmlValue - @XmlSchemaType(name = "anyURI") - protected String value; - @XmlAttribute(name = "Id", namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - @XmlAnyAttribute - private Map<QName, String> otherAttributes = new HashMap<QName, String>(); +public class AttributedURI extends BaseAddressingType +{ - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } + protected String value; - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } + protected String id; - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() + { + return value; + } - /** - * 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 value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) + { + this.value = value; + } - /** - * 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. - * - * - * @return - * always non-null - */ - public Map<QName, String> getOtherAttributes() { - return otherAttributes; - } + /** + * 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; + } +} \ No newline at end of file Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/ObjectFactory.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/ObjectFactory.java 2011-06-16 20:29:31 UTC (rev 1005) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/ObjectFactory.java 2011-06-16 20:55:45 UTC (rev 1006) @@ -1,96 +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.17 at 12:32:20 PM CST -// - - -package org.picketlink.identity.federation.ws.wss.utility; - -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.oasis_open.docs.wss._2004._01.oasis_200401_wss_wssecurity_utility_1_0 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 _Expires_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssec...;, "Expires"); - private final static QName _Created_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssec...;, "Created"); - private final static QName _Timestamp_QNAME = new QName("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssec...;, "Timestamp"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.oasis_open.docs.wss._2004._01.oasis_200401_wss_wssecurity_utility_1_0 - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link TimestampType } - * - */ - public TimestampType createTimestampType() { - return new TimestampType(); - } - - /** - * Create an instance of {@link AttributedDateTime } - * - */ - public AttributedDateTime createAttributedDateTime() { - return new AttributedDateTime(); - } - - /** - * Create an instance of {@link AttributedURI } - * - */ - public AttributedURI createAttributedURI() { - return new AttributedURI(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AttributedDateTime }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", name = "Expires") - public JAXBElement<AttributedDateTime> createExpires(AttributedDateTime value) { - return new JAXBElement<AttributedDateTime>(_Expires_QNAME, AttributedDateTime.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AttributedDateTime }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", name = "Created") - public JAXBElement<AttributedDateTime> createCreated(AttributedDateTime value) { - return new JAXBElement<AttributedDateTime>(_Created_QNAME, AttributedDateTime.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TimestampType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", name = "Timestamp") - public JAXBElement<TimestampType> createTimestamp(TimestampType value) { - return new JAXBElement<TimestampType>(_Timestamp_QNAME, TimestampType.class, null, value); - } - -} Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-06-16 20:29:31 UTC (rev 1005) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/TimestampType.java 2011-06-16 20:55:45 UTC (rev 1006) @@ -1,34 +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.17 at 12:32: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.federation.ws.wss.utility; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.picketlink.identity.federation.ws.addressing.AnyAddressingType; -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.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; -import javax.xml.namespace.QName; - -import org.w3c.dom.Element; - - /** * * This complex type ties together the timestamp related elements into a composite type. @@ -57,146 +51,89 @@ * * */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TimestampType", propOrder = { - "created", - "expires", - "any" -}) -public class TimestampType { +public class TimestampType extends AnyAddressingType +{ + protected AttributedDateTime created; - @XmlElement(name = "Created") - protected AttributedDateTime created; - @XmlElement(name = "Expires") - protected AttributedDateTime expires; - @XmlAnyElement(lax = true) - protected List<Object> any; - @XmlAttribute(name = "Id", namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - @XmlAnyAttribute - private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + protected AttributedDateTime expires; - /** - * Gets the value of the created property. - * - * @return - * possible object is - * {@link AttributedDateTime } - * - */ - public AttributedDateTime getCreated() { - return created; - } + protected String id; - /** - * Sets the value of the created property. - * - * @param value - * allowed object is - * {@link AttributedDateTime } - * - */ - public void setCreated(AttributedDateTime value) { - this.created = value; - } + /** + * Gets the value of the created property. + * + * @return + * possible object is + * {@link AttributedDateTime } + * + */ + public AttributedDateTime getCreated() + { + return created; + } - /** - * Gets the value of the expires property. - * - * @return - * possible object is - * {@link AttributedDateTime } - * - */ - public AttributedDateTime getExpires() { - return expires; - } + /** + * Sets the value of the created property. + * + * @param value + * allowed object is + * {@link AttributedDateTime } + * + */ + public void setCreated(AttributedDateTime value) + { + this.created = value; + } - /** - * Sets the value of the expires property. - * - * @param value - * allowed object is - * {@link AttributedDateTime } - * - */ - public void setExpires(AttributedDateTime value) { - this.expires = value; - } + /** + * Gets the value of the expires property. + * + * @return + * possible object is + * {@link AttributedDateTime } + * + */ + public AttributedDateTime getExpires() + { + return expires; + } - /** - * 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 } - * {@link Element } - * - * - */ - public List<Object> getAny() { - if (any == null) { - any = new ArrayList<Object>(); - } - return this.any; - } + /** + * Sets the value of the expires property. + * + * @param value + * allowed object is + * {@link AttributedDateTime } + * + */ + public void setExpires(AttributedDateTime value) + { + this.expires = 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; - } - - /** - * 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. - * - * - * @return - * always non-null - */ - public Map<QName, String> getOtherAttributes() { - return otherAttributes; - } - -} + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) + { + this.id = value; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/package-info.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/package-info.java 2011-06-16 20:29:31 UTC (rev 1005) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/wss/utility/package-info.java 2011-06-16 20:55:45 UTC (rev 1006) @@ -1,9 +1,23 @@ -// -// 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.17 at 12:32: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.federation.ws.wss.utility; -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.picketlink.identity.federation.ws.wss.utility;