You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/10/18 02:34:24 UTC
svn commit: r465110 - in /geronimo/server/trunk:
assemblies/geronimo-jetty-j2ee/
assemblies/geronimo-jetty-j2ee/src/main/var/config/
assemblies/geronimo-tomcat-j2ee/
assemblies/geronimo-tomcat-j2ee/src/main/var/config/ configs/
configs/client-corba-sun...
Author: djencks
Date: Tue Oct 17 17:34:21 2006
New Revision: 465110
URL: http://svn.apache.org/viewvc?view=rev&rev=465110
Log:
GERONIMO-2499, OPENEJB-280. Generalize NamingBuilder slightly, use new corba runtime and deploy time configs. I don't think all the builders are fully wired up yet
Added:
geronimo/server/trunk/configs/openejb-corba-deployer/
- copied from r464258, geronimo/server/trunk/configs/openejb-deployer/
geronimo/server/trunk/configs/openejb-corba-deployer/LICENSE.txt
- copied unchanged from r465100, geronimo/server/trunk/configs/openejb-deployer/LICENSE.txt
geronimo/server/trunk/configs/openejb-corba-deployer/NOTICE.txt
- copied unchanged from r465100, geronimo/server/trunk/configs/openejb-deployer/NOTICE.txt
geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml
- copied, changed from r465100, geronimo/server/trunk/configs/openejb-deployer/pom.xml
geronimo/server/trunk/configs/openejb-corba-deployer/src/
- copied from r465100, geronimo/server/trunk/configs/openejb-deployer/src/
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
geronimo/server/trunk/configs/client-corba-sun/pom.xml
geronimo/server/trunk/configs/client-corba-yoko/pom.xml
geronimo/server/trunk/configs/client/pom.xml
geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml
geronimo/server/trunk/configs/j2ee-corba-yoko/pom.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/openejb/pom.xml
geronimo/server/trunk/configs/pom.xml
geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
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
geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java
geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/PersistenceContextRefBuilder.java
geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
geronimo/server/trunk/modules/geronimo-tomcat-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml Tue Oct 17 17:34:21 2006
@@ -201,6 +201,13 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-corba-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Tue Oct 17 17:34:21 2006
@@ -114,6 +114,8 @@
</gbean>
</module>
+ <module name="org.apache.geronimo.configs/openejb-corba-deployer/${pom.version}/car" load="false"/>
+
<module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
<module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml Tue Oct 17 17:34:21 2006
@@ -201,6 +201,13 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-corba-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Tue Oct 17 17:34:21 2006
@@ -123,6 +123,8 @@
</gbean>
</module>
+ <module name="org.apache.geronimo.configs/openejb-corba-deployer/${pom.version}/car" load="false"/>
+
<module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
<module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
Modified: geronimo/server/trunk/configs/client-corba-sun/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-sun/pom.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/client-corba-sun/pom.xml (original)
+++ geronimo/server/trunk/configs/client-corba-sun/pom.xml Tue Oct 17 17:34:21 2006
@@ -49,15 +49,15 @@
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-ejb_2.1_spec</artifactId>-->
+ <!--</dependency>-->
<!-- to enforce build order -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
+ <artifactId>openejb-corba-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
@@ -65,6 +65,16 @@
<dependency>
<groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-corba</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-sunorb</artifactId>
</dependency>
@@ -85,6 +95,7 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${openejbDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
<deploymentConfig>${axisDeployer}</deploymentConfig>
</deploymentConfigs>
</configuration>
Modified: geronimo/server/trunk/configs/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-yoko/pom.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/client-corba-yoko/pom.xml Tue Oct 17 17:34:21 2006
@@ -49,15 +49,15 @@
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.specs</groupId>-->
+ <!--<artifactId>geronimo-ejb_2.1_spec</artifactId>-->
+ <!--</dependency>-->
<!-- to enforce build order -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
+ <artifactId>openejb-corba-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
@@ -65,6 +65,16 @@
<dependency>
<groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-corba</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-yoko</artifactId>
</dependency>
@@ -95,109 +105,9 @@
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
<deploymentConfig>${openejbDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
<deploymentConfig>${axisDeployer}</deploymentConfig>
</deploymentConfigs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
- <Extension-Dirs>lib/ext</Extension-Dirs>
- </manifestEntries>
- <manifest>
- <mainClass>org.apache.geronimo.system.main.ClientCommandLine</mainClass>
- </manifest>
- </archive>
-
- <!--
- NOTE: This list of dependencies is non-transitive.
- -->
- <classpath>
- <element>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
- </element>
- <element>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
- </element>
- <element>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
- </element>
- <element>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
- </element>
- <element>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- </element>
- <element>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </element>
- <element>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </element>
- <element>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- </element>
- <element>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </element>
- <element>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </element>
- <element>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </element>
- <element>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </element>
- <element>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </element>
- <element>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </element>
- <element>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- </element>
- <element>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </element>
- <element>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </element>
- <element>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </element>
- </classpath>
- <classpathPrefix>../lib</classpathPrefix>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/pom.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client/pom.xml Tue Oct 17 17:34:21 2006
@@ -201,30 +201,30 @@
</dependency>
<!-- REMOVE WHEN G-2383 is applied -->
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.openejb</groupId>-->
+ <!--<artifactId>openejb-core</artifactId>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-yoko</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-rmi</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.openejb</groupId>-->
+ <!--<artifactId>openejb-yoko</artifactId>-->
+ <!--</dependency>-->
+<!---->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.yoko</groupId>-->
+ <!--<artifactId>yoko-core</artifactId>-->
+ <!--</dependency>-->
+<!---->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.yoko</groupId>-->
+ <!--<artifactId>yoko-spec-corba</artifactId>-->
+ <!--</dependency>-->
+<!---->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.yoko</groupId>-->
+ <!--<artifactId>yoko-rmi</artifactId>-->
+ <!--</dependency>-->
</dependencies>
</project>
Modified: geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml Tue Oct 17 17:34:21 2006
@@ -29,7 +29,7 @@
</parent>
<artifactId>j2ee-corba-sun</artifactId>
- <name>Geronimo Configs :: J2EE Corba</name>
+ <name>Geronimo Configs :: J2EE Corba Sun ORB</name>
<packaging>car</packaging>
<dependencies>
@@ -48,9 +48,22 @@
<type>car</type>
</dependency>
+ <!-- to enforce build order -->
<dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-corba-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.yoko</groupId>-->
+ <!--<artifactId>yoko-spec-corba</artifactId>-->
+ <!--</dependency>-->
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-corba</artifactId>
</dependency>
<dependency>
@@ -69,6 +82,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${openejbDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
</deploymentConfigs>
</configuration>
</plugin>
Modified: geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml Tue Oct 17 17:34:21 2006
@@ -29,7 +29,7 @@
</parent>
<artifactId>j2ee-corba-yoko</artifactId>
- <name>Geronimo Configs :: J2EE Corba</name>
+ <name>Geronimo Configs :: J2EE Corba Yoko ORB</name>
<packaging>car</packaging>
<dependencies>
@@ -48,6 +48,20 @@
<type>car</type>
</dependency>
+ <!-- to enforce build order -->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-corba-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-corba</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-yoko</artifactId>
@@ -79,6 +93,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${openejbDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
</deploymentConfigs>
</configuration>
</plugin>
Copied: geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml (from r465100, geronimo/server/trunk/configs/openejb-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml?view=diff&rev=465110&p1=geronimo/server/trunk/configs/openejb-deployer/pom.xml&r1=465100&p2=geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml Tue Oct 17 17:34:21 2006
@@ -28,42 +28,38 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>openejb-deployer</artifactId>
- <name>Geronimo Configs :: OpenEJB Deployer</name>
+ <artifactId>openejb-corba-deployer</artifactId>
+ <name>Geronimo Configs :: OpenEJB CORBA Deployer</name>
<packaging>car</packaging>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <artifactId>openejb-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- <scope>compile</scope>
- </dependency>
+ <!-- we might need to add this by hand -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.configs</groupId>-->
+ <!--<artifactId>j2ee-corba-yoko</artifactId>-->
+ <!--<version>${pom.version}</version>-->
+ <!--<type>car</type>-->
+ <!--<scope>compile</scope>-->
+ <!--</dependency>-->
+ <!-- ideally we wouldn't need this -->
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-builder</artifactId>
+ <artifactId>openejb-corba</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-pkgen-builder</artifactId>
+ <artifactId>openejb-corba-builder</artifactId>
</dependency>
-
+
</dependencies>
</project>
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=465110&r1=465100&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/openejb-corba-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb-corba-deployer/src/plan/plan.xml Tue Oct 17 17:34:21 2006
@@ -19,97 +19,40 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <gbean name="EJBBuilder" class="org.apache.openejb.deployment.OpenEjbModuleBuilder">
- <attribute name="listener">?name=WebContainer</attribute>
- <attribute name="defaultStatelessEjbContainer">StatelessEjbContainer</attribute>
- <attribute name="defaultStatefulEjbContainer">StatefulEjbContainer</attribute>
- <attribute name="defaultBmpEjbContainer">BmpEjbContainer</attribute>
- <attribute name="defaultCmpEjbContainer">CmpEjbContainer</attribute>
- <attribute name="defaultMdbEjbContainer">MdbEjbContainer</attribute>
- <reference name="WebServiceLinkTemplate">
- <name>WebServiceEJBLinkTemplate</name>
- </reference>
- <reference name="SecurityBuilders">
- <name>SecurityBuilder</name>
- </reference>
- <reference name="ServiceBuilders">
- <name>GBeanBuilder</name>
- </reference>
- <references name="WebServiceBuilder">
- <pattern>
- <name>WebServiceBuilder</name>
- </pattern>
- <pattern>
- <name>UnavailableWebServiceBuilder</name>
- </pattern>
- </references>
- <reference name="NamingBuilders">
- <name>NamingBuilders</name>
- </reference>
- <reference name="ResourceEnvironmentSetter">
- <name>ResourceRefBuilder</name>
- </reference>
- <reference name="ActivationSpecInfoLocator">
- <name>ConnectorBuilder</name>
- </reference>
- <xml-attribute name="defaultEnvironment">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>openejb</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>system-database</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
- </gbean>
-
<gbean name="CSSAttributeBuilder" class="org.apache.openejb.corba.security.config.css.CSSConfigEditor"/>
<gbean name="TSSAttributeBuilder" class="org.apache.openejb.corba.security.config.tss.TSSConfigEditor"/>
- <gbean name="OpenEjbRemoteRefBuilder" class="org.apache.openejb.deployment.OpenEjbRemoteRefBuilder">
+ <gbean name="OpenEjbCorbaRefBuilder" class="org.apache.openejb.deployment.OpenEjbCorbaRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<dependencies>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-corba-yoko</artifactId>
+ <type>car</type>
</dependency>
</dependencies>
</environment>
</xml-attribute>
</gbean>
-
- <gbean name="OpenEjbClientRemoteRefBuilder" class="org.apache.openejb.deployment.OpenEjbClientRemoteRefBuilder">
+
+ <gbean name="OpenEjbClientCorbaRefBuilder" class="org.apache.openejb.deployment.OpenEjbCorbaRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
- <attribute name="host">${PlanClientAddresses}</attribute>
- <attribute name="port">${PlanOpenEJBPort}</attribute>
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<dependencies>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>client-corba-yoko</artifactId>
+ <type>car</type>
</dependency>
</dependencies>
</environment>
</xml-attribute>
</gbean>
- <gbean name="OpenEjbLocalRefBuilder" class="org.apache.openejb.deployment.OpenEjbLocalRefBuilder">
- <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>
@@ -121,7 +64,19 @@
</reference>
</gbean>
+ <gbean name="OpenEjbTSSLinkBuilder" class="org.apache.openejb.deployment.TSSLinkBuilder">
+ <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>
+ </gbean>
- <gbean name="WebServiceEJBLinkTemplate" class="org.apache.openejb.server.axis.WSContainerGBean"/>
</module>
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=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml Tue Oct 17 17:34:21 2006
@@ -71,8 +71,8 @@
</gbean>
- <gbean name="CSSAttributeBuilder" class="org.apache.openejb.corba.security.config.css.CSSConfigEditor"/>
- <gbean name="TSSAttributeBuilder" class="org.apache.openejb.corba.security.config.tss.TSSConfigEditor"/>
+ <!--<gbean name="CSSAttributeBuilder" class="org.apache.openejb.corba.security.config.css.CSSConfigEditor"/>-->
+ <!--<gbean name="TSSAttributeBuilder" class="org.apache.openejb.corba.security.config.tss.TSSConfigEditor"/>-->
<gbean name="OpenEjbRemoteRefBuilder" class="org.apache.openejb.deployment.OpenEjbRemoteRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
@@ -110,16 +110,16 @@
<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="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"/>
Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Tue Oct 17 17:34:21 2006
@@ -74,15 +74,15 @@
<artifactId>openejb-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.yoko</groupId>
- <artifactId>yoko-spec-corba</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.yoko</groupId>-->
+ <!--<artifactId>yoko-spec-corba</artifactId>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>concurrent</groupId>-->
+ <!--<artifactId>concurrent</artifactId>-->
+ <!--</dependency>-->
</dependencies>
Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Tue Oct 17 17:34:21 2006
@@ -45,6 +45,7 @@
<clientDeployer>org.apache.geronimo.configs/client-deployer/${pom.version}/car</clientDeployer>
<connectorDeployer>org.apache.geronimo.configs/connector-deployer/${pom.version}/car</connectorDeployer>
<openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${pom.version}/car</openejbDeployer>
+ <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${pom.version}/car</openejbcorbaDeployer>
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
<tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
<jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${pom.version}/car</jettyDeployer>
@@ -152,6 +153,7 @@
<module>online-deployer</module>
<module>openejb</module>
<module>openejb-deployer</module>
+ <module>openejb-corba-deployer</module>
<module>remote-deploy-jetty</module>
<module>remote-deploy-tomcat</module>
<module>rmi-naming</module>
Modified: geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java Tue Oct 17 17:34:21 2006
@@ -129,7 +129,7 @@
//we could get a Reference or the actual serializable Service back.
Object ref = axisBuilder.createService(serviceInterface, wsdlURI, jaxrpcMappingURI, serviceQName, portComponentRefMap, handlerInfos, serviceRefType, module, cl);
- componentContext.put(ENV + name, ref);
+ getJndiContextMap(componentContext).put(ENV + name, ref);
}
}
Modified: geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Tue Oct 17 17:34:21 2006
@@ -493,7 +493,6 @@
AbstractName appClientModuleName = appClientModule.getModuleName();
// create a gbean for the app client module and add it to the ear
- Map componentContext;
GBeanData appClientModuleGBeanData = new GBeanData(appClientModuleName, J2EEAppClientModuleImpl.GBEAN_INFO);
try {
appClientModuleGBeanData.setReferencePattern("J2EEServer", earContext.getServerName());
@@ -552,8 +551,13 @@
AbstractName jndiContextName = earContext.getNaming().createChildName(appClientDeploymentContext.getModuleName(), "StaticJndiContext", "StaticJndiContext");
GBeanData jndiContextGBeanData = new GBeanData(jndiContextName, StaticJndiContextPlugin.GBEAN_INFO);
try {
- componentContext = buildComponentContext(appClientDeploymentContext, earContext, appClientModule, appClient, geronimoAppClient);
- jndiContextGBeanData.setAttribute("context", componentContext);
+ Map buildingContext = new HashMap();
+ buildingContext.put(NamingBuilder.JNDI_KEY, new HashMap());
+ buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, jndiContextName);
+ Configuration localConfiguration = appClientDeploymentContext.getConfiguration();
+ Configuration remoteConfiguration = earContext.getConfiguration();
+ namingBuilders.buildNaming(appClient, geronimoAppClient, localConfiguration, remoteConfiguration, appClientModule, buildingContext);
+ jndiContextGBeanData.setAttribute("context", buildingContext.get(NamingBuilder.JNDI_KEY));
} catch (DeploymentException e) {
throw e;
} catch (Exception e) {
@@ -688,14 +692,6 @@
addManifestClassPath(deploymentContext, earFile, classPathJarFile, classPathJarLocation);
}
}
- }
-
- private Map buildComponentContext(EARContext appClientContext, EARContext ejbContext, AppClientModule appClientModule, ApplicationClientType appClient, GerApplicationClientType geronimoAppClient) throws DeploymentException {
- Map componentContext = new HashMap();
- Configuration localConfiguration = appClientContext.getConfiguration();
- Configuration remoteConfiguration = ejbContext.getConfiguration();
- namingBuilders.buildNaming(appClient, geronimoAppClient, localConfiguration, remoteConfiguration, appClientModule, componentContext);
- return componentContext;
}
private boolean cleanupAppClientDir(File configurationDir) {
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=465110&r1=465109&r2=465110
==============================================================================
--- 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 17 17:34:21 2006
@@ -114,7 +114,7 @@
try {
AbstractNameQuery containerId = getAdminObjectContainerId(name, gerResourceEnvRef);
Reference ref = buildAdminObjectReference(localConfiguration, containerId, iface);
- componentContext.put(ENV + name, ref);
+ getJndiContextMap(componentContext).put(ENV + name, ref);
} catch (UnresolvedReferenceException e) {
throw new DeploymentException("Unable to resolve resource env reference '" + name + "' (" + (e.isMultiple() ? "found multiple matching resources" : "no matching resources found") + ")");
}
@@ -158,7 +158,7 @@
//throws exception if it can't locate ref.
AbstractNameQuery containerId = buildAbstractNameQuery(null, moduleURI, linkName, NameFactory.JCA_ADMIN_OBJECT, NameFactory.RESOURCE_ADAPTER_MODULE);
Reference ref = buildAdminObjectReference(localConfiguration, containerId, iface);
- componentContext.put(ENV + name, ref);
+ getJndiContextMap(componentContext).put(ENV + name, ref);
}
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=465110&r1=465109&r2=465110
==============================================================================
--- 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 17 17:34:21 2006
@@ -94,7 +94,7 @@
}
try {
//TODO expose jsr-77 objects for these guys
- componentContext.put(ENV + name, new URL(gerResourceRef.getUrl()));
+ getJndiContextMap(componentContext).put(ENV + name, new URL(gerResourceRef.getUrl()));
} catch (MalformedURLException e) {
throw new DeploymentException("Could not convert " + gerResourceRef.getUrl() + " to URL", e);
}
@@ -120,7 +120,7 @@
}
Reference ref = new ResourceReference(localConfiguration.getId(), containerId, iface);
- componentContext.put(ENV + name, ref);
+ getJndiContextMap(componentContext).put(ENV + name, ref);
} catch (UnresolvedReferenceException e) {
StringBuffer errorMessage = new StringBuffer("Unable to resolve resource reference '");
Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java Tue Oct 17 17:34:21 2006
@@ -31,6 +31,7 @@
import org.apache.geronimo.j2ee.deployment.ConnectorModule;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.deployment.NamingBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Jsr77Naming;
import org.apache.geronimo.kernel.Naming;
@@ -70,6 +71,7 @@
protected void setUp() throws Exception {
super.setUp();
+ componentContext.put(NamingBuilder.JNDI_KEY, new HashMap());
Artifact id = new Artifact("test", "test", "", "car");
configuration = new Configuration(Collections.EMPTY_LIST,
new ConfigurationData(id, naming),
@@ -258,7 +260,7 @@
configuration.addGBean(new GBeanData(n1, AdminObjectWrapperGBean.GBEAN_INFO));
configuration.addGBean(new GBeanData(n2, AdminObjectWrapperGBean.GBEAN_INFO));
adminObjectRefBuilder.buildNaming(specDD, plan, configuration, configuration, module, componentContext);
- assertEquals(2, componentContext.size());
+ assertEquals(2, ((Map)componentContext.get(NamingBuilder.JNDI_KEY)).size());
}
private static final String PLAN2 = "<tmp xmlns=\"http://geronimo.apache.org/xml/ns/naming-1.2\">" +
@@ -282,7 +284,7 @@
configuration.addGBean(new GBeanData(n1, AdminObjectWrapperGBean.GBEAN_INFO));
configuration.addGBean(new GBeanData(n2, AdminObjectWrapperGBean.GBEAN_INFO));
adminObjectRefBuilder.buildNaming(specDD, plan, configuration, configuration, module, componentContext);
- assertEquals(2, componentContext.size());
+ assertEquals(2, ((Map)componentContext.get(NamingBuilder.JNDI_KEY)).size());
}
private static final String SPECDD2 = "<tmp xmlns=\"http://java.sun.com/xml/ns/j2ee\">" +
Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java Tue Oct 17 17:34:21 2006
@@ -26,12 +26,15 @@
import org.apache.xmlbeans.XmlObject;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public interface NamingBuilder {
XmlObject[] NO_REFS = new XmlObject[] {};
String ENV = "env/";
+
+ String JNDI_KEY = "JNDI_COMPONENT_CONTEXT";
+ String GBEAN_NAME_KEY = "GBEAN_NAME";
void buildEnvironment(XmlObject specDD, XmlObject plan, Environment environment) throws DeploymentException;
Modified: geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Tue Oct 17 17:34:21 2006
@@ -330,12 +330,6 @@
WebAppType webApp = (WebAppType) webModule.getSpecDD();
JettyWebAppType jettyWebApp = (JettyWebAppType) webModule.getVendorDD();
-// GbeanType[] gbeans = jettyWebApp.getGbeanArray();
-// ServiceConfigBuilder.addGBeans(gbeans, moduleClassLoader, moduleName, moduleContext);
-
- //this may add to the web classpath with enhanced classes.
- //N.B. we use the ear context which has all the gbeans we could possibly be looking up from this ear.
- Map compContext = buildComponentContext(earContext, webModule, webApp, jettyWebApp);
GBeanData webModuleData = new GBeanData(moduleName, JettyWebAppContext.GBEAN_INFO);
try {
@@ -360,6 +354,14 @@
Set dependencies = findGBeanDependencies(earContext);
webModuleData.addDependencies(dependencies);
+ //N.B. we use the ear context which has all the gbeans we could possibly be looking up from this ear.
+ Map buildingContext = new HashMap();
+ buildingContext.put(NamingBuilder.JNDI_KEY, new HashMap());
+ buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleName);
+ Configuration earConfiguration = earContext.getConfiguration();
+ getNamingBuilders().buildNaming(webApp, jettyWebApp, earConfiguration, earConfiguration, (Module)webModule, buildingContext);
+ Map compContext = (Map) buildingContext.get(NamingBuilder.JNDI_KEY);
+
webModuleData.setAttribute("componentContext", compContext);
//classpath may have been augmented with enhanced classes
// webModuleData.setAttribute("webClassPath", webModule.getWebClasspath());
@@ -990,13 +992,6 @@
throw new DeploymentException("Could not add servlet gbean to context", e); // TODO identify web app in message
}
return servletAbstractName;
- }
-
- private Map buildComponentContext(EARContext earContext, Module webModule, WebAppType webApp, JettyWebAppType jettyWebApp) throws DeploymentException {
- Map componentContext = new HashMap();
- Configuration earConfiguration = earContext.getConfiguration();
- getNamingBuilders().buildNaming(webApp, jettyWebApp, earConfiguration, earConfiguration, webModule, componentContext);
- return componentContext;
}
public static final GBeanInfo GBEAN_INFO;
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Tue Oct 17 17:34:21 2006
@@ -17,29 +17,30 @@
package org.apache.geronimo.naming.deployment;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.Collections;
import javax.xml.namespace.QName;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.NamingBuilder;
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
import org.apache.geronimo.schema.NamespaceElementConverter;
-import org.apache.xmlbeans.XmlObject;
+import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
+import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.QNameSet;
+import org.apache.xmlbeans.XmlObject;
/**
* @version $Rev$ $Date$
@@ -70,6 +71,14 @@
}
public void initContext(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module) throws DeploymentException {
+ }
+
+ protected Map getJndiContextMap(Map sharedContext) {
+ return (Map)sharedContext.get(JNDI_KEY);
+ }
+
+ protected AbstractName getGBeanName(Map sharedContext) {
+ return (AbstractName)sharedContext.get(GBEAN_NAME_KEY);
}
protected static QNameSet buildQNameSet(String[] eeNamespaces, String localPart) {
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Tue Oct 17 17:34:21 2006
@@ -86,7 +86,7 @@
} else {
throw new DeploymentException("unrecognized type: " + type);
}
- componentContext.put(ENV + name, value);
+ getJndiContextMap(componentContext).put(ENV + name, value);
} catch (NumberFormatException e) {
throw new DeploymentException("Invalid env-entry value for name: " + name, e);
}
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java Tue Oct 17 17:34:21 2006
@@ -44,7 +44,7 @@
import org.apache.geronimo.j2ee.deployment.NamingBuilder;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class GBeanRefBuilder implements NamingBuilder {
private static final QName GBEAN_REF_QNAME = GerGbeanRefDocument.type.getDocumentElementName();
@@ -98,7 +98,7 @@
String refName = gbeanRef.getRefName();
- componentContext.put(ENV + refName, new GBeanReference(localConfiguration.getId(), queries, gBeanType));
+ ((Map)componentContext.get(JNDI_KEY)).put(ENV + refName, new GBeanReference(localConfiguration.getId(), queries, gBeanType));
}
}
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/PersistenceContextRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/PersistenceContextRefBuilder.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/PersistenceContextRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/PersistenceContextRefBuilder.java Tue Oct 17 17:34:21 2006
@@ -50,7 +50,7 @@
import org.apache.xmlbeans.XmlObject;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class PersistenceContextRefBuilder implements NamingBuilder {
private static final QName PERSISTENCE_CONTEXT_REF_QNAME = GerPersistenceContextRefDocument.type.getDocumentElementName();
@@ -110,7 +110,7 @@
PersistenceContextReference reference = new PersistenceContextReference(localConfiguration.getId(), persistenceUnitNameQuery, transactionScoped, properties);
- componentContext.put(ENV + persistenceContextRefName, reference);
+ ((Map)componentContext.get(JNDI_KEY)).put(ENV + persistenceContextRefName, reference);
}
}
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java Tue Oct 17 17:34:21 2006
@@ -98,6 +98,8 @@
"</tmp>";
public void testEnvEntries() throws Exception {
+ componentContext.put(NamingBuilder.JNDI_KEY, new HashMap());
+
String stringVal = "Hello World";
Character charVal = new Character('H');
Byte byteVal = new Byte((byte) 12);
@@ -117,7 +119,7 @@
cursor.dispose();
}
environmentEntryBuilder.buildNaming(doc, null, null, null, null, componentContext);
- Context context = EnterpriseNamingContext.createEnterpriseNamingContext(componentContext);
+ Context context = EnterpriseNamingContext.createEnterpriseNamingContext((Map) componentContext.get(NamingBuilder.JNDI_KEY));
Set actual = new HashSet();
for (NamingEnumeration e = context.listBindings("env"); e.hasMore();) {
NameClassPair pair = (NameClassPair) e.next();
Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?view=diff&rev=465110&r1=465109&r2=465110
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Tue Oct 17 17:34:21 2006
@@ -269,13 +269,6 @@
WebAppType webApp = (WebAppType) webModule.getSpecDD();
TomcatWebAppType tomcatWebApp = (TomcatWebAppType) webModule.getVendorDD();
-// GbeanType[] gbeans = tomcatWebApp.getGbeanArray();
-// ServiceConfigBuilder.addGBeans(gbeans, moduleClassLoader, moduleName, moduleContext);
-
- //this may add to the web classpath with enhanced classes.
- //N.B. we use the ear context which has all the gbeans we could possibly be looking up from this ear.
- Map compContext = buildComponentContext(earContext, webModule, webApp, tomcatWebApp);
-
GBeanData webModuleData = new GBeanData(moduleName, TomcatWebAppContext.GBEAN_INFO);
try {
webModuleData.setReferencePattern("J2EEServer", moduleContext.getServerName());
@@ -295,6 +288,14 @@
Set dependencies = findGBeanDependencies(earContext);
webModuleData.addDependencies(dependencies);
+ //N.B. we use the ear context which has all the gbeans we could possibly be looking up from this ear.
+ Map buildingContext = new HashMap();
+ buildingContext.put(NamingBuilder.JNDI_KEY, new HashMap());
+ buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleName);
+ Configuration earConfiguration = earContext.getConfiguration();
+ getNamingBuilders().buildNaming(webApp, tomcatWebApp, earConfiguration, earConfiguration, webModule, buildingContext);
+ Map compContext = (Map) buildingContext.get(NamingBuilder.JNDI_KEY);
+
webModuleData.setAttribute("componentContext", compContext);
// unsharableResources, applicationManagedSecurityResources
GBeanResourceEnvironmentBuilder rebuilder = new GBeanResourceEnvironmentBuilder(webModuleData);
@@ -444,13 +445,6 @@
return TOMCAT_NAMESPACE;
}
-
- private Map buildComponentContext(EARContext earContext, Module webModule, WebAppType webApp, TomcatWebAppType tomcatWebApp) throws DeploymentException {
- Map componentContext = new HashMap();
- Configuration earConfiguration = earContext.getConfiguration();
- getNamingBuilders().buildNaming(webApp, tomcatWebApp, earConfiguration, earConfiguration, webModule, componentContext);
- return componentContext;
- }
public static final GBeanInfo GBEAN_INFO;