geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r462587 - in /geronimo/server/trunk: configs/client-deployer/src/plan/ modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/
Date Tue, 10 Oct 2006 21:36:46 GMT
Author: djencks
Date: Tue Oct 10 14:36:45 2006
New Revision: 462587

URL: http://svn.apache.org/viewvc?view=rev&rev=462587
Log:
GERONIMO-2383 Forgot the isMergeEnvironment in a couple builders.  Give client builder its
own ref builders

Modified:
    geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java

Modified: geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml?view=diff&rev=462587&r1=462586&r2=462587
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Tue Oct 10 14:36:45 2006
@@ -38,10 +38,10 @@
                 <name>PersistenceContextRefBuilder</name>
             </pattern>
             <pattern>
-                <name>ResourceRefBuilder</name>
+                <name>ClientResourceRefBuilder</name>
             </pattern>
             <pattern>
-                <name>AdminObjectRefBuilder</name>
+                <name>ClientAdminObjectRefBuilder</name>
             </pattern>
             <pattern>
                 <name>EnvironmentEntryBuilder</name>
@@ -105,6 +105,13 @@
                 </dependencies>
             </environment>
         </xml-attribute>
+    </gbean>
+
+    <gbean name="ClientResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
+    </gbean>
+    <gbean name="ClientAdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
+        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
     </gbean>
 
 </module>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?view=diff&rev=462587&r1=462586&r2=462587
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
Tue Oct 10 14:36:45 2006
@@ -67,6 +67,9 @@
         messageDestinationRefQNameSet = buildQNameSet(eeNamespaces, "message-destination-ref");
     }
 
+    protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
+        return specDD.selectChildren(adminOjbectRefQNameSet).length > 0 || specDD.selectChildren(messageDestinationRefQNameSet).length
> 0;
+    }
 
     public void initContext(XmlObject specDD, XmlObject plan, Configuration localConfiguration,
Configuration remoteConfiguration, Module module) throws DeploymentException {
         XmlObject[] specDestinations = convert(specDD.selectChildren(messageDestinationQNameSet),
J2EE_CONVERTER, MessageDestinationType.type);

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?view=diff&rev=462587&r1=462586&r2=462587
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Tue Oct 10 14:36:45 2006
@@ -67,6 +67,10 @@
         resourceRefQNameSet = buildQNameSet(eeNamespaces, "resource-ref");
     }
 
+    protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
+        return specDD.selectChildren(resourceRefQNameSet).length > 0;
+    }
+
     public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration,
Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException
{
         XmlObject[] resourceRefsUntyped = convert(specDD.selectChildren(resourceRefQNameSet),
J2EE_CONVERTER, ResourceRefType.type);
         XmlObject[] gerResourceRefsUntyped = plan == null? NO_REFS: plan.selectChildren(GER_RESOURCE_REF_QNAME_SET);



Mime
View raw message