Author: anil.saldhana(a)jboss.com Date: 2009-02-13 18:28:53 -0500 (Fri, 13 Feb 2009) New Revision: 318 Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd Log: updated config Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // @@ -42,27 +42,27 @@ } /** - * Create an instance of {@link EncryptionType } + * Create an instance of {@link AuthPropertyType } * */ - public EncryptionType createEncryptionType() { - return new EncryptionType(); + public AuthPropertyType createAuthPropertyType() { + return new AuthPropertyType(); } /** - * Create an instance of {@link TrustType } + * Create an instance of {@link KeyProviderType } * */ - public TrustType createTrustType() { - return new TrustType(); + public KeyProviderType createKeyProviderType() { + return new KeyProviderType(); } /** - * Create an instance of {@link SPType } + * Create an instance of {@link EncryptionType } * */ - public SPType createSPType() { - return new SPType(); + public EncryptionType createEncryptionType() { + return new EncryptionType(); } /** @@ -74,35 +74,35 @@ } /** - * Create an instance of {@link AuthPropertyType } + * Create an instance of {@link IDPType } * */ - public AuthPropertyType createAuthPropertyType() { - return new AuthPropertyType(); + public IDPType createIDPType() { + return new IDPType(); } /** - * Create an instance of {@link ProviderType } + * Create an instance of {@link SPType } * */ - public ProviderType createProviderType() { - return new ProviderType(); + public SPType createSPType() { + return new SPType(); } /** - * Create an instance of {@link KeyProviderType } + * Create an instance of {@link TrustType } * */ - public KeyProviderType createKeyProviderType() { - return new KeyProviderType(); + public TrustType createTrustType() { + return new TrustType(); } /** - * Create an instance of {@link IDPType } + * Create an instance of {@link ProviderType } * */ - public IDPType createIDPType() { - return new IDPType(); + public ProviderType createProviderType() { + return new ProviderType(); } /** Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // @@ -10,6 +10,7 @@ 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.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; @@ -31,6 +32,14 @@ * &lt;element name="Trust" type="{urn:jboss:identity-federation:config:1.0}TrustType" minOccurs="0"/> * &lt;element name="KeyProvider" type="{urn:jboss:identity-federation:config:1.0}KeyProviderType" minOccurs="0"/> * &lt;/sequence> + * &lt;attribute name="ServerEnvironment" default="JBOSS"> + * &lt;simpleType> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * &lt;enumeration value="JBOSS"/> + * &lt;enumeration value="TOMCAT"/> + * &lt;/restriction> + * &lt;/simpleType> + * &lt;/attribute> * &lt;/restriction> * &lt;/complexContent> * &lt;/complexType> @@ -56,6 +65,8 @@ protected TrustType trust; @XmlElement(name = "KeyProvider") protected KeyProviderType keyProvider; + @XmlAttribute(name = "ServerEnvironment") + protected String serverEnvironment; /** * Gets the value of the identityURL property. @@ -129,4 +140,32 @@ this.keyProvider = value; } + /** + * Gets the value of the serverEnvironment property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getServerEnvironment() { + if (serverEnvironment == null) { + return "JBOSS"; + } else { + return serverEnvironment; + } + } + + /** + * Sets the value of the serverEnvironment property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setServerEnvironment(String value) { + this.serverEnvironment = value; + } + } Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java 2009-02-13 23:28:53 UTC (rev 318) @@ -2,7 +2,7 @@ // 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: 2009.02.04 at 09:20:44 PM CST +// Generated on: 2009.02.12 at 11:14:14 AM CST // @javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity-federation:config:1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) Modified: identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd =================================================================== --- identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-02-13 23:28:06 UTC (rev 317) +++ identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-02-13 23:28:53 UTC (rev 318) @@ -106,7 +106,16 @@ <element name="KeyProvider" type="tns:KeyProviderType" maxOccurs="1" minOccurs="0"> </element> - </sequence> + </sequence> + <!-- Specify what is the server environment where the IDP or SP exists --> + <attribute name="ServerEnvironment" use="optional" default="JBOSS"> + <simpleType> + <restriction base="string"> + <enumeration value="JBOSS"></enumeration> + <enumeration value="TOMCAT"></enumeration> + </restriction> + </simpleType> + </attribute> </complexType> <complexType name="SPType">