geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r476982 - in /geronimo/server/trunk/configs: j2ee-deployer/src/plan/plan.xml openejb-corba-deployer/src/plan/plan.xml openejb-deployer/src/plan/plan.xml persistence-jpa10-deployer/src/plan/plan.xml
Date Mon, 20 Nov 2006 00:00:19 GMT
Author: djencks
Date: Sun Nov 19 16:00:18 2006
New Revision: 476982

URL: http://svn.apache.org/viewvc?view=rev&rev=476982
Log:
GERONIMO-2460, GERONIMO-2580 move some builders into better modules

Modified:
    geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/openejb-corba-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml

Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=476982&r1=476981&r2=476982
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Sun Nov 19 16:00:18 2006
@@ -135,8 +135,6 @@
     </gbean>
 
     <gbean name="GBeanRefBuilder" class="org.apache.geronimo.naming.deployment.GBeanRefBuilder"/>
-    <gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.naming.deployment.PersistenceContextRefBuilder"/>
-    <gbean name="EntityManagerFactoryRefBuilder" class="org.apache.geronimo.naming.deployment.EntityManagerFactoryRefBuilder"/>
     <gbean name="EnvironmentEntryBuilder" class="org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
     </gbean>

Modified: geronimo/server/trunk/configs/openejb-corba-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-corba-deployer/src/plan/plan.xml?view=diff&rev=476982&r1=476981&r2=476982
==============================================================================
--- geronimo/server/trunk/configs/openejb-corba-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb-corba-deployer/src/plan/plan.xml Sun Nov 19 16:00:18
2006
@@ -54,12 +54,35 @@
         </xml-attribute>
     </gbean>
 
-    <gbean name="CorbaRefBuilder" class="org.apache.geronimo.naming.deployment.CorbaRefBuilder">
+    <gbean name="CorbaRefBuilder" class="org.apache.openejb.deployment.CorbaRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>j2ee-corba-yoko</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
         <reference name="CorbaGBeanNameSource">
             <name>EARBuilder</name>
         </reference>
     </gbean>
-    <gbean name="ClientCorbaRefBuilder" class="org.apache.geronimo.naming.deployment.CorbaRefBuilder">
+
+    <gbean name="ClientCorbaRefBuilder" class="org.apache.openejb.deployment.CorbaRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>client-corba-yoko</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
         <reference name="CorbaGBeanNameSource">
             <name>AppClientBuilder</name>
         </reference>

Modified: geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml?view=diff&rev=476982&r1=476981&r2=476982
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml Sun Nov 19 16:00:18 2006
@@ -111,18 +111,6 @@
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
     </gbean>
 
-    <!--<gbean name="CorbaRefBuilder" class="org.apache.geronimo.naming.deployment.CorbaRefBuilder">-->
-        <!--<reference name="CorbaGBeanNameSource">-->
-            <!--<name>EarBuilder</name>-->
-        <!--</reference>-->
-    <!--</gbean>-->
-    <!--<gbean name="ClientCorbaRefBuilder" class="org.apache.geronimo.naming.deployment.CorbaRefBuilder">-->
-        <!--<reference name="CorbaGBeanNameSource">-->
-            <!--<name>AppClientBuilder</name>-->
-        <!--</reference>-->
-    <!--</gbean>-->
-
-
     <gbean name="WebServiceEJBLinkTemplate" class="org.apache.openejb.server.axis.WSContainerGBean"/>
 
 </module>

Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml?view=diff&rev=476982&r1=476981&r2=476982
==============================================================================
--- geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml Sun Nov 19
16:00:18 2006
@@ -33,5 +33,31 @@
             </environment>
         </xml-attribute>
     </gbean>
+    <gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceContextRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>transaction-jta11</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+    <gbean name="EntityManagerFactoryRefBuilder" class="org.apache.geronimo.persistence.builder.EntityManagerFactoryRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>transaction-jta11</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
 
 </module>



Mime
View raw message