geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1096960 [4/4] - in /geronimo/server/trunk/plugins/j2ee: geronimo-j2ee-builder/ geronimo-security-builder/ geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/ geronimo-security-builder/src/main/java/org/apache/g...
Date Tue, 26 Apr 2011 23:21:31 GMT
Added: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/DescriptionType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/DescriptionType.java?rev=1096960&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/DescriptionType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/DescriptionType.java Tue Apr 26 23:21:29 2011
@@ -0,0 +1,94 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.26 at 10:47:16 AM PDT 
+//
+
+
+package org.apache.geronimo.security.deployment.model.subjectinfo;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * <p>Java class for descriptionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="descriptionType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *       &lt;attribute ref="{http://www.w3.org/XML/1998/namespace}lang"/>
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "descriptionType", propOrder = {
+    "value"
+})
+public class DescriptionType {
+
+    @XmlValue
+    protected String value;
+    @XmlAttribute(namespace = "http://www.w3.org/XML/1998/namespace")
+    protected String lang;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * 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 lang property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getLang() {
+        return lang;
+    }
+
+    /**
+     * Sets the value of the lang property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLang(String value) {
+        this.lang = value;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/DescriptionType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/DescriptionType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/DescriptionType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/ObjectFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/ObjectFactory.java?rev=1096960&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/ObjectFactory.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/ObjectFactory.java Tue Apr 26 23:21:29 2011
@@ -0,0 +1,102 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.26 at 10:47:16 AM PDT 
+//
+
+
+package org.apache.geronimo.security.deployment.model.subjectinfo;
+
+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.apache.geronimo.security.deployment.model.subjectinfo 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 _Security_QNAME = new QName("http://geronimo.apache.org/xml/ns/subject-info-1.0", "security");
+    private final static QName _DefaultSubject_QNAME = new QName("http://geronimo.apache.org/xml/ns/subject-info-1.0", "default-subject");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.geronimo.security.deployment.model.subjectinfo
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link DefaultSubjectType }
+     * 
+     */
+    public DefaultSubjectType createDefaultSubjectType() {
+        return new DefaultSubjectType();
+    }
+
+    /**
+     * Create an instance of {@link DescriptionType }
+     * 
+     */
+    public DescriptionType createDescriptionType() {
+        return new DescriptionType();
+    }
+
+    /**
+     * Create an instance of {@link RoleSubjectMappingsType }
+     * 
+     */
+    public RoleSubjectMappingsType createRoleSubjectMappingsType() {
+        return new RoleSubjectMappingsType();
+    }
+
+    /**
+     * Create an instance of {@link RoleType }
+     * 
+     */
+    public RoleType createRoleType() {
+        return new RoleType();
+    }
+
+    /**
+     * Create an instance of {@link SecurityType }
+     * 
+     */
+    public SecurityType createSecurityType() {
+        return new SecurityType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/subject-info-1.0", name = "security")
+    public JAXBElement<SecurityType> createSecurity(SecurityType value) {
+        return new JAXBElement<SecurityType>(_Security_QNAME, SecurityType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DefaultSubjectType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/subject-info-1.0", name = "default-subject")
+    public JAXBElement<DefaultSubjectType> createDefaultSubject(DefaultSubjectType value) {
+        return new JAXBElement<DefaultSubjectType>(_DefaultSubject_QNAME, DefaultSubjectType.class, null, value);
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/ObjectFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/ObjectFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/ObjectFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleSubjectMappingsType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleSubjectMappingsType.java?rev=1096960&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleSubjectMappingsType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleSubjectMappingsType.java Tue Apr 26 23:21:29 2011
@@ -0,0 +1,74 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.26 at 10:47:16 AM PDT 
+//
+
+
+package org.apache.geronimo.security.deployment.model.subjectinfo;
+
+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.XmlType;
+
+
+/**
+ * <p>Java class for role-subject-mappingsType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="role-subject-mappingsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="role" type="{http://geronimo.apache.org/xml/ns/subject-info-1.0}roleType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "role-subject-mappingsType", propOrder = {
+    "role"
+})
+public class RoleSubjectMappingsType {
+
+    protected List<RoleType> role;
+
+    /**
+     * Gets the value of the role 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 role property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRole().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link RoleType }
+     * 
+     * 
+     */
+    public List<RoleType> getRole() {
+        if (role == null) {
+            role = new ArrayList<RoleType>();
+        }
+        return this.role;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleSubjectMappingsType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleSubjectMappingsType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleSubjectMappingsType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleType.java?rev=1096960&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleType.java Tue Apr 26 23:21:29 2011
@@ -0,0 +1,159 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.26 at 10:47:16 AM PDT 
+//
+
+
+package org.apache.geronimo.security.deployment.model.subjectinfo;
+
+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.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for roleType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="roleType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="description" type="{http://geronimo.apache.org/xml/ns/subject-info-1.0}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="realm" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="role-name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "roleType", propOrder = {
+    "description",
+    "realm",
+    "id"
+})
+public class RoleType {
+
+    protected List<DescriptionType> description;
+    @XmlElement(required = true)
+    protected String realm;
+    @XmlElement(required = true)
+    protected String id;
+    @XmlAttribute(name = "role-name", required = true)
+    protected String roleName;
+
+    /**
+     * Gets the value of the description 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 description property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getDescription().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link DescriptionType }
+     * 
+     * 
+     */
+    public List<DescriptionType> getDescription() {
+        if (description == null) {
+            description = new ArrayList<DescriptionType>();
+        }
+        return this.description;
+    }
+
+    /**
+     * Gets the value of the realm property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRealm() {
+        return realm;
+    }
+
+    /**
+     * Sets the value of the realm property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRealm(String value) {
+        this.realm = value;
+    }
+
+    /**
+     * 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 the value of the roleName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRoleName() {
+        return roleName;
+    }
+
+    /**
+     * Sets the value of the roleName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRoleName(String value) {
+        this.roleName = value;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/RoleType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/SecurityType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/SecurityType.java?rev=1096960&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/SecurityType.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/SecurityType.java Tue Apr 26 23:21:29 2011
@@ -0,0 +1,228 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.26 at 10:47:16 AM PDT 
+//
+
+
+package org.apache.geronimo.security.deployment.model.subjectinfo;
+
+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.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ *                 Security entries
+ * 
+ *                 If this element is present, all web and EJB modules MUST make the
+ *                 appropriate access checks as outlined in the JACC spec.
+ *             
+ * 
+ * <p>Java class for securityType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="securityType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="description" type="{http://geronimo.apache.org/xml/ns/subject-info-1.0}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="default-subject" type="{http://geronimo.apache.org/xml/ns/subject-info-1.0}default-subjectType"/>
+ *         &lt;element name="role-mappings" type="{http://geronimo.apache.org/xml/ns/subject-info-1.0}role-subject-mappingsType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="doas-current-caller" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *       &lt;attribute name="use-context-handler" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *       &lt;attribute name="default-role" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "securityType", propOrder = {
+    "description",
+    "defaultSubject",
+    "roleMappings"
+})
+public class SecurityType {
+
+    protected List<DescriptionType> description;
+    @XmlElement(name = "default-subject", required = true)
+    protected DefaultSubjectType defaultSubject;
+    @XmlElement(name = "role-mappings")
+    protected RoleSubjectMappingsType roleMappings;
+    @XmlAttribute(name = "doas-current-caller")
+    protected Boolean doasCurrentCaller;
+    @XmlAttribute(name = "use-context-handler")
+    protected Boolean useContextHandler;
+    @XmlAttribute(name = "default-role")
+    protected String defaultRole;
+
+    /**
+     * Gets the value of the description 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 description property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getDescription().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link DescriptionType }
+     * 
+     * 
+     */
+    public List<DescriptionType> getDescription() {
+        if (description == null) {
+            description = new ArrayList<DescriptionType>();
+        }
+        return this.description;
+    }
+
+    /**
+     * Gets the value of the defaultSubject property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DefaultSubjectType }
+     *     
+     */
+    public DefaultSubjectType getDefaultSubject() {
+        return defaultSubject;
+    }
+
+    /**
+     * Sets the value of the defaultSubject property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DefaultSubjectType }
+     *     
+     */
+    public void setDefaultSubject(DefaultSubjectType value) {
+        this.defaultSubject = value;
+    }
+
+    /**
+     * Gets the value of the roleMappings property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link RoleSubjectMappingsType }
+     *     
+     */
+    public RoleSubjectMappingsType getRoleMappings() {
+        return roleMappings;
+    }
+
+    /**
+     * Sets the value of the roleMappings property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link RoleSubjectMappingsType }
+     *     
+     */
+    public void setRoleMappings(RoleSubjectMappingsType value) {
+        this.roleMappings = value;
+    }
+
+    /**
+     * Gets the value of the doasCurrentCaller property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public boolean isDoasCurrentCaller() {
+        if (doasCurrentCaller == null) {
+            return false;
+        } else {
+            return doasCurrentCaller;
+        }
+    }
+
+    /**
+     * Sets the value of the doasCurrentCaller property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setDoasCurrentCaller(Boolean value) {
+        this.doasCurrentCaller = value;
+    }
+
+    /**
+     * Gets the value of the useContextHandler property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public boolean isUseContextHandler() {
+        if (useContextHandler == null) {
+            return false;
+        } else {
+            return useContextHandler;
+        }
+    }
+
+    /**
+     * Sets the value of the useContextHandler property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setUseContextHandler(Boolean value) {
+        this.useContextHandler = value;
+    }
+
+    /**
+     * Gets the value of the defaultRole property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDefaultRole() {
+        return defaultRole;
+    }
+
+    /**
+     * Sets the value of the defaultRole property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDefaultRole(String value) {
+        this.defaultRole = value;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/SecurityType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/SecurityType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/SecurityType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/package-info.java?rev=1096960&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/package-info.java (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/package-info.java Tue Apr 26 23:21:29 2011
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.26 at 10:47:16 AM PDT 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/subject-info-1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.geronimo.security.deployment.model.subjectinfo;

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/package-info.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/model/subjectinfo/package-info.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-credential-store-1.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-credential-store-1.0.xsd?rev=1096960&r1=1096959&r2=1096960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-credential-store-1.0.xsd (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-credential-store-1.0.xsd Tue Apr 26 23:21:29 2011
@@ -20,11 +20,22 @@
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:cs="http://geronimo.apache.org/xml/ns/credentialstore-1.0"
+            xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
             targetNamespace="http://geronimo.apache.org/xml/ns/credentialstore-1.0"
             elementFormDefault="qualified" attributeFormDefault="unqualified"
-            version="1.0">
+            version="1.0"
+        jxb:version="2.0">
 
     <xsd:annotation>
+       <xsd:appinfo>
+           <jxb:bindings schemaLocation="./geronimo-credential-store-1.0.xsd" node="/xsd:schema">
+               <jxb:schemaBindings>
+                  <jxb:package name="org.apache.geronimo.security.deployment.model.credentialstore"/>
+               </jxb:schemaBindings>
+           </jxb:bindings>
+       </xsd:appinfo>
+    </xsd:annotation>
+    <xsd:annotation>
         <xsd:documentation>
             This is an XML Schema Definition for credential store configuration.
             CredentialStore configuration is

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-jaspi.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-jaspi.xsd?rev=1096960&r1=1096959&r2=1096960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-jaspi.xsd (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-jaspi.xsd Tue Apr 26 23:21:29 2011
@@ -29,9 +29,15 @@
 
     <xs:annotation>
         <xs:appinfo>
-            <jaxb:globalBindings>
-                <xjc:serializable uid="12343"/>
-            </jaxb:globalBindings>
+            <jaxb:bindings schemaLocation="./geronimo-jaspi.xsd" node="/xs:schema">
+                <jaxb:schemaBindings>
+                    <jaxb:package name="org.apache.geronimo.security.deployment.model.jaspi"/>
+                </jaxb:schemaBindings>
+                <jaxb:globalBindings>
+                    <xjc:serializable uid="12343"/>
+                </jaxb:globalBindings>
+            </jaxb:bindings>
+
         </xs:appinfo>
     </xs:annotation>
 

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd?rev=1096960&r1=1096959&r2=1096960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd Tue Apr 26 23:21:29 2011
@@ -19,14 +19,23 @@
 <!-- $Rev$ $Date$ -->
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-    xmlns:geronimo="http://geronimo.apache.org/xml/ns/loginconfig-2.0"
-    targetNamespace="http://geronimo.apache.org/xml/ns/loginconfig-2.0"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
-    elementFormDefault="qualified" attributeFormDefault="unqualified"
-    version="2.0">
+            xmlns:geronimo="http://geronimo.apache.org/xml/ns/loginconfig-2.0"
+            xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+            targetNamespace="http://geronimo.apache.org/xml/ns/loginconfig-2.0"
+            elementFormDefault="qualified" attributeFormDefault="unqualified"
+            version="2.0"
+        jxb:version="2.0">
 
     <xsd:annotation>
+       <xsd:appinfo>
+           <jxb:bindings schemaLocation="./geronimo-login-config-2.0.xsd" node="/xsd:schema">
+               <jxb:schemaBindings>
+                  <jxb:package name="org.apache.geronimo.security.deployment.model.loginconfig"/>
+               </jxb:schemaBindings>
+           </jxb:bindings>
+       </xsd:appinfo>
+    </xsd:annotation>
+    <xsd:annotation>
         <xsd:documentation>
             This is an XML Schema Definition for login module configuration to
             use for particular security module. Login module configuration is
@@ -55,16 +64,6 @@
             ]]>
         </xsd:documentation>
     </xsd:annotation>
-    <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"
-        schemaLocation="geronimo-module-1.2.xsd">
-        <xsd:annotation>
-            <xsd:documentation>
-                Import Geronimo Services deployment plans, the imported plan
-                includes complex types like moduleType, environmentType,
-                dependenciesType, etc. required by this plan schema.
-            </xsd:documentation>
-        </xsd:annotation>
-    </xsd:import>
 
     <xsd:element name="login-config" type="geronimo:login-configType">
         <xsd:annotation>
@@ -142,7 +141,7 @@
                     </xsd:documentation>
                 </xsd:annotation>
                 <xsd:sequence>
-                    <xsd:element name="pattern" type="sys:patternType">
+                    <xsd:element name="filter" type="xsd:string">
                         <xsd:annotation>
                             <xsd:documentation>
                                 The pattern element defines a components of the
@@ -240,7 +239,7 @@
                             </xsd:documentation>
                         </xsd:annotation>
                     </xsd:element>
-                    <xsd:element name="xml-option" type="sys:xml-attributeType" minOccurs="0" maxOccurs="unbounded"/>
+                    <!--<xsd:element name="xml-option" type="sys:xml-attributeType" minOccurs="0" maxOccurs="unbounded"/>-->
                 </xsd:sequence>
             </xsd:extension>
         </xsd:complexContent>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd?rev=1096960&r1=1096959&r2=1096960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd Tue Apr 26 23:21:29 2011
@@ -21,22 +21,30 @@
 
 <xsd:schema
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
         xmlns:geronimo="http://geronimo.apache.org/xml/ns/security-2.0"
+        xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
         targetNamespace="http://geronimo.apache.org/xml/ns/security-2.0"
-        xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
-        xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
         elementFormDefault="qualified"
         attributeFormDefault="unqualified"
-        version="2.0">
+        version="2.0"
+        jxb:version="2.0">
 
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-    <xsd:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
-    <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
+    <!--<xsd:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>-->
+    <!--<xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>-->
 
-    <xsd:element name="security" type="geronimo:securityType" substitutionGroup="app:security"/>
-    <xsd:element name="security-ref" type="geronimo:security-refType" substitutionGroup="app:security"/>
-    <xsd:element name="credential-store" type="sys:patternType"/>
+    <xsd:annotation>
+       <xsd:appinfo>
+           <jxb:bindings schemaLocation="./geronimo-security-2.0.xsd" node="/xsd:schema">
+               <jxb:schemaBindings>
+                  <jxb:package name="org.apache.geronimo.security.deployment.model.security"/>
+               </jxb:schemaBindings>
+           </jxb:bindings>
+       </xsd:appinfo>
+    </xsd:annotation>
+    <xsd:element name="security" type="geronimo:securityType"/>
+    <xsd:element name="security-ref" type="geronimo:security-refType"/>
+    <xsd:element name="credential-store" type="xsd:string"/>
     <xsd:element name="default-subject" type="geronimo:subject-infoType"/>
 
     <xsd:complexType name="securityType">
@@ -48,12 +56,12 @@
                 appropriate access checks as outlined in the JACC spec.
             </xsd:documentation>
         </xsd:annotation>
-        <xsd:complexContent>
-            <xsd:extension base="app:abstract-securityType">
+        <!--<xsd:complexContent>-->
+            <!--<xsd:extension base="app:abstract-securityType">-->
                 <xsd:sequence>
                     <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0"
                                  maxOccurs="unbounded"/>
-                    <xsd:element name="credential-store-ref" type="sys:patternType" minOccurs="0"/>
+                    <xsd:element name="credential-store-ref" type="xsd:string" minOccurs="0"/>
                     <xsd:element name="default-subject" type="geronimo:subject-infoType" minOccurs="0"/>
                     <xsd:element name="role-mappings" type="geronimo:role-mappingsType" minOccurs="0"/>
                 </xsd:sequence>
@@ -91,8 +99,8 @@
                         </xsd:documentation>
                     </xsd:annotation>
                 </xsd:attribute>
-            </xsd:extension>
-        </xsd:complexContent>
+            <!--</xsd:extension>-->
+        <!--</xsd:complexContent>-->
     </xsd:complexType>
 
     <xsd:complexType name="security-refType">
@@ -101,14 +109,14 @@
                 Reference to security element in a parent module.
             </xsd:documentation>
         </xsd:annotation>
-        <xsd:complexContent>
-            <xsd:extension base="app:abstract-securityType">
+        <!--<xsd:complexContent>-->
+            <!--<xsd:extension base="app:abstract-securityType">-->
                 <xsd:choice>
                     <xsd:element name="name" type="xsd:string"/>
-                    <xsd:element name="ref" type="sys:patternType"/>
+                    <xsd:element name="ref" type="xsd:string"/>
                 </xsd:choice>
-             </xsd:extension>
-        </xsd:complexContent>
+             <!--</xsd:extension>-->
+        <!--</xsd:complexContent>-->
     </xsd:complexType>
 
     <xsd:complexType name="descriptionType">

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd?rev=1096960&r1=1096959&r2=1096960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-subject-info-1.0.xsd Tue Apr 26 23:21:29 2011
@@ -20,19 +20,29 @@
 <!-- $Rev$ $Date$ -->
 
 <xsd:schema
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-    xmlns:geronimo="http://geronimo.apache.org/xml/ns/subject-info-1.0"
-    targetNamespace="http://geronimo.apache.org/xml/ns/subject-info-1.0"
-    xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="2.0">
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:geronimo="http://geronimo.apache.org/xml/ns/subject-info-1.0"
+        xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+        targetNamespace="http://geronimo.apache.org/xml/ns/subject-info-1.0"
+        elementFormDefault="qualified"
+        attributeFormDefault="unqualified"
+        version="2.0"
+        jxb:version="2.0">
     
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-    <xsd:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
+    <!--<xsd:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>-->
 
-    <xsd:element name="security" type="geronimo:securityType"  substitutionGroup="app:security"/>
+    <xsd:annotation>
+       <xsd:appinfo>
+           <jxb:bindings schemaLocation="./geronimo-subject-info-1.0.xsd" node="/xsd:schema">
+               <jxb:schemaBindings>
+                  <jxb:package name="org.apache.geronimo.security.deployment.model.subjectinfo"/>
+               </jxb:schemaBindings>
+           </jxb:bindings>
+       </xsd:appinfo>
+    </xsd:annotation>
+
+    <xsd:element name="security" type="geronimo:securityType"/>
     <xsd:element name="default-subject" type="geronimo:default-subjectType"/>
 
     <xsd:complexType name="securityType">
@@ -44,8 +54,8 @@
                 appropriate access checks as outlined in the JACC spec.
             </xsd:documentation>
         </xsd:annotation>
-        <xsd:complexContent>
-            <xsd:extension base="app:abstract-securityType">
+        <!--<xsd:complexContent>-->
+            <!--<xsd:extension base="app:abstract-securityType">-->
 
         <xsd:sequence>
             <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
@@ -79,8 +89,8 @@
                 </xsd:documentation>
             </xsd:annotation>
         </xsd:attribute>
-            </xsd:extension>
-        </xsd:complexContent>
+            <!--</xsd:extension>-->
+        <!--</xsd:complexContent>-->
     </xsd:complexType>
 
     <xsd:complexType name="descriptionType">

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java?rev=1096960&r1=1096959&r2=1096960&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java Tue Apr 26 23:21:29 2011
@@ -20,11 +20,14 @@
 
 package org.apache.geronimo.security.deployment;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 
+import javax.xml.bind.JAXBException;
+import javax.xml.stream.XMLStreamException;
 import junit.framework.TestCase;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
@@ -38,6 +41,8 @@ import org.apache.geronimo.kernel.mock.M
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.security.deployment.model.JaxbUtil;
+import org.apache.geronimo.security.deployment.model.loginconfig.LoginConfigType;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
@@ -92,7 +97,7 @@ public class LoginConfigBuilderTest exte
     //2.0 namespace, without server-side, with login-module-ref
     private static final String SAMPLE4 = "            <lc:login-config xmlns:lc=\"http://geronimo.apache.org/xml/ns/loginconfig-2.0\">\n" +
             "                <lc:login-module-ref control-flag=\"REQUIRED\" wrap-principals=\"true\">\n" +
-            "                    <lc:pattern><name xmlns='http://geronimo.apache.org/xml/ns/deployment-1.2'>client-properties-lm</name></lc:pattern>\n" +
+            "                    <lc:filter>client-properties-lm</lc:filter>\n" +
             "                </lc:login-module-ref>\n" +
             "                <lc:login-module control-flag=\"REQUIRED\" wrap-principals=\"true\">\n" +
             "                    <lc:login-domain-name>default</lc:login-domain-name>\n" +
@@ -114,18 +119,22 @@ public class LoginConfigBuilderTest exte
         doTest(SAMPLE4);
     }
 
-    private void doTest(String text) throws XmlException, DeploymentException {
+    private void doTest(String text) throws XmlException, DeploymentException, JAXBException, XMLStreamException {
         GeronimoSecurityBuilderImpl secBuilder = new GeronimoSecurityBuilderImpl(null, null, null);
         secBuilder.doStart();
         LoginConfigBuilder builder = new LoginConfigBuilder(new Jsr77Naming(), null);
-        XmlObject xmlObject = XmlBeansUtil.parse(text);
-        XmlCursor cursor = xmlObject.newCursor();
-        cursor.toFirstContentToken();
-        xmlObject = cursor.getObject();
+        LoginConfigType xmlObject = JaxbUtil.unmarshalLoginConfig(new ByteArrayInputStream(text.getBytes()), false);
         HashMap<String, Artifact> locations = new HashMap<String, Artifact>();
         locations.put(null, Artifact.create("test/foo/1.0/car"));
         BundleContext bundleContext = new MockBundleContext(getClass().getClassLoader(), "", new HashMap<Artifact, ConfigurationData>(), locations);
-        DeploymentContext context = new DeploymentContext(new File("."), null, new Environment(Artifact.create("test/foo/1.0/car")), null, ConfigurationModuleType.SERVICE, new Jsr77Naming(), new MockConfigurationManager(), Collections.<Repository>emptySet(), bundleContext);
+        DeploymentContext context = new DeploymentContext(new File("."),
+                null,
+                new Environment(Artifact.create("test/foo/1.0/car")),
+                null,
+                ConfigurationModuleType.SERVICE,
+                new Jsr77Naming(),
+                Collections.<Repository>emptySet(),
+                bundleContext);
         context.initializeConfiguration();
         AbstractName parentName = new AbstractName(URI.create("test/foo/1.0/car?name=parent,j2eeType=foo"));
         builder.getReferences(xmlObject, context, parentName, bundleContext.getBundle());



Mime
View raw message