geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r616937 - in /geronimo/server/trunk/plugins/connector: connector-deployer/pom.xml connector-deployer/src/main/plan/plan.xml geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Date Wed, 30 Jan 2008 22:51:08 GMT
Author: djencks
Date: Wed Jan 30 14:51:04 2008
New Revision: 616937

URL: http://svn.apache.org/viewvc?rev=616937&view=rev
Log:
GERONIMO-3787 likely fix for corba dependency problem

Modified:
    geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
    geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java

Modified: geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml?rev=616937&r1=616936&r2=616937&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml Wed Jan 30 14:51:04
2008
@@ -94,7 +94,7 @@
                             <config-xml-content>
                                 <gbean name="ResourceRefBuilder">
                                     <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-                                    <attribute name="defaultEnvironment" propertyEditor="org.apache.geronimo.deployment.service.EnvironmentBuilder">
+                                    <attribute name="corbaEnvironment" propertyEditor="org.apache.geronimo.deployment.service.EnvironmentBuilder">
                                         <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                                             <dependencies>
                                                 <dependency>
@@ -113,7 +113,7 @@
 
                                 <gbean name="ClientResourceRefBuilder">
                                     <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-                                    <attribute name="defaultEnvironment" propertyEditor="org.apache.geronimo.deployment.service.EnvironmentBuilder">
+                                    <attribute name="corbaEnvironment" propertyEditor="org.apache.geronimo.deployment.service.EnvironmentBuilder">
                                         <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                                             <dependencies>
                                                 <dependency>

Modified: geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml?rev=616937&r1=616936&r2=616937&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/src/main/plan/plan.xml Wed
Jan 30 14:51:04 2008
@@ -50,7 +50,7 @@
 
     <gbean name="ResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-        <xml-attribute name="defaultEnvironment">
+        <xml-attribute name="corbaEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}"/>
         </xml-attribute>
         <reference name="CorbaGBeanNameSource">
@@ -87,7 +87,7 @@
 
     <gbean name="ClientResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-        <xml-attribute name="defaultEnvironment">
+        <xml-attribute name="corbaEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}"/>
         </xml-attribute>
         <reference name="CorbaGBeanNameSource">

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?rev=616937&r1=616936&r2=616937&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Wed Jan 30 14:51:04 2008
@@ -67,6 +67,7 @@
 import org.apache.geronimo.xbeans.javaee.ResSharingScopeType;
 import org.apache.geronimo.xbeans.javaee.ResourceRefType;
 import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlObject;
 import org.omg.CORBA.ORB;
@@ -85,12 +86,14 @@
 
 
     private final QNameSet resourceRefQNameSet;
+    private final Environment corbaEnvironment;
     private final SingleElementCollection corbaGBeanNameSourceCollection;
 
-    public ResourceRefBuilder(Environment defaultEnvironment, String[] eeNamespaces, Collection
corbaGBeanNameSourceCollection) {
+    public ResourceRefBuilder(Environment defaultEnvironment, Environment corbaEnvironment,
String[] eeNamespaces, Collection corbaGBeanNameSourceCollection) {
         super(defaultEnvironment);
 
         resourceRefQNameSet = buildQNameSet(eeNamespaces, "resource-ref");
+        this.corbaEnvironment = corbaEnvironment;
         this.corbaGBeanNameSourceCollection = new SingleElementCollection(corbaGBeanNameSourceCollection);
     }
 
@@ -154,6 +157,7 @@
                     Artifact[] moduleId = module.getConfigId();
                     Map context = getJndiContextMap(componentContext);
                     context.put(ENV + name, new ORBReference(moduleId, corbaName));
+                    EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), corbaEnvironment);
                 }
             } else {
                 //determine jsr-77 type from interface
@@ -394,9 +398,10 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ResourceRefBuilder.class,
NameFactory.MODULE_BUILDER);
         infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+        infoBuilder.addAttribute("corbaEnvironment", Environment.class, true, true);
         infoBuilder.addReference("CorbaGBeanNameSource", CorbaGBeanNameSource.class);
 
-        infoBuilder.setConstructor(new String[]{"defaultEnvironment", "eeNamespaces", "CorbaGBeanNameSource"});
+        infoBuilder.setConstructor(new String[]{"defaultEnvironment", "corbaEnvironment",
"eeNamespaces", "CorbaGBeanNameSource"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }



Mime
View raw message