geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1100440 [3/4] - in /geronimo/server/branches/3.0-osgi: framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ plugi...
Date Sat, 07 May 2011 03:47:50 GMT
Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceBindingType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceBindingType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceBindingType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceBindingType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,160 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.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.XmlType;
+
+
+/**
+ * <p>Java class for web-service-bindingType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="web-service-bindingType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ejb-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="web-service-address" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="web-service-virtual-host" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="web-service-security" type="{http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0}web-service-securityType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "web-service-bindingType", propOrder = {
+    "ejbName",
+    "webServiceAddress",
+    "webServiceVirtualHost",
+    "webServiceSecurity"
+})
+public class WebServiceBindingType {
+
+    @XmlElement(name = "ejb-name", required = true)
+    protected String ejbName;
+    @XmlElement(name = "web-service-address")
+    protected String webServiceAddress;
+    @XmlElement(name = "web-service-virtual-host")
+    protected List<String> webServiceVirtualHost;
+    @XmlElement(name = "web-service-security")
+    protected WebServiceSecurityType webServiceSecurity;
+
+    /**
+     * Gets the value of the ejbName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getEjbName() {
+        return ejbName;
+    }
+
+    /**
+     * Sets the value of the ejbName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEjbName(String value) {
+        this.ejbName = value;
+    }
+
+    /**
+     * Gets the value of the webServiceAddress property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getWebServiceAddress() {
+        return webServiceAddress;
+    }
+
+    /**
+     * Sets the value of the webServiceAddress property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setWebServiceAddress(String value) {
+        this.webServiceAddress = value;
+    }
+
+    /**
+     * Gets the value of the webServiceVirtualHost 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 webServiceVirtualHost property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getWebServiceVirtualHost().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getWebServiceVirtualHost() {
+        if (webServiceVirtualHost == null) {
+            webServiceVirtualHost = new ArrayList<String>();
+        }
+        return this.webServiceVirtualHost;
+    }
+
+    /**
+     * Gets the value of the webServiceSecurity property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link WebServiceSecurityType }
+     *     
+     */
+    public WebServiceSecurityType getWebServiceSecurity() {
+        return webServiceSecurity;
+    }
+
+    /**
+     * Sets the value of the webServiceSecurity property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link WebServiceSecurityType }
+     *     
+     */
+    public void setWebServiceSecurity(WebServiceSecurityType value) {
+        this.webServiceSecurity = value;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceBindingType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceBindingType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceBindingType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceSecurityType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceSecurityType.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceSecurityType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceSecurityType.java Sat May  7 03:47:48 2011
@@ -0,0 +1,188 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+
+package org.apache.geronimo.openejb.deployment.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.XmlType;
+
+
+/**
+ * <p>Java class for web-service-securityType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="web-service-securityType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="security-realm-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="realm-name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="transport-guarantee" type="{http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0}transport-guaranteeType"/>
+ *         &lt;element name="auth-method" type="{http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0}auth-methodType"/>
+ *         &lt;element name="http-method" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "web-service-securityType", propOrder = {
+    "securityRealmName",
+    "realmName",
+    "transportGuarantee",
+    "authMethod",
+    "httpMethod"
+})
+public class WebServiceSecurityType {
+
+    @XmlElement(name = "security-realm-name", required = true)
+    protected String securityRealmName;
+    @XmlElement(name = "realm-name")
+    protected String realmName;
+    @XmlElement(name = "transport-guarantee", required = true)
+    protected TransportGuaranteeType transportGuarantee;
+    @XmlElement(name = "auth-method", required = true)
+    protected AuthMethodType authMethod;
+    @XmlElement(name = "http-method")
+    protected List<String> httpMethod;
+
+    /**
+     * Gets the value of the securityRealmName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSecurityRealmName() {
+        return securityRealmName;
+    }
+
+    /**
+     * Sets the value of the securityRealmName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSecurityRealmName(String value) {
+        this.securityRealmName = value;
+    }
+
+    /**
+     * Gets the value of the realmName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRealmName() {
+        return realmName;
+    }
+
+    /**
+     * Sets the value of the realmName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRealmName(String value) {
+        this.realmName = value;
+    }
+
+    /**
+     * Gets the value of the transportGuarantee property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TransportGuaranteeType }
+     *     
+     */
+    public TransportGuaranteeType getTransportGuarantee() {
+        return transportGuarantee;
+    }
+
+    /**
+     * Sets the value of the transportGuarantee property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TransportGuaranteeType }
+     *     
+     */
+    public void setTransportGuarantee(TransportGuaranteeType value) {
+        this.transportGuarantee = value;
+    }
+
+    /**
+     * Gets the value of the authMethod property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AuthMethodType }
+     *     
+     */
+    public AuthMethodType getAuthMethod() {
+        return authMethod;
+    }
+
+    /**
+     * Sets the value of the authMethod property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AuthMethodType }
+     *     
+     */
+    public void setAuthMethod(AuthMethodType value) {
+        this.authMethod = value;
+    }
+
+    /**
+     * Gets the value of the httpMethod 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 httpMethod property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getHttpMethod().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    public List<String> getHttpMethod() {
+        if (httpMethod == null) {
+            httpMethod = new ArrayList<String>();
+        }
+        return this.httpMethod;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceSecurityType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceSecurityType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/WebServiceSecurityType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/package-info.java?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/package-info.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/package-info.java Sat May  7 03:47:48 2011
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// 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.05.05 at 02:26:05 PM PDT 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.geronimo.openejb.deployment.model;

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/package-info.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/model/package-info.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/META-INF/sun-jaxb.episode
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/META-INF/sun-jaxb.episode?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/META-INF/sun-jaxb.episode (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/META-INF/sun-jaxb.episode Sat May  7 03:47:48 2011
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<bindings version="2.1" xmlns="http://java.sun.com/xml/ns/jaxb">
+  <!--
+
+This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+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.05.05 at 02:26:05 PM PDT 
+
+  -->
+  <bindings scd="x-schema::tns" xmlns:tns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+    <schemaBindings map="false"/>
+    <bindings scd="~tns:moduleType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.ModuleType"/>
+    </bindings>
+    <bindings scd="~tns:abstract-clusteringType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.AbstractClusteringType"/>
+    </bindings>
+    <bindings scd="~tns:applicationType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.ApplicationType"/>
+    </bindings>
+    <bindings scd="~tns:ext-moduleType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.ExtModuleType"/>
+    </bindings>
+    <bindings scd="~tns:abstract-securityType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.AbstractSecurityType"/>
+    </bindings>
+  </bindings>
+  <bindings scd="x-schema::tns" xmlns:tns="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+    <schemaBindings map="false"/>
+    <bindings scd="~tns:geronimo-ejb-jarType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.GeronimoEjbJarType"/>
+    </bindings>
+    <bindings scd="~tns:tss-linkType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.TssLinkType"/>
+    </bindings>
+    <bindings scd="~tns:emptyType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.EmptyType"/>
+    </bindings>
+    <bindings scd="~tns:web-service-bindingType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.WebServiceBindingType"/>
+    </bindings>
+    <bindings scd="~tns:web-service-securityType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.WebServiceSecurityType"/>
+    </bindings>
+    <bindings scd="~tns:openejb-jarType">
+      <class ref="org.apache.geronimo.openejb.deployment.model.OpenejbJarType"/>
+    </bindings>
+  </bindings>
+</bindings>
+

Added: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/catalog.cat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/catalog.cat?rev=1100440&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/catalog.cat (added)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/catalog.cat Sat May  7 03:47:48 2011
@@ -0,0 +1,19 @@
+PUBLIC "http://geronimo.apache.org/xml/ns/deployment-1.2" "classpath:geronimo-module-1.2.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/naming-1.2" "classpath:geronimo-naming-1.2.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/j2ee/application-2.0" "classpath:geronimo-application-2.0.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/geronimo-jaspi" "classpath:geronimo-jaspi.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/credentialstore-1.0" "classpath:geronimo-credential-store-1.0.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/loginconfig-2.0" "classpath:geronimo-login-config-2.0.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/security-2.0" "classpath:geronimo-security-2.0.xsd"
+
+PUBLIC "http://geronimo.apache.org/xml/ns/subject-info-1.0" "classpath:geronimo-subject-info.1.0.xsd"
+
+PUBLIC "http://java.sun.com/xml/ns/persistence" "classpath:persistence_2_0.xsd"
+
+

Copied: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/geronimo-openejb-2.0.xsd (from r1100290, geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/geronimo-openejb-2.0.xsd?p2=geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/geronimo-openejb-2.0.xsd&p1=geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd&r1=1100290&r2=1100440&rev=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/xsd/geronimo-openejb-2.0.xsd (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/geronimo-openejb-2.0.xsd Sat May  7 03:47:48 2011
@@ -24,14 +24,23 @@
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
+    xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+    xmlns:persistence="http://java.sun.com/xml/ns/persistence"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2" schemaLocation="geronimo-naming-1.2.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" schemaLocation="geronimo-application-2.0.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"/>
+    <xs:import namespace="http://java.sun.com/xml/ns/persistence"/>
+    <!-- these might not all be used -->
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/geronimo-jaspi"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/credentialstore-1.0"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/loginconfig-2.0"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/security-2.0"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/subject-info-1.0"/>
 
     <xs:element name="ejb-jar" type="openejb:geronimo-ejb-jarType"/>
 
@@ -61,13 +70,16 @@
             <xs:element name="web-service-binding" type="openejb:web-service-bindingType" minOccurs="0" maxOccurs="unbounded"/>
 
             <!-- Security -->
-            <xs:element ref="app:security" minOccurs="0"/>
+            <xs:choice minOccurs="0">
+                <xs:element ref="sec:security"/>
+                <xs:element ref="sec:security-ref"/>
+            </xs:choice>
 
             <!-- GBeans -->
-            <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element ref="sys:service"/>
-                <xs:any processContents="lax" namespace="http://java.sun.com/xml/ns/persistence"/>
-            </xs:choice>
+            <!--<xs:choice minOccurs="0" maxOccurs="unbounded">-->
+                <!--<xs:element ref="sys:service"/>-->
+                <xs:element ref="persistence:persistence" minOccurs="0" maxOccurs="unbounded"/>
+            <!--</xs:choice>-->
         </xs:sequence>
     </xs:complexType>
 

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/geronimo-openejb-2.0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/geronimo-openejb-2.0.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/openejb/geronimo-openejb-builder/src/main/resources/geronimo-openejb-2.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/branches/3.0-osgi/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/openejb-deployer/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/openejb-deployer/pom.xml Sat May  7 03:47:48 2011
@@ -37,19 +37,47 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
+            <groupId>org.apache.geronimo.feature</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework.feature</groupId>-->
+            <!--<artifactId>server-security-config</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>kar</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer-1_6</artifactId>
+            <artifactId>j2ee-server</artifactId>
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>j2ee-deployer</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>connector-deployer-1_6</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
@@ -94,15 +122,21 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>EJB Container</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>openejb</artifactId>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
-                    </dependencies>
+                    <features>
+                        <feature>declarative-services</feature>
+                        <feature>org.apache.geronimo.jaxb-support</feature>
+                        <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>j2ee-system</feature>
+                        <!--<feature>server-security-config</feature>-->
+                    </features>
+                    <!--<dependencies>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                            <!--<artifactId>openejb</artifactId>-->
+                            <!--<type>car</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                    <!--</dependencies>-->
                     <instance>
                         <plugin-artifact>
                             <config-xml-content>
@@ -128,7 +162,7 @@
                                 </gbean>
                             </config-xml-content>
                             <config-substitution key="OpenEJBPort">4201</config-substitution>
-                            <copy-file dest-dir="schema">schema/schemaorg_apache_xmlbeans/src/</copy-file>
+                            <!--<copy-file dest-dir="schema">schema/schemaorg_apache_xmlbeans/src/</copy-file>-->
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/3.0-osgi/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/openejb/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/openejb/pom.xml Sat May  7 03:47:48 2011
@@ -36,64 +36,85 @@
     <description>Geronimo integration of the OpenEJB  ejb container.</description>
 
     <dependencies>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.1_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
+            <groupId>org.apache.geronimo.feature</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>server-security-config</artifactId>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>j2ee-system</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework.feature</groupId>-->
+            <!--<artifactId>server-security-config</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>kar</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-1_6</artifactId>
+            <artifactId>j2ee-server</artifactId>
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openwebbeans</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-       </dependency> 
-
-       <dependency>
-            <groupId>org.apache.geronimo.javamail</groupId>
-            <artifactId>geronimo-javamail_1.4_mail</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-annotation_1.1_spec</artifactId>-->
+        <!--</dependency>-->
+
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>j2ee-server</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>server-security-config</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>transaction-1_6</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>system-database</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>openwebbeans</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+       <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jaxws_2.2_spec</artifactId>-->
+       <!--</dependency> -->
+
+       <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.javamail</groupId>-->
+            <!--<artifactId>geronimo-javamail_1.4_mail</artifactId>-->
+        <!--</dependency>-->
 
 
         <dependency>
@@ -157,6 +178,13 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>declarative-services</feature>
+                        <feature>org.apache.geronimo.jaxb-support</feature>
+                        <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>j2ee-system</feature>
+                        <!--<feature>server-security-config</feature>-->
+                    </features>
                     <category>EJB Container</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/branches/3.0-osgi/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openejb/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openejb/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openejb/pom.xml Sat May  7 03:47:48 2011
@@ -35,15 +35,15 @@
     <modules>
         <module>geronimo-openejb</module>
         <module>geronimo-openejb-builder</module>
-        <module>geronimo-openejb-clustering-wadi</module>
-        <module>geronimo-openejb-clustering-builder-wadi</module>
+        <!--<module>geronimo-openejb-clustering-wadi</module>-->
+        <!--<module>geronimo-openejb-clustering-builder-wadi</module>-->
         <module>openejb</module>
         <module>openejb-deployer</module>
-        <module>openejb-portlets</module>
-        <module>openejb-console-jetty</module>
-        <module>openejb-console-tomcat</module>
-        <module>openejb-clustering-wadi</module>
-        <module>openejb-clustering-builder-wadi</module>
+        <!--<module>openejb-portlets</module>-->
+        <!--<module>openejb-console-jetty</module>-->
+        <!--<module>openejb-console-tomcat</module>-->
+        <!--<module>openejb-clustering-wadi</module>-->
+        <!--<module>openejb-clustering-builder-wadi</module>-->
     </modules>
 
     <profiles>

Modified: geronimo/server/branches/3.0-osgi/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java Sat May  7 03:47:48 2011
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.xml.namespace.QName;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -33,25 +32,21 @@ import org.apache.geronimo.gbean.GBeanDa
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.annotation.PersistenceContextAnnotationHelper;
 import org.apache.geronimo.j2ee.deployment.annotation.PersistenceUnitAnnotationHelper;
+import org.apache.geronimo.j2ee.deployment.model.naming.PatternType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PersistenceContextRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PersistenceContextTypeType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PersistenceUnitRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PropertyType;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.config.Configuration;
-import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
 import org.apache.geronimo.naming.reference.PersistenceContextReference;
 import org.apache.geronimo.naming.reference.PersistenceUnitReference;
-import org.apache.geronimo.schema.NamespaceElementConverter;
-import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPersistenceContextRefDocument;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPersistenceContextRefType;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPersistenceContextTypeType;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPersistenceUnitRefDocument;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPersistenceUnitRefType;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPropertyType;
 import org.apache.openejb.jee.InjectionTarget;
 import org.apache.openejb.jee.JndiConsumer;
 import org.apache.openejb.jee.PersistenceContextRef;
@@ -59,41 +54,24 @@ import org.apache.openejb.jee.Persistenc
 import org.apache.openejb.jee.PersistenceRef;
 import org.apache.openejb.jee.PersistenceUnitRef;
 import org.apache.openejb.jee.Property;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
  */
 @GBean(j2eeType = NameFactory.MODULE_BUILDER)
 public class PersistenceRefBuilder extends AbstractNamingBuilder {
-    private static final QName PERSISTENCE_UNIT_REF_QNAME = new QName(JEE_NAMESPACE, "persistence-unit-ref");
-    private static final QNameSet PERSISTENCE_UNIT_REF_QNAME_SET = QNameSet.singleton(PERSISTENCE_UNIT_REF_QNAME);
-    private static final QName GER_PERSISTENCE_UNIT_REF_QNAME = GerPersistenceUnitRefDocument.type.getDocumentElementName();
-    private static final QNameSet GER_PERSISTENCE_UNIT_REF_QNAME_SET = QNameSet.singleton(GER_PERSISTENCE_UNIT_REF_QNAME);
     private static final Set PERSISTENCE_UNIT_INTERFACE_TYPES = Collections.singleton("org.apache.geronimo.persistence.PersistenceUnitGBean");
-    private static final QName GER_PERSISTENCE_CONTEXT_REF_QNAME = GerPersistenceContextRefDocument.type.getDocumentElementName();
-    private static final QNameSet GER_PERSISTENCE_CONTEXT_REF_QNAME_SET = QNameSet.singleton(GER_PERSISTENCE_CONTEXT_REF_QNAME);
     private final AbstractNameQuery defaultPersistenceUnitAbstractNameQuery;
     private final boolean strictMatching;
 
 
-    public PersistenceRefBuilder(@ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
-                                 @ParamAttribute(name = "defaultPersistenceUnitAbstractNameQuery") AbstractNameQuery defaultPersistenceUnitAbstractNameQuery,
+    public PersistenceRefBuilder(@ParamAttribute(name = "defaultPersistenceUnitAbstractNameQuery") AbstractNameQuery defaultPersistenceUnitAbstractNameQuery,
                                  @ParamAttribute(name = "strictMatching") boolean strictMatching) {
-        super(defaultEnvironment);
         this.defaultPersistenceUnitAbstractNameQuery = defaultPersistenceUnitAbstractNameQuery;
         this.strictMatching = strictMatching;
     }
 
-    protected boolean willMergeEnvironment(JndiConsumer specDD, XmlObject plan) throws DeploymentException {
-        if (specDD != null && !specDD.getPersistenceUnitRef().isEmpty()) {
-            return true;
-        }
-        return plan != null && plan.selectChildren(PersistenceRefBuilder.GER_PERSISTENCE_UNIT_REF_QNAME_SET).length > 0;
-    }
-
-    public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
+    public void buildNaming(JndiConsumer specDD, JndiPlan plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
         Configuration localConfiguration = module.getEarContext().getConfiguration();
         List<DeploymentException> problems = new ArrayList<DeploymentException>();
 
@@ -104,15 +82,15 @@ public class PersistenceRefBuilder exten
 
         //persistenceUnit refs
         Collection<PersistenceUnitRef> specPersistenceUnitRefsUntyped = specDD.getPersistenceUnitRef();
-        Map<String, GerPersistenceUnitRefType> gerPersistenceUnitRefsUntyped = getGerPersistenceUnitRefs(plan);
+        Map<String, PersistenceUnitRefType> PersistenceUnitRefsUntyped = getPersistenceUnitRefs(plan);
         for (Map.Entry<String, PersistenceUnitRef> entry : specDD.getPersistenceUnitRefMap().entrySet()) {
             try {
                 String persistenceUnitRefName = entry.getKey();
                 PersistenceUnitRef persistenceUnitRef = entry.getValue();
                 AbstractNameQuery persistenceUnitNameQuery;
-                GerPersistenceUnitRefType gerPersistenceUnitRef = gerPersistenceUnitRefsUntyped.remove(persistenceUnitRefName);
-                if (gerPersistenceUnitRef != null) {
-                    persistenceUnitNameQuery = findPersistenceUnit(gerPersistenceUnitRef, localConfiguration);
+                PersistenceUnitRefType PersistenceUnitRef = PersistenceUnitRefsUntyped.remove(persistenceUnitRefName);
+                if (PersistenceUnitRef != null) {
+                    persistenceUnitNameQuery = findPersistenceUnit(PersistenceUnitRef, localConfiguration);
                 } else {
                     persistenceUnitNameQuery = findPersistenceUnitQuery(module, localConfiguration, persistenceUnitRef);
                 }
@@ -126,10 +104,10 @@ public class PersistenceRefBuilder exten
 
         }
         //geronimo-only persistence unit refs have no injections
-        for (GerPersistenceUnitRefType gerPersistenceUnitRef : gerPersistenceUnitRefsUntyped.values()) {
+        for (PersistenceUnitRefType PersistenceUnitRef : PersistenceUnitRefsUntyped.values()) {
             try {
-                String persistenceUnitRefName = gerPersistenceUnitRef.getPersistenceUnitRefName();
-                AbstractNameQuery persistenceUnitNameQuery = findPersistenceUnit(gerPersistenceUnitRef, localConfiguration);
+                String persistenceUnitRefName = PersistenceUnitRef.getPersistenceUnitRefName();
+                AbstractNameQuery persistenceUnitNameQuery = findPersistenceUnit(PersistenceUnitRef, localConfiguration);
                 PersistenceUnitReference reference = new PersistenceUnitReference(module.getConfigId(), persistenceUnitNameQuery);
                 put(persistenceUnitRefName, reference, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
             } catch (DeploymentException e) {
@@ -140,7 +118,7 @@ public class PersistenceRefBuilder exten
 
         //persistence context refs
         Collection<PersistenceContextRef> specPersistenceContextRefsUntyped = specDD.getPersistenceContextRef();
-        Map<String, GerPersistenceContextRefType> gerPersistenceContextRefsUntyped = getGerPersistenceContextRefs(plan);
+        Map<String, PersistenceContextRefType> PersistenceContextRefsUntyped = getPersistenceContextRefs(plan);
         for (Map.Entry<String, PersistenceContextRef> entry : specDD.getPersistenceContextRefMap().entrySet()) {
             try {
                 String persistenceContextRefName = entry.getKey();
@@ -157,10 +135,10 @@ public class PersistenceRefBuilder exten
                 }
 
                 AbstractNameQuery persistenceUnitNameQuery;
-                GerPersistenceContextRefType gerPersistenceContextRef = gerPersistenceContextRefsUntyped.remove(persistenceContextRefName);
-                if (gerPersistenceContextRef != null) {
-                    persistenceUnitNameQuery = findPersistenceUnit(gerPersistenceContextRef, localConfiguration);
-                    addProperties(gerPersistenceContextRef, properties);
+                PersistenceContextRefType PersistenceContextRef = PersistenceContextRefsUntyped.remove(persistenceContextRefName);
+                if (PersistenceContextRef != null) {
+                    persistenceUnitNameQuery = findPersistenceUnit(PersistenceContextRef, localConfiguration);
+                    addProperties(PersistenceContextRef, properties);
                 } else {
                     persistenceUnitNameQuery = findPersistenceUnitQuery(module, localConfiguration, persistenceContextRef);
                 }
@@ -172,14 +150,14 @@ public class PersistenceRefBuilder exten
         }
 
         // Support persistence context refs that are mentioned only in the geronimo plan
-        for (GerPersistenceContextRefType gerPersistenceContextRef : gerPersistenceContextRefsUntyped.values()) {
+        for (PersistenceContextRefType PersistenceContextRef : PersistenceContextRefsUntyped.values()) {
             try {
-                String persistenceContextRefName = gerPersistenceContextRef.getPersistenceContextRefName();
-                GerPersistenceContextTypeType.Enum persistenceContextType = gerPersistenceContextRef.getPersistenceContextType();
-                boolean transactionScoped = persistenceContextType == null || !persistenceContextType.equals(GerPersistenceContextTypeType.EXTENDED);
+                String persistenceContextRefName = PersistenceContextRef.getPersistenceContextRefName();
+                PersistenceContextTypeType persistenceContextType = PersistenceContextRef.getPersistenceContextType();
+                boolean transactionScoped = persistenceContextType == null || !persistenceContextType.equals(PersistenceContextTypeType.EXTENDED);
                 Map<String, String> properties = new HashMap<String, String>();
-                addProperties(gerPersistenceContextRef, properties);
-                AbstractNameQuery persistenceUnitNameQuery = findPersistenceUnit(gerPersistenceContextRef, localConfiguration);
+                addProperties(PersistenceContextRef, properties);
+                AbstractNameQuery persistenceUnitNameQuery = findPersistenceUnit(PersistenceContextRef, localConfiguration);
                 PersistenceContextReference reference = new PersistenceContextReference(module.getConfigId(), persistenceUnitNameQuery, transactionScoped, properties);
                 put(persistenceContextRefName, reference, module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
             } catch (DeploymentException e) {
@@ -291,13 +269,13 @@ public class PersistenceRefBuilder exten
         PersistenceContextAnnotationHelper.processAnnotations(specDD, module.getClassFinder());
     }
 
-    private AbstractNameQuery findPersistenceUnit(GerPersistenceUnitRefType gerPersistenceRef, Configuration localConfiguration) throws DeploymentException {
+    private AbstractNameQuery findPersistenceUnit(PersistenceUnitRefType PersistenceRef, Configuration localConfiguration) throws DeploymentException {
         AbstractNameQuery persistenceUnitNameQuery;
-        if (gerPersistenceRef.isSetPersistenceUnitName()) {
-            String persistenceUnitName = gerPersistenceRef.getPersistenceUnitName();
+        if (PersistenceRef.getPersistenceUnitName() != null) {
+            String persistenceUnitName = PersistenceRef.getPersistenceUnitName();
             persistenceUnitNameQuery = new AbstractNameQuery(null, Collections.singletonMap("name", persistenceUnitName), PERSISTENCE_UNIT_INTERFACE_TYPES);
         } else {
-            GerPatternType gbeanLocator = gerPersistenceRef.getPattern();
+            PatternType gbeanLocator = PersistenceRef.getPattern();
 
             persistenceUnitNameQuery = buildAbstractNameQuery(gbeanLocator, null, null, PERSISTENCE_UNIT_INTERFACE_TYPES);
         }
@@ -305,13 +283,13 @@ public class PersistenceRefBuilder exten
         return persistenceUnitNameQuery;
     }
 
-    private AbstractNameQuery findPersistenceUnit(GerPersistenceContextRefType persistenceContextRef, Configuration localConfiguration) throws DeploymentException {
+    private AbstractNameQuery findPersistenceUnit(PersistenceContextRefType persistenceContextRef, Configuration localConfiguration) throws DeploymentException {
         AbstractNameQuery persistenceUnitNameQuery;
-        if (persistenceContextRef.isSetPersistenceUnitName()) {
+        if (persistenceContextRef.getPersistenceUnitName() != null) {
             String persistenceUnitName = persistenceContextRef.getPersistenceUnitName();
             persistenceUnitNameQuery = new AbstractNameQuery(null, Collections.singletonMap("name", persistenceUnitName), PERSISTENCE_UNIT_INTERFACE_TYPES);
         } else {
-            GerPatternType gbeanLocator = persistenceContextRef.getPattern();
+            PatternType gbeanLocator = persistenceContextRef.getPattern();
 
             persistenceUnitNameQuery = buildAbstractNameQuery(gbeanLocator, null, null, PERSISTENCE_UNIT_INTERFACE_TYPES);
         }
@@ -319,41 +297,30 @@ public class PersistenceRefBuilder exten
         return persistenceUnitNameQuery;
     }
 
-    public QNameSet getSpecQNameSet() {
-        SchemaConversionUtils.registerNamespaceConversions(Collections.singletonMap(PersistenceRefBuilder.GER_PERSISTENCE_UNIT_REF_QNAME.getLocalPart(), new NamespaceElementConverter(PersistenceRefBuilder.GER_PERSISTENCE_UNIT_REF_QNAME.getNamespaceURI())));
-        return PERSISTENCE_UNIT_REF_QNAME_SET;
-    }
-
-    public QNameSet getPlanQNameSet() {
-        return GER_PERSISTENCE_UNIT_REF_QNAME_SET;
-    }
-
-    private Map<String, GerPersistenceUnitRefType> getGerPersistenceUnitRefs(XmlObject plan) throws DeploymentException {
-        Map<String, GerPersistenceUnitRefType> map = new HashMap<String, GerPersistenceUnitRefType>();
+    private Map<String, PersistenceUnitRefType> getPersistenceUnitRefs(JndiPlan plan) throws DeploymentException {
+        Map<String, PersistenceUnitRefType> map = new HashMap<String, PersistenceUnitRefType>();
         if (plan != null) {
-            List<GerPersistenceUnitRefType> refs = convert(plan.selectChildren(PersistenceRefBuilder.GER_PERSISTENCE_UNIT_REF_QNAME_SET), NAMING_CONVERTER, GerPersistenceUnitRefType.class, GerPersistenceUnitRefType.type);
-            for (GerPersistenceUnitRefType ref : refs) {
-                map.put(getJndiName(ref.getPersistenceUnitRefName().trim()), ref);
+            for (PersistenceUnitRefType ref : plan.getPersistenceUnitRef()) {
+                map.put(getJndiName(ref.getPersistenceUnitRefName()), ref);
             }
         }
         return map;
     }
 
-    private void addProperties(GerPersistenceContextRefType persistenceContextRef, Map<String, String> properties) {
-        GerPropertyType[] propertyTypes = persistenceContextRef.getPropertyArray();
-        for (GerPropertyType propertyType : propertyTypes) {
+    private void addProperties(PersistenceContextRefType persistenceContextRef, Map<String, String> properties) {
+        List<PropertyType> propertyTypes = persistenceContextRef.getProperty();
+        for (PropertyType propertyType : propertyTypes) {
             String key = propertyType.getKey();
             String value = propertyType.getValue();
             properties.put(key, value);
         }
     }
 
-    private Map<String, GerPersistenceContextRefType> getGerPersistenceContextRefs(XmlObject plan) throws DeploymentException {
-        Map<String, GerPersistenceContextRefType> map = new HashMap<String, GerPersistenceContextRefType>();
+    private Map<String, PersistenceContextRefType> getPersistenceContextRefs(JndiPlan plan) throws DeploymentException {
+        Map<String, PersistenceContextRefType> map = new HashMap<String, PersistenceContextRefType>();
         if (plan != null) {
-            List<GerPersistenceContextRefType> refs = convert(plan.selectChildren(GER_PERSISTENCE_CONTEXT_REF_QNAME_SET), NAMING_CONVERTER, GerPersistenceContextRefType.class, GerPersistenceContextRefType.type);
-            for (GerPersistenceContextRefType ref : refs) {
-                map.put(getJndiName(ref.getPersistenceContextRefName().trim()), ref);
+            for (PersistenceContextRefType ref : plan.getPersistenceContextRef()) {
+                map.put(getJndiName(ref.getPersistenceContextRefName()), ref);
             }
         }
         return map;

Modified: geronimo/server/branches/3.0-osgi/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Sat May  7 03:47:48 2011
@@ -29,16 +29,11 @@ import java.util.Properties;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
-import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeployableBundle;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
-import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
@@ -49,6 +44,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
+import org.apache.geronimo.j2ee.deployment.PersistencePlan;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.Naming;
@@ -56,15 +52,12 @@ import org.apache.geronimo.kernel.config
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.naming.ResourceSource;
 import org.apache.geronimo.persistence.PersistenceUnitGBean;
-import org.apache.openejb.jee.JAXBContextFactory;
 import org.apache.openejb.jee.JaxbJavaee;
-import org.apache.openejb.jee.Persistence;
+import org.apache.openejb.jee.jpa.unit.Persistence;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
 import org.apache.xbean.osgi.bundle.util.BundleResourceFinder;
 import org.apache.xbean.osgi.bundle.util.DiscoveryRange;
 import org.apache.xbean.osgi.bundle.util.ResourceDiscoveryFilter;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -78,7 +71,6 @@ public class PersistenceUnitBuilder impl
 
     private static final QName PERSISTENCE_QNAME = new QName("http://java.sun.com/xml/ns/persistence", "persistence");
 
-    private final Environment defaultEnvironment;
     private final String defaultPersistenceProviderClassName;
     private final Properties defaultPersistenceUnitProperties;
     private final AbstractNameQuery defaultJtaDataSourceName;
@@ -88,14 +80,12 @@ public class PersistenceUnitBuilder impl
     private static final String RESOURCE_SOURCE_CLASS_NAME = ResourceSource.class.getName();
     private final PackageAdmin packageAdmin;
 
-    public PersistenceUnitBuilder(@ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
-                                  @ParamAttribute(name = "defaultPersistenceProviderClassName") String defaultPersistenceProviderClassName,
+    public PersistenceUnitBuilder(@ParamAttribute(name = "defaultPersistenceProviderClassName") String defaultPersistenceProviderClassName,
                                   @ParamAttribute(name = "defaultJtaDataSourceName") String defaultJtaDataSourceName,
                                   @ParamAttribute(name = "defaultNonJtaDataSourceName") String defaultNonJtaDataSourceName,
                                   @ParamAttribute(name = "extendedEntityManagerRegistryName") AbstractNameQuery extendedEntityManagerRegistryName,
                                   @ParamAttribute(name = "defaultPersistenceUnitProperties") Properties defaultPersistenceUnitProperties,
                                   @ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext bundleContext) throws URISyntaxException {
-        this.defaultEnvironment = defaultEnvironment;
         this.defaultPersistenceProviderClassName = defaultPersistenceProviderClassName;
         this.defaultJtaDataSourceName = defaultJtaDataSourceName == null ? null : getAbstractNameQuery(defaultJtaDataSourceName);
         this.defaultNonJtaDataSourceName = defaultNonJtaDataSourceName == null ? null : getAbstractNameQuery(defaultNonJtaDataSourceName);
@@ -119,21 +109,17 @@ public class PersistenceUnitBuilder impl
         if (module.getDeployable() instanceof DeployableBundle) {
             return;
         }
-        XmlObject container = (XmlObject) module.getVendorDD();
-        XmlObject[] raws = container.selectChildren(PERSISTENCE_QNAME);
+        if (!(module.getVendorDD() instanceof PersistencePlan)) {
+            return;
+        }
+        PersistencePlan plan = (PersistencePlan)module.getVendorDD();
 
-        Map<String, Persistence.PersistenceUnit> overrides = new HashMap<String, Persistence.PersistenceUnit>();
-        try {
-            for (XmlObject raw : raws) {
-             
-                Persistence persistence = fromXmlObject(raw);
-                for (Persistence.PersistenceUnit unit : persistence.getPersistenceUnit()) {
+        Map<String, PersistenceUnit> overrides = new HashMap<String, PersistenceUnit>();
+            for (Persistence persistence: plan.getPersistence()) {
+                for (PersistenceUnit unit : persistence.getPersistenceUnit()) {
                     overrides.put(unit.getName().trim(), unit);
                 }
             }
-        } catch (JAXBException e) {
-            throw new DeploymentException("Parse Persistence configuration file failed", e);
-        }
         try {
 
             final Collection<String> manifestcp = module.getClassPath();
@@ -169,9 +155,9 @@ public class PersistenceUnitBuilder impl
                     return true;
                 }
             });
-            if (raws.length > 0 || persistenceURLs.size() > 0) {
-                EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
-            }
+//            if (raws.length > 0 || persistenceURLs.size() > 0) {
+//                EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
+//            }
             for (Map.Entry<URL, String> entry : persistenceURLs.entrySet()) {
                 URL persistenceUrl = entry.getKey();
                 String persistenceLocation = entry.getValue();
@@ -190,7 +176,7 @@ public class PersistenceUnitBuilder impl
             throw new DeploymentException("Could not look for META-INF/persistence.xml files", e);
         }
 
-        for (Persistence.PersistenceUnit persistenceUnit : overrides.values()) {
+        for (PersistenceUnit persistenceUnit : overrides.values()) {
             GBeanData data = installPersistenceUnitGBean(persistenceUnit, module, module.getTargetPath());
             respectExcludeUnlistedClasses(data);
         }
@@ -199,9 +185,9 @@ public class PersistenceUnitBuilder impl
     public void addGBeans(EARContext earContext, Module module, Bundle bundle, Collection repository) throws DeploymentException {
     }
 
-    private void buildPersistenceUnits(Persistence persistence, Map<String, Persistence.PersistenceUnit> overrides, Module module, String persistenceModulePath) throws DeploymentException {
-        List<Persistence.PersistenceUnit> persistenceUnits = persistence.getPersistenceUnit();
-        for (Persistence.PersistenceUnit persistenceUnit : persistenceUnits) {
+    private void buildPersistenceUnits(Persistence persistence, Map<String, PersistenceUnit> overrides, Module module, String persistenceModulePath) throws DeploymentException {
+        List<PersistenceUnit> persistenceUnits = persistence.getPersistenceUnit();
+        for (PersistenceUnit persistenceUnit : persistenceUnits) {
             GBeanData data = installPersistenceUnitGBean(persistenceUnit, module, persistenceModulePath);
             String unitName = persistenceUnit.getName().trim();
             if (overrides.get(unitName) != null) {
@@ -211,7 +197,7 @@ public class PersistenceUnitBuilder impl
         }
     }
 
-    private GBeanData installPersistenceUnitGBean(Persistence.PersistenceUnit persistenceUnit, Module module, String persistenceModulePath) throws DeploymentException {
+    private GBeanData installPersistenceUnitGBean(PersistenceUnit persistenceUnit, Module module, String persistenceModulePath) throws DeploymentException {
         EARContext moduleContext = module.getEarContext();
         String persistenceUnitName = persistenceUnit.getName().trim();
         if (persistenceUnitName.length() == 0) {
@@ -261,7 +247,7 @@ public class PersistenceUnitBuilder impl
         return gbeanData;
     }
 
-    private void setOverrideableProperties(Persistence.PersistenceUnit persistenceUnit, GBeanData gbeanData) throws DeploymentException {
+    private void setOverrideableProperties(PersistenceUnit persistenceUnit, GBeanData gbeanData) throws DeploymentException {
         if (persistenceUnit.getProvider() != null) {
             gbeanData.setAttribute("persistenceProviderClassName", persistenceUnit.getProvider().trim());
         }
@@ -312,11 +298,7 @@ public class PersistenceUnitBuilder impl
 
         if (persistenceUnit.getProperties() != null) {
             Properties properties = (Properties) gbeanData.getAttribute("properties");
-            for (Persistence.PersistenceUnit.Properties.Property propertyObject : persistenceUnit.getProperties().getProperty()) {
-                String key = propertyObject.getName().trim();
-                String value = propertyObject.getValue().trim();
-                properties.setProperty(key, value);
-            }
+            properties.putAll(persistenceUnit.getProperties());
         }
 
     }
@@ -337,41 +319,4 @@ public class PersistenceUnitBuilder impl
         return dataSourceNameQuery;
     }
 
-    private Persistence fromXmlObject(XmlObject xmlObject) throws JAXBException {
-        
-        /* 
-         * To avoid illegal exception in JAXB. Convert 
-         * 
-         * <xml-fragment> ... </xml-fragment> 
-         * to
-         * <persistence xmlns="http://java.sun.com/xml/ns/persistence"> ... </persistence>
-         * 
-         * before unmarshalling it 
-         */
-        XmlObject newXmlObject=XmlObject.Factory.newInstance();
-        XmlCursor newXmlCursor=newXmlObject.newCursor();
-        newXmlCursor.toNextToken();
-        newXmlCursor.beginElement(PERSISTENCE_QNAME);
-        
-        XmlCursor oldXmlCursor=xmlObject.newCursor();
-        oldXmlCursor.copyXmlContents(newXmlCursor);
-        
-        oldXmlCursor.dispose();
-        newXmlCursor.dispose();
-        
-        
-        XMLStreamReader reader = newXmlObject.newXMLStreamReader();
-        JAXBContext context = JAXBContextFactory.newInstance(Persistence.class);
-        Unmarshaller unmarshaller = context.createUnmarshaller();
-        return (Persistence) unmarshaller.unmarshal(reader);
-    }
-
-    public QNameSet getSpecQNameSet() {
-        return QNameSet.EMPTY;
-    }
-
-    public QNameSet getPlanQNameSet() {
-        return QNameSet.singleton(PERSISTENCE_QNAME);
-    }
-
 }

Modified: geronimo/server/branches/3.0-osgi/plugins/openjpa2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openjpa2/openjpa2/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openjpa2/openjpa2/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openjpa2/openjpa2/pom.xml Sat May  7 03:47:48 2011
@@ -38,13 +38,6 @@
     </description>
     
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -67,12 +60,12 @@
             <artifactId>commons-lang</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-1_6</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>transaction-1_6</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/3.0-osgi/plugins/openjpa2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openjpa2/persistence-jpa20-deployer/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openjpa2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openjpa2/persistence-jpa20-deployer/pom.xml Sat May  7 03:47:48 2011
@@ -37,35 +37,58 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
+            <groupId>org.apache.geronimo.feature</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-persistence-jpa20-builder</artifactId>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>j2ee-system</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework.feature</groupId>-->
+            <!--<artifactId>server-security-config</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>kar</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-1_6</artifactId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${project.version}</version>
             <type>car</type>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>j2ee-deployer</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-persistence-jpa20-builder</artifactId>
             <version>${project.version}</version>
         </dependency>
 
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>transaction-1_6</artifactId>-->
+            <!--<type>car</type>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
 
-        <!--todo get the schema classes in a config -->
-        <!--<dependency>-->
-        <!--<groupId>org.apache.geronimo.schema</groupId>-->
-        <!--<artifactId>geronimo-schema-jee_5</artifactId>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>
@@ -74,15 +97,22 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>declarative-services</feature>
+                        <feature>org.apache.geronimo.jaxb-support</feature>
+                        <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>j2ee-system</feature>
+                        <!--<feature>server-security-config</feature>-->
+                    </features>
                     <category>Persistence</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>transaction-1_6</artifactId>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
-                    </dependencies>
+                    <!--<dependencies>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                            <!--<artifactId>transaction-1_6</artifactId>-->
+                            <!--<type>car</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                    <!--</dependencies>-->
                     <instance>
                         <plugin-artifact>
                             <config-xml-content>

Modified: geronimo/server/branches/3.0-osgi/plugins/openjpa2/persistence-jpa20-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openjpa2/persistence-jpa20-deployer/src/main/plan/plan.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openjpa2/persistence-jpa20-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openjpa2/persistence-jpa20-deployer/src/main/plan/plan.xml Sat May  7 03:47:48 2011
@@ -29,33 +29,33 @@
             openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
             openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100)
         </attribute>
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>openjpa2</artifactId>
-                        <version>${version}</version>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
+        <!--<xml-attribute name="defaultEnvironment">-->
+            <!--<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">-->
+                <!--<dependencies>-->
+                    <!--<dependency>-->
+                        <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                        <!--<artifactId>openjpa2</artifactId>-->
+                        <!--<version>${version}</version>-->
+                        <!--<type>car</type>-->
+                    <!--</dependency>-->
+                <!--</dependencies>-->
+            <!--</environment>-->
+        <!--</xml-attribute>-->
     </gbean>
     <!-- TODO possibly the ref builders only need a dependency on transaction -->
     <gbean name="PersistenceRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceRefBuilder">
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>openjpa2</artifactId>
-                        <version>${version}</version>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
+        <!--<xml-attribute name="defaultEnvironment">-->
+            <!--<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">-->
+                <!--<dependencies>-->
+                    <!--<dependency>-->
+                        <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                        <!--<artifactId>openjpa2</artifactId>-->
+                        <!--<version>${version}</version>-->
+                        <!--<type>car</type>-->
+                    <!--</dependency>-->
+                <!--</dependencies>-->
+            <!--</environment>-->
+        <!--</xml-attribute>-->
     </gbean>
 
 

Modified: geronimo/server/branches/3.0-osgi/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java Sat May  7 03:47:48 2011
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -32,7 +31,6 @@ import java.util.Set;
 import java.util.jar.JarFile;
 
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.Producer;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
@@ -43,6 +41,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.j2ee.annotation.Holder;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
 import org.apache.geronimo.j2ee.deployment.NamingBuilder;
@@ -58,7 +57,6 @@ import org.apache.xbean.finder.BundleAnn
 import org.apache.xbean.finder.ClassFinder;
 import org.apache.xbean.osgi.bundle.util.DiscoveryRange;
 import org.apache.xbean.osgi.bundle.util.ResourceDiscoveryFilter;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.packageadmin.PackageAdmin;
@@ -122,7 +120,7 @@ public class OpenWebBeansModuleBuilderEx
             return;
         }
 
-        WebModule webModule = (WebModule) module;
+        WebModule<JndiPlan> webModule = (WebModule<JndiPlan>) module;
 
 //        if (!hasBeansXml(bundle)) {
 //            return;
@@ -146,7 +144,7 @@ public class OpenWebBeansModuleBuilderEx
         buildingContext.put(NamingBuilder.INJECTION_KEY, holder);
 
         WebApp webApp = webModule.getSpecDD();
-        XmlObject jettyWebApp = webModule.getVendorDD();
+        JndiPlan jettyWebApp = webModule.getVendorDD();
 
         ClassFinder classFinder = createOpenWebBeansClassFinder(webApp, webModule);
         webModule.setClassFinder(classFinder);

Modified: geronimo/server/branches/3.0-osgi/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansNamingBuilder.java Sat May  7 03:47:48 2011
@@ -26,14 +26,13 @@ import java.util.Map;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
 import org.apache.geronimo.openwebbeans.BeanManagerReference;
 import org.apache.openejb.jee.InjectionTarget;
 import org.apache.openejb.jee.JndiConsumer;
-import org.apache.xmlbeans.QNameSet;
-import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev:$ $Date:$
@@ -41,17 +40,8 @@ import org.apache.xmlbeans.XmlObject;
 @GBean(j2eeType = NameFactory.MODULE_BUILDER)
 public class OpenWebBeansNamingBuilder extends AbstractNamingBuilder {
     @Override
-    public void buildNaming(JndiConsumer specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
+    public void buildNaming(JndiConsumer specDD, JndiPlan plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
         put("java:comp/BeanManager", new BeanManagerReference(), module.getJndiContext(), Collections.<InjectionTarget>emptyList(), sharedContext);
     }
 
-    @Override
-    public QNameSet getSpecQNameSet() {
-        return QNameSet.EMPTY;
-    }
-
-    @Override
-    public QNameSet getPlanQNameSet() {
-        return QNameSet.EMPTY;
-    }
 }

Modified: geronimo/server/branches/3.0-osgi/plugins/openwebbeans/openwebbeans-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/openwebbeans/openwebbeans-deployer/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/openwebbeans/openwebbeans-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/openwebbeans/openwebbeans-deployer/pom.xml Sat May  7 03:47:48 2011
@@ -37,13 +37,40 @@
     <packaging>car</packaging>
 
     <dependencies>
-        <!-- parent -->
+        <dependency>
+            <groupId>org.apache.geronimo.feature</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.feature</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework.feature</groupId>-->
+            <!--<artifactId>server-security-config</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>kar</type>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
+            <artifactId>j2ee-server</artifactId>
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
+        <!-- parent -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>j2ee-deployer</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
 
         <dependency>
@@ -66,16 +93,23 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>declarative-services</feature>
+                        <feature>org.apache.geronimo.jaxb-support</feature>
+                        <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>j2ee-system</feature>
+                        <!--<feature>server-security-config</feature>-->
+                    </features>
                     <category>Web Framework</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>openwebbeans</artifactId>
-                            <version>3.0-SNAPSHOT</version>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
-                    </dependencies>
+                    <!--<dependencies>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                            <!--<artifactId>openwebbeans</artifactId>-->
+                            <!--<version>3.0-SNAPSHOT</version>-->
+                            <!--<type>car</type>-->
+                            <!--<import>classes</import>-->
+                        <!--</dependency>-->
+                    <!--</dependencies>-->
                     <instance>
                         <plugin-artifact>
                             <config-xml-content server="default" />

Modified: geronimo/server/branches/3.0-osgi/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/pom.xml Sat May  7 03:47:48 2011
@@ -176,16 +176,16 @@
         <module>openjpa2</module>
         <module>openwebbeans</module>
         <!--<module>wink</module>-->
-        <module>plancreator</module>
+        <!--<module>plancreator</module>-->
         <!--<module>webservices</module>-->
         <!--<module>ca-helper</module>-->
         <!--<module>uddi</module>-->
-        <module>mejb</module>
+        <!--<module>mejb</module>-->
         <!--<module>monitoring</module>-->
         <!--<module>remote-deploy</module>-->
         <!--<module>sharedlib</module>-->
         <!--<module>welcome</module>-->
-        <module>procrun</module>
+        <!--<module>procrun</module>-->
         <!--<module>jetty8</module>-->
         <module>aries</module>
         <module>wab</module>

Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7-deployer/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7-deployer/pom.xml Sat May  7 03:47:48 2011
@@ -65,11 +65,11 @@
         </dependency>
 
         <!--ResourceEnvironmentSetter-->
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector-builder-1_6</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-connector-builder-1_6</artifactId>-->
+            <!--<version>${project.version}</version>-->
+        <!--</dependency>-->
 
         <!-- import classes -->
         <dependency>



Mime
View raw message