geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r784518 [4/6] - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/ framework/configs/client-system/ framework/configs/client-system/src/main/history/ framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/ ...
Date Sun, 14 Jun 2009 07:40:08 GMT
Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/HostType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/HostType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/HostType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ListenerType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ListenerType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ListenerType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ListenerType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,108 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import java.util.Map;
+import java.util.HashMap;
+
+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;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.namespace.QName;
+
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Executor;
+import org.apache.xbean.recipe.ObjectRecipe;
+import org.apache.xbean.recipe.Option;
+
+
+/**
+ * <p>Java class for ListenerType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="ListenerType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="className" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ListenerType")
+public class ListenerType {
+
+    @XmlAttribute
+    protected String className;
+    @XmlAnyAttribute
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    /**
+     * Gets the value of the className property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getClassName() {
+        return className;
+    }
+
+    /**
+     * Sets the value of the className property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setClassName(String value) {
+        this.className = 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;
+    }
+
+    public LifecycleListener getLifecycleListener(ClassLoader cl) throws Exception {
+        Map<String, Object> properties = new HashMap<String, Object>();
+
+        for (Map.Entry<QName, String> entry: otherAttributes.entrySet()) {
+            String name = entry.getKey().getLocalPart();
+            properties.put(name, entry.getValue());
+        }
+        ObjectRecipe recipe = new ObjectRecipe(className, properties);
+        recipe.allow(Option.IGNORE_MISSING_PROPERTIES);
+        LifecycleListener listener = (LifecycleListener) recipe.create(cl);
+        return listener;
+    }
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ListenerType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ListenerType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ListenerType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/LocalEjbType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/LocalEjbType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/LocalEjbType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/LocalEjbType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,37 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for LocalEjbType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="LocalEjbType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "LocalEjbType")
+public class LocalEjbType {
+
+
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/LocalEjbType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/LocalEjbType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/LocalEjbType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/NamingResourcesType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/NamingResourcesType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/NamingResourcesType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/NamingResourcesType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,288 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+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.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.ContextResource;
+
+
+/**
+ * <p>Java class for NamingResourcesType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="NamingResourcesType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Ejb" type="{}EjbType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Environment" type="{}EnvironmentType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="LocalEjb" type="{}LocalEjbType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Resource" type="{}ResourceType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="ResourceEnvRef" type="{}ResourceEnvRefType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="ServiceRef" type="{}ServiceRefType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Transaction" type="{}TransactionType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "NamingResourcesType", propOrder = {
+    "ejb",
+    "environment",
+    "localEjb",
+    "resource",
+    "resourceEnvRef",
+    "serviceRef",
+    "transaction"
+})
+@XmlSeeAlso({
+    ContextType.class
+})
+public class NamingResourcesType {
+
+    @XmlElement(name = "Ejb")
+    protected List<EjbType> ejb;
+    @XmlElement(name = "Environment")
+    protected List<EnvironmentType> environment;
+    @XmlElement(name = "LocalEjb")
+    protected List<LocalEjbType> localEjb;
+    @XmlElement(name = "Resource")
+    protected List<ResourceType> resource;
+    @XmlElement(name = "ResourceEnvRef")
+    protected List<ResourceEnvRefType> resourceEnvRef;
+    @XmlElement(name = "ServiceRef")
+    protected List<ServiceRefType> serviceRef;
+    @XmlElement(name = "Transaction")
+    protected List<TransactionType> transaction;
+
+    /**
+     * Gets the value of the ejb 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 ejb property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getEjb().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EjbType }
+     * 
+     * 
+     */
+    public List<EjbType> getEjb() {
+        if (ejb == null) {
+            ejb = new ArrayList<EjbType>();
+        }
+        return this.ejb;
+    }
+
+    /**
+     * Gets the value of the environment 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 environment property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getEnvironment().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EnvironmentType }
+     * 
+     * 
+     */
+    public List<EnvironmentType> getEnvironment() {
+        if (environment == null) {
+            environment = new ArrayList<EnvironmentType>();
+        }
+        return this.environment;
+    }
+
+    /**
+     * Gets the value of the localEjb 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 localEjb property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getLocalEjb().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link LocalEjbType }
+     * 
+     * 
+     */
+    public List<LocalEjbType> getLocalEjb() {
+        if (localEjb == null) {
+            localEjb = new ArrayList<LocalEjbType>();
+        }
+        return this.localEjb;
+    }
+
+    /**
+     * Gets the value of the resource 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 resource property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getResource().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceType }
+     * 
+     * 
+     */
+    public List<ResourceType> getResource() {
+        if (resource == null) {
+            resource = new ArrayList<ResourceType>();
+        }
+        return this.resource;
+    }
+
+    /**
+     * Gets the value of the resourceEnvRef 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 resourceEnvRef property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getResourceEnvRef().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceEnvRefType }
+     * 
+     * 
+     */
+    public List<ResourceEnvRefType> getResourceEnvRef() {
+        if (resourceEnvRef == null) {
+            resourceEnvRef = new ArrayList<ResourceEnvRefType>();
+        }
+        return this.resourceEnvRef;
+    }
+
+    /**
+     * Gets the value of the serviceRef 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 serviceRef property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getServiceRef().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceRefType }
+     * 
+     * 
+     */
+    public List<ServiceRefType> getServiceRef() {
+        if (serviceRef == null) {
+            serviceRef = new ArrayList<ServiceRefType>();
+        }
+        return this.serviceRef;
+    }
+
+    /**
+     * Gets the value of the transaction 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 transaction property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTransaction().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TransactionType }
+     * 
+     * 
+     */
+    public List<TransactionType> getTransaction() {
+        if (transaction == null) {
+            transaction = new ArrayList<TransactionType>();
+        }
+        return this.transaction;
+    }
+
+    public void merge(NamingResources namingResources, ClassLoader cl) {
+        for (ResourceType resourceType: getResource()) {
+            ContextResource contextResource = resourceType.getContextResource(cl);
+            namingResources.addResource(contextResource);
+        }
+        //do nothing for now... use geronimo naming configuration
+    }
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/NamingResourcesType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/NamingResourcesType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/NamingResourcesType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ObjectFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ObjectFactory.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ObjectFactory.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ObjectFactory.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,204 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+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.tomcat.modelxx 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 _Server_QNAME = new QName("", "Server");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.geronimo.tomcat.modelxx
+     *
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link ResourceEnvRefType }
+     *
+     */
+    public ResourceEnvRefType createResourceEnvRefType() {
+        return new ResourceEnvRefType();
+    }
+
+    /**
+     * Create an instance of {@link ServerType }
+     *
+     */
+    public ServerType createServerType() {
+        return new ServerType();
+    }
+
+    /**
+     * Create an instance of {@link ValveType }
+     *
+     */
+    public ValveType createValveType() {
+        return new ValveType();
+    }
+
+    /**
+     * Create an instance of {@link EngineType }
+     *
+     */
+    public EngineType createEngineType() {
+        return new EngineType();
+    }
+
+    /**
+     * Create an instance of {@link ServiceRefType }
+     *
+     */
+    public ServiceRefType createServiceRefType() {
+        return new ServiceRefType();
+    }
+
+    /**
+     * Create an instance of {@link ClusterType }
+     *
+     */
+    public ClusterType createClusterType() {
+        return new ClusterType();
+    }
+
+    /**
+     * Create an instance of {@link ContextType }
+     *
+     */
+    public ContextType createContextType() {
+        return new ContextType();
+    }
+
+    /**
+     * Create an instance of {@link ConnectorType }
+     *
+     */
+    public ConnectorType createConnectorType() {
+        return new ConnectorType();
+    }
+
+    /**
+     * Create an instance of {@link ExecutorType }
+     *
+     */
+    public ExecutorType createExecutorType() {
+        return new ExecutorType();
+    }
+
+    /**
+     * Create an instance of {@link ListenerType }
+     *
+     */
+    public ListenerType createListenerType() {
+        return new ListenerType();
+    }
+
+    /**
+     * Create an instance of {@link NamingResourcesType }
+     *
+     */
+    public NamingResourcesType createNamingResourcesType() {
+        return new NamingResourcesType();
+    }
+
+    /**
+     * Create an instance of {@link HostType }
+     *
+     */
+    public HostType createHostType() {
+        return new HostType();
+    }
+
+    /**
+     * Create an instance of {@link TransactionType }
+     *
+     */
+    public TransactionType createTransactionType() {
+        return new TransactionType();
+    }
+
+    /**
+     * Create an instance of {@link EjbType }
+     *
+     */
+    public EjbType createEjbType() {
+        return new EjbType();
+    }
+
+    /**
+     * Create an instance of {@link EnvironmentType }
+     *
+     */
+    public EnvironmentType createEnvironmentType() {
+        return new EnvironmentType();
+    }
+
+    /**
+     * Create an instance of {@link RealmType }
+     *
+     */
+    public RealmType createRealmType() {
+        return new RealmType();
+    }
+
+    /**
+     * Create an instance of {@link ServiceType }
+     *
+     */
+    public ServiceType createServiceType() {
+        return new ServiceType();
+    }
+
+    /**
+     * Create an instance of {@link LocalEjbType }
+     *
+     */
+    public LocalEjbType createLocalEjbType() {
+        return new LocalEjbType();
+    }
+
+    /**
+     * Create an instance of {@link ResourceType }
+     *
+     */
+    public ResourceType createResourceType() {
+        return new ResourceType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ServerType }{@code >}}
+     *
+     */
+    @XmlElementDecl(namespace = "", name = "Server")
+    public JAXBElement<ServerType> createServer(ServerType value) {
+        return new JAXBElement<ServerType>(_Server_QNAME, ServerType.class, null, value);
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ObjectFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ObjectFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ObjectFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/RealmType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/RealmType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/RealmType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/RealmType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,108 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import java.util.Map;
+import java.util.HashMap;
+
+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;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.namespace.QName;
+
+import org.apache.catalina.Realm;
+import org.apache.catalina.Executor;
+import org.apache.xbean.recipe.ObjectRecipe;
+import org.apache.xbean.recipe.Option;
+
+
+/**
+ * <p>Java class for RealmType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="RealmType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="className" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "RealmType")
+public class RealmType {
+
+    @XmlAttribute
+    protected String className;
+    @XmlAnyAttribute
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    /**
+     * Gets the value of the className property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getClassName() {
+        return className;
+    }
+
+    /**
+     * Sets the value of the className property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setClassName(String value) {
+        this.className = 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;
+    }
+
+    public Realm getRealm(ClassLoader cl) throws Exception {
+        Map<String, Object> properties = new HashMap<String, Object>();
+
+        for (Map.Entry<QName, String> entry: otherAttributes.entrySet()) {
+            String name = entry.getKey().getLocalPart();
+            properties.put(name, entry.getValue());
+        }
+        ObjectRecipe recipe = new ObjectRecipe(className, properties);
+        recipe.allow(Option.IGNORE_MISSING_PROPERTIES);
+        Realm realm = (Realm) recipe.create(cl);
+        return realm;
+    }
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/RealmType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/RealmType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/RealmType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceEnvRefType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceEnvRefType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceEnvRefType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceEnvRefType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,37 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ResourceEnvRefType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ResourceEnvRefType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ResourceEnvRefType")
+public class ResourceEnvRefType {
+
+
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceEnvRefType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceEnvRefType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceEnvRefType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,214 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import java.util.HashMap;
+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.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+import org.apache.catalina.deploy.ContextResource;
+
+
+/**
+ * <p>Java class for ResourceType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="ResourceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="auth" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="scope" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ResourceType")
+public class ResourceType {
+
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected String type;
+    @XmlAttribute
+    protected String description;
+    @XmlAttribute
+    protected String auth;
+    @XmlAttribute
+    protected String scope;
+    @XmlAnyAttribute
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    /**
+     * Gets the value of the name property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Gets the value of the description property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Sets the value of the description property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setDescription(String value) {
+        this.description = value;
+    }
+
+    /**
+     * Gets the value of the auth property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getAuth() {
+        return auth;
+    }
+
+    /**
+     * Sets the value of the auth property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setAuth(String value) {
+        this.auth = value;
+    }
+
+    /**
+     * Gets the value of the scope property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getScope() {
+        return scope;
+    }
+
+    /**
+     * Sets the value of the scope property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setScope(String value) {
+        this.scope = 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;
+    }
+
+    public ContextResource getContextResource(ClassLoader cl) {
+        ContextResource contextResource = new ContextResource();
+        contextResource.setAuth(getAuth());
+        contextResource.setScope(getScope());
+        contextResource.setDescription(getDescription());
+        contextResource.setName(getName());
+        contextResource.setType(getType());
+        for (Map.Entry<QName, String> entry: getOtherAttributes().entrySet()) {
+            String propertyName = entry.getKey().getLocalPart();
+            contextResource.setProperty(propertyName, entry.getValue());
+        }
+        return contextResource;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServerType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServerType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServerType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServerType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,291 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+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;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.namespace.QName;
+
+import org.apache.catalina.Server;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Service;
+import org.apache.catalina.core.StandardServer;
+import org.apache.catalina.deploy.NamingResources;
+import org.apache.xbean.recipe.ObjectRecipe;
+import org.apache.xbean.recipe.Option;
+
+
+/**
+ * <p>Java class for ServerType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="ServerType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Listener" type="{}ListenerType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="GlobalNamingResources" type="{}NamingResourcesType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Service" type="{}ServiceType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="className" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="port" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;attribute name="shutdown" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ServerType", propOrder = {
+    "listener",
+    "globalNamingResources",
+    "service"
+})
+public class ServerType {
+
+    @XmlElement(name = "Listener")
+    protected List<ListenerType> listener;
+    @XmlElement(name = "GlobalNamingResources")
+    protected List<NamingResourcesType> globalNamingResources;
+    @XmlElement(name = "Service")
+    protected List<ServiceType> service;
+    @XmlAttribute
+    protected String className = StandardServer.class.getName();
+    @XmlAttribute
+    protected Integer port;
+    @XmlAttribute
+    protected String shutdown;
+    @XmlAnyAttribute
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    /**
+     * Gets the value of the listener 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 listener property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getListener().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link org.apache.geronimo.tomcat.modelxx.ListenerType }
+     *
+     *
+     */
+    public List<ListenerType> getListener() {
+        if (listener == null) {
+            listener = new ArrayList<ListenerType>();
+        }
+        return this.listener;
+    }
+
+    /**
+     * Gets the value of the globalNamingResources 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 globalNamingResources property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getGlobalNamingResources().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link NamingResourcesType }
+     *
+     *
+     */
+    public List<NamingResourcesType> getGlobalNamingResources() {
+        if (globalNamingResources == null) {
+            globalNamingResources = new ArrayList<NamingResourcesType>();
+        }
+        return this.globalNamingResources;
+    }
+
+    /**
+     * Gets the value of the service 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 service property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getService().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceType }
+     *
+     *
+     */
+    public List<ServiceType> getService() {
+        if (service == null) {
+            service = new ArrayList<ServiceType>();
+        }
+        return this.service;
+    }
+
+    /**
+     * Gets the value of the className property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getClassName() {
+        return className;
+    }
+
+    /**
+     * Sets the value of the className property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setClassName(String value) {
+        this.className = value;
+    }
+
+    /**
+     * Gets the value of the port property.
+     *
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *
+     */
+    public Integer getPort() {
+        return port;
+    }
+
+    /**
+     * Sets the value of the port property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *
+     */
+    public void setPort(Integer value) {
+        this.port = value;
+    }
+
+    /**
+     * Gets the value of the shutdown property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getShutdown() {
+        return shutdown;
+    }
+
+    /**
+     * Sets the value of the shutdown property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setShutdown(String value) {
+        this.shutdown = 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;
+    }
+
+    public Server build(ClassLoader cl) throws Exception {
+        Map<String, Object> properties = new HashMap<String, Object>();
+        for (Map.Entry<QName, String> entry: otherAttributes.entrySet()) {
+            String name = entry.getKey().getLocalPart();
+            properties.put(name, entry.getValue());
+        }
+        ObjectRecipe recipe = new ObjectRecipe(className, properties);
+        recipe.allow(Option.IGNORE_MISSING_PROPERTIES);
+        Server instance = (Server) recipe.create(cl);
+        instance.setPort(port);
+        instance.setShutdown(shutdown);
+        if (instance instanceof Lifecycle) {
+            Lifecycle lifecycle = (Lifecycle) instance;
+            for (ListenerType listenerType: getListener()) {
+                LifecycleListener listener = listenerType.getLifecycleListener(cl);
+                lifecycle.addLifecycleListener(listener);
+            }
+        }
+
+        NamingResources globalNamingResources = new NamingResources();
+        for (NamingResourcesType naming: getGlobalNamingResources()) {
+            naming.merge(globalNamingResources, cl);
+        }
+        instance.setGlobalNamingResources(globalNamingResources);
+
+        for (ServiceType serviceType: getService()) {
+            Service service = serviceType.getService(cl);
+            instance.addService(service);
+        }
+
+        return instance;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServerType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServerType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServerType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,37 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ServiceRefType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ServiceRefType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ServiceRefType")
+public class ServiceRefType {
+
+
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,293 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+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;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.namespace.QName;
+
+import org.apache.catalina.Service;
+import org.apache.catalina.Executor;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Engine;
+import org.apache.catalina.core.StandardService;
+import org.apache.catalina.connector.Connector;
+import org.apache.xbean.recipe.ObjectRecipe;
+import org.apache.xbean.recipe.Option;
+
+
+/**
+ * <p>Java class for ServiceType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="ServiceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Connector" type="{}ConnectorType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Engine" type="{}EngineType" minOccurs="0"/>
+ *         &lt;element name="Listener" type="{}ListenerType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Executor" type="{}ExecutorType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="className" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ServiceType", propOrder = {
+    "connector",
+    "engine",
+    "listener",
+    "executor"
+})
+public class ServiceType {
+
+    @XmlElement(name = "Connector")
+    protected List<ConnectorType> connector;
+    @XmlElement(name = "Engine")
+    protected EngineType engine;
+    @XmlElement(name = "Listener")
+    protected List<ListenerType> listener;
+    @XmlElement(name = "Executor")
+    protected List<ExecutorType> executor;
+    @XmlAttribute
+    protected String className = StandardService.class.getName();
+    @XmlAttribute
+    protected String name;
+    @XmlAnyAttribute
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    /**
+     * Gets the value of the connector 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 connector property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getConnector().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ConnectorType }
+     *
+     *
+     */
+    public List<ConnectorType> getConnector() {
+        if (connector == null) {
+            connector = new ArrayList<ConnectorType>();
+        }
+        return this.connector;
+    }
+
+    /**
+     * Gets the value of the engine property.
+     *
+     * @return
+     *     possible object is
+     *     {@link EngineType }
+     *
+     */
+    public EngineType getEngine() {
+        return engine;
+    }
+
+    /**
+     * Sets the value of the engine property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link EngineType }
+     *
+     */
+    public void setEngine(EngineType value) {
+        this.engine = value;
+    }
+
+    /**
+     * Gets the value of the listener 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 listener property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getListener().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ListenerType }
+     *
+     *
+     */
+    public List<ListenerType> getListener() {
+        if (listener == null) {
+            listener = new ArrayList<ListenerType>();
+        }
+        return this.listener;
+    }
+
+    /**
+     * Gets the value of the executor 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 executor property.
+     *
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getExecutor().add(newItem);
+     * </pre>
+     *
+     *
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ExecutorType }
+     *
+     *
+     */
+    public List<ExecutorType> getExecutor() {
+        if (executor == null) {
+            executor = new ArrayList<ExecutorType>();
+        }
+        return this.executor;
+    }
+
+    /**
+     * Gets the value of the className property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getClassName() {
+        return className;
+    }
+
+    /**
+     * Sets the value of the className property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setClassName(String value) {
+        this.className = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setName(String value) {
+        this.name = 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;
+    }
+
+    public Service getService(ClassLoader cl) throws Exception {
+        Map<String, Object> properties = new HashMap<String, Object>();
+        properties.put("name", getName());
+        for (Map.Entry<QName, String> entry: otherAttributes.entrySet()) {
+            String name = entry.getKey().getLocalPart();
+            properties.put(name, entry.getValue());
+        }
+        ObjectRecipe recipe = new ObjectRecipe(className, properties);
+        recipe.allow(Option.IGNORE_MISSING_PROPERTIES);
+        Service service = (Service) recipe.create(cl);
+        for (ConnectorType connectorType: getConnector()) {
+            Connector connector = connectorType.getConnector(cl);
+            service.addConnector(connector);
+        }
+        for (ExecutorType executorType: getExecutor()) {
+            Executor executor = executorType.getExecutor(cl);
+            service.addExecutor(executor);
+        }
+        if (service instanceof Lifecycle) {
+            Lifecycle lifecycle = (Lifecycle) service;
+            for (ListenerType listenerType: getListener()) {
+                LifecycleListener listener = listenerType.getLifecycleListener(cl);
+                lifecycle.addLifecycleListener(listener);
+            }
+        }
+
+        if (getEngine() != null) {
+            Engine engine = getEngine().getEngine(cl);
+            service.setContainer(engine);
+        }
+
+        return service;
+    }
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,37 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TransactionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TransactionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TransactionType")
+public class TransactionType {
+
+
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,108 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 
+// 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: 2009.06.02 at 10:12:18 AM PDT 
+//
+
+
+package org.apache.geronimo.tomcat.model;
+
+import java.util.Map;
+import java.util.HashMap;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.namespace.QName;
+
+import org.apache.catalina.Valve;
+import org.apache.xbean.recipe.ObjectRecipe;
+import org.apache.xbean.recipe.Option;
+
+
+/**
+ * <p>Java class for ValveType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * &lt;complexType name="ValveType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="className" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ValveType")
+public class ValveType {
+
+    @XmlAttribute
+    protected String className;
+    @XmlAnyAttribute
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+    /**
+     * Gets the value of the className property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public String getClassName() {
+        return className;
+    }
+
+    /**
+     * Sets the value of the className property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *
+     */
+    public void setClassName(String value) {
+        this.className = 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;
+    }
+
+    public Valve getValve(ClassLoader cl) throws Exception {
+        Map<String, Object> properties = new HashMap<String, Object>();
+
+        for (Map.Entry<QName, String> entry: otherAttributes.entrySet()) {
+            String name = entry.getKey().getLocalPart();
+            properties.put(name, entry.getValue());
+        }
+        ObjectRecipe recipe = new ObjectRecipe(className, properties);
+        recipe.allow(Option.IGNORE_MISSING_PROPERTIES);
+        Valve valve = (Valve) recipe.create(cl);
+        return valve;
+
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/server.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/server.xsd?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/server.xsd (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/server.xsd Sun Jun 14 07:40:05 2009
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="Server" type="ServerType">
+    <xs:annotation>
+      <xs:documentation>Note: A "Server" is not itself a "Container", so you may not
+        define subcomponents such as "Valves" at this level.
+        Documentation at /docs/config/server.html
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:complexType name="EngineType">
+    <xs:sequence>
+      <xs:element type="RealmType" name="Realm" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation>For clustering, please take a look at documentation at:
+            /docs/cluster-howto.html (simple how to)
+            /docs/config/cluster.html (reference documentation)
+            &lt;Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+            The request dumper valve dumps useful debugging information about
+            the request and response data received and sent by Tomcat.
+            Documentation at: /docs/config/valve.html
+            &lt;Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+            This Realm uses the UserDatabase configured in the global JNDI
+            resources under the key "UserDatabase". Any edits
+            that are performed against this UserDatabase are immediately
+            available for use by the Realm.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element type="HostType" name="Host" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Define the default virtual host
+            Note: XML Schema validation will not work with Xerces 2.2.
+            SingleSignOn valve, share authentication between web applications
+            Documentation at: /docs/config/valve.html
+            &lt;Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+            Access log processes all example.
+            Documentation at: /docs/config/valve.html
+            &lt;Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+            prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="Cluster" type="ClusterType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="Listener" type="ListenerType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute type="xs:string" name="className" use="optional"/>
+    <xs:attribute type="xs:string" name="name"/>
+    <xs:attribute type="xs:string" name="defaultHost"/>
+    <xs:attribute type="xs:string" name="jvmRoute"/>
+    <xs:attribute type="xs:int" name="backgroundProcessorDelay"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+
+  <xs:complexType name="NamingResourcesType">
+    <xs:sequence>
+      <xs:element type="EjbType" name="Ejb" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element type="EnvironmentType" name="Environment" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element type="LocalEjbType" name="LocalEjb" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element type="ResourceType" name="Resource" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Editable user database that can also be used by
+            UserDatabaseRealm to authenticate users
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element type="ResourceEnvRefType" name="ResourceEnvRef" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element type="ServiceRefType" name="ServiceRef" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element type="TransactionType" name="Transaction" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ResourceType">
+    <xs:attribute type="xs:string" name="name"/>
+    <xs:attribute type="xs:string" name="type"/>
+    <xs:attribute type="xs:string" name="description"/>
+    <xs:attribute type="xs:string" name="auth"/>
+    <xs:attribute type="xs:string" name="scope"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+
+  <xs:complexType name="ListenerType">
+    <xs:attribute type="xs:string" name="className"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+
+  <xs:complexType name="HostType">
+    <xs:sequence>
+      <xs:element name="Alias" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="Cluster" type="ClusterType" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="Listener" type="ListenerType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="Realm" type="RealmType" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="Valve" type="ValveType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="Context" type="ContextType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute type="xs:string" name="className" use="optional"/>
+    <xs:attribute type="xs:string" name="name"/>
+    <xs:attribute type="xs:string" name="appBase"/>
+    <xs:attribute type="xs:string" name="hostConfigClass"/>
+    <xs:attribute type="xs:boolean" name="unpackWARs"/>
+    <xs:attribute type="xs:boolean" name="autoDeploy"/>
+    <xs:attribute type="xs:boolean" name="deployOnStartup"/>
+    <xs:attribute type="xs:boolean" name="xmlValidation"/>
+    <xs:attribute type="xs:boolean" name="xmlNamespaceAware"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+
+  <xs:complexType name="ConnectorType">
+    <xs:sequence>
+      <xs:element name="Listener" type="ListenerType" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute type="xs:string" name="className"/>
+    <xs:attribute type="xs:boolean" name="allowTrace"/>
+    <xs:attribute type="xs:boolean" name="emptySessionPath"/>
+    <xs:attribute type="xs:boolean" name="enableLookups"/>
+    <xs:attribute type="xs:int" name="maxPostSize"/>
+    <xs:attribute type="xs:int" name="maxSavePostSize"/>
+    <xs:attribute type="xs:int" name="port"/>
+    <xs:attribute type="xs:string" name="protocol"/>
+    <xs:attribute type="xs:string" name="protocolHandlerClassName"/>
+    <xs:attribute type="xs:string" name="proxyName"/>
+    <xs:attribute type="xs:int" name="proxyPort"/>
+    <xs:attribute type="xs:int" name="redirectPort"/>
+    <xs:attribute type="xs:string" name="scheme"/>
+    <xs:attribute type="xs:boolean" name="secure"/>
+    <xs:attribute type="xs:string" name="encoding"/>
+    <xs:attribute type="xs:string" name="useBodyEncodingForURI"/>
+    <xs:attribute type="xs:string" name="xpoweredBy"/>
+    <xs:attribute type="xs:boolean" name="useIPVHosts"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+
+  <xs:complexType name="ServiceType">
+    <xs:sequence>
+      <xs:element type="ConnectorType" name="Connector" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>The connectors can use a shared executor, you can define one or more named thread pools
+            &lt;Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+            maxThreads="150" minSpareThreads="4"/>
+            A "Connector" represents an endpoint by which requests are received
+            and responses are returned. Documentation at :
+            Java HTTP Connector: /docs/config/http.html (blocking &amp; non-blocking)
+            Java AJP Connector: /docs/config/ajp.html
+            APR (HTTP/AJP) Connector: /docs/apr.html
+            Define a non-SSL HTTP/1.1 Connector on port 8080
+            A "Connector" using the shared thread pool
+            &lt;Connector executor="tomcatThreadPool"
+            port="8080" protocol="HTTP/1.1"
+            connectionTimeout="20000"
+            redirectPort="8443" />
+            Define a SSL HTTP/1.1 Connector on port 8443
+            This connector uses the JSSE configuration, when using APR, the
+            connector should be using the OpenSSL style configuration
+            described in the APR documentation
+            &lt;Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+            maxThreads="150" scheme="https" secure="true"
+            clientAuth="false" sslProtocol="TLS" />
+            Define an AJP 1.3 Connector on port 8009
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element type="EngineType" name="Engine" minOccurs="0" maxOccurs="1">
+        <xs:annotation>
+          <xs:documentation>An Engine represents the entry point (within Catalina) that processes
+            every request. The Engine implementation for Tomcat stand alone
+            analyzes the HTTP headers included with the request, and passes them
+            on to the appropriate Host (virtual host).
+            Documentation at /docs/config/engine.html You should set jvmRoute to support load-balancing via AJP ie :
+            &lt;Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element type="ListenerType" name="Listener" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element type="ExecutorType" name="Executor" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute type="xs:string" name="className" use="optional"/>
+    <xs:attribute type="xs:string" name="name"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+  <xs:complexType name="ServerType">
+    <xs:sequence>
+      <xs:element type="ListenerType" name="Listener" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>APR library loader. Documentation at /docs/apr.html Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html JMX Support for the Tomcat server. Documentation at
+            /docs/non-existent.html
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element type="NamingResourcesType" name="GlobalNamingResources" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Global JNDI resources
+            Documentation at /docs/jndi-resources-howto.html
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element type="ServiceType" name="Service" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>A "Service" is a collection of one or more "Connectors" that share
+            a single "Container" Note: A "Service" is not itself a "Container",
+            so you may not define subcomponents such as "Valves" at this level.
+            Documentation at /docs/config/service.html
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute type="xs:string" name="className" use="optional"/>
+    <xs:attribute type="xs:int" name="port"/>
+    <xs:attribute type="xs:string" name="shutdown"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+
+  <xs:complexType name="RealmType">
+    <xs:attribute type="xs:string" name="className"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+
+  <xs:complexType name="ExecutorType">
+    <xs:attribute type="xs:string" name="className" use="optional"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+
+  <xs:complexType name="ClusterType">
+    <!-- may need another namespace?? -->
+  </xs:complexType>
+
+  <xs:complexType name="EjbType"></xs:complexType>
+  <xs:complexType name="EnvironmentType"></xs:complexType>
+  <xs:complexType name="LocalEjbType"></xs:complexType>
+  <xs:complexType name="ResourceEnvRefType"></xs:complexType>
+  <xs:complexType name="ServiceRefType"></xs:complexType>
+  <xs:complexType name="TransactionType"></xs:complexType>
+  
+  <xs:complexType name="ValveType">
+    <xs:attribute type="xs:string" name="className"/>
+    <xs:anyAttribute namespace="##local"/>
+  </xs:complexType>
+
+  <xs:complexType name="ContextType">
+    <xs:complexContent>
+      <xs:extension base="NamingResourcesType"/>
+      <!-- see ContextRuleSet.  Very incomplete -->
+    </xs:complexContent>
+  </xs:complexType>
+</xs:schema>
\ No newline at end of file

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/server.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/server.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/server.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=784518&r1=784517&r2=784518&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Sun Jun 14 07:40:05 2009
@@ -185,7 +185,7 @@
         engine.doStart();
 
         ServerInfo serverInfo = new BasicServerInfo(".");
-        container = new TomcatContainer(cl, new File(BASEDIR, "target/var/catalina").toString(), null, engine, null, serverInfo, null, null);
+        container = new TomcatContainer(cl, new File(BASEDIR, "target/var/catalina").toString(), null, null, null, engine, null, serverInfo, null, null);
         container.doStart();
 
         connector = new Http11ConnectorGBean("HTTP", null, "localhost", port++, container, serverInfo);

Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java Sun Jun 14 07:40:05 2009
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.tomcat;
+
+import java.io.File;
+import java.io.FileReader;
+
+import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+import org.apache.geronimo.tomcat.model.ServerType;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.system.serverinfo.BasicServerInfo;
+import org.apache.catalina.Server;
+import org.apache.catalina.Lifecycle;
+
+/**
+ * @version $Rev$ $Date$
+ */
+
+public class TomcatServerGBeanTest extends TestSupport {
+    private static final String SERVER_1 = "src/test/resources/deployables/server-1.xml";
+
+    public void testLoadServer1() throws Exception {
+        File server1 = resolveFile(SERVER_1);
+        FileReader in = new FileReader(server1);
+        try {
+            ServerType serverType = TomcatServerGBean.loadServerType(in);
+            assertEquals(4, serverType.getListener().size());
+            Server server = serverType.build(getClass().getClassLoader());
+            try {
+                ((Lifecycle)server).start();
+            } finally {
+                ((Lifecycle)server).stop();
+            }
+        } finally {
+            in.close();
+        }
+    }
+    public void testGBeanServer1() throws Exception {
+        ServerInfo serverInfo = new BasicServerInfo(BASEDIR.getAbsolutePath());
+        TomcatServerGBean tomcatServerGBean = new TomcatServerGBean(null, SERVER_1, serverInfo, getClass().getClassLoader());
+        try {
+            tomcatServerGBean.doStart();
+        } finally {
+            tomcatServerGBean.doStop();
+        }
+    }
+}

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message