You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/06/19 03:17:58 UTC
svn commit: r415224 - in /geronimo/branches/dain/openejb-2.2-merge/configs:
client-corba/src/plan/ client-deployer/ client/ j2ee-corba/src/plan/
j2ee-deployer/ j2ee-server/ openejb/src/plan/ rmi-naming/
Author: dain
Date: Sun Jun 18 18:17:57 2006
New Revision: 415224
URL: http://svn.apache.org/viewvc?rev=415224&view=rev
Log:
svn merge -r 378403:378404 https://svn.apache.org/repos/asf/geronimo/trunk@378404
Original Commit Message
-----------------------
Author: dblevins
Date: Thu Feb 16 16:17:27 2006
New Revision: 378404
URL: http://svn.apache.org/viewcvs?rev=378404&view=rev
Log:
Added dependencies on geronimo-interceptor
Updated the OpenEJB gbean class names
Modified:
geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/src/plan/plan.xml
geronimo/branches/dain/openejb-2.2-merge/configs/client-deployer/project.xml
geronimo/branches/dain/openejb-2.2-merge/configs/client/project.xml
geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-corba/src/plan/plan.xml
geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/project.xml
geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-server/project.xml
geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml
geronimo/branches/dain/openejb-2.2-merge/configs/rmi-naming/project.xml
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/src/plan/plan.xml?rev=415224&r1=415223&r2=415224&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/src/plan/plan.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/src/plan/plan.xml Sun Jun 18 18:17:57 2006
@@ -22,7 +22,6 @@
CSSBean examples for app client
-->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
<gbean name="CORBASystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
<attribute name="systemProperties">
javax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl
@@ -43,9 +42,9 @@
</reference>
</gbean>
- <gbean name="DyanmicStubClassLoader" class="org.openejb.corba.util.DynamicStubClassLoader"/>
+ <gbean name="DyanmicStubClassLoader" class="org.openejb.corba.util.DynamicStubClassLoaderGBean"/>
- <gbean name="Server" class="org.openejb.corba.CORBABean">
+ <gbean name="Server" class="org.openejb.corba.CORBABeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
@@ -64,7 +63,7 @@
</gbean>
<!-- a few sample css beans for the app client -->
<!--
- <gbean name="SSLClientCert" class="org.openejb.corba.CSSBean">
+ <gbean name="SSLClientCert" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<module>geronimo/client/${pom.currentVersion}/car</module>
<name>DefaultThreadPool</name>
@@ -106,7 +105,7 @@
</xml-attribute>
</gbean>
- <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBean">
+ <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<module>geronimo/client/${pom.currentVersion}/car</module>
<name>DefaultThreadPool</name>
@@ -148,7 +147,7 @@
</xml-attribute>
</gbean>
- <gbean name="NoSecurity" class="org.openejb.corba.CSSBean">
+ <gbean name="NoSecurity" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<module>geronimo/client/${pom.currentVersion}/car</module>
<name>DefaultThreadPool</name>
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/client-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/client-deployer/project.xml?rev=415224&r1=415223&r2=415224&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/client-deployer/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/client-deployer/project.xml Sun Jun 18 18:17:57 2006
@@ -110,6 +110,14 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-interceptor</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>${geronimo_version}</version>
<properties>
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/client/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/client/project.xml?rev=415224&r1=415223&r2=415224&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/client/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/client/project.xml Sun Jun 18 18:17:57 2006
@@ -111,6 +111,14 @@
<geronimo.dependency>true</geronimo.dependency>
</properties>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-interceptor</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
<!-- for property editor support for some login modules/principals -->
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-corba/src/plan/plan.xml?rev=415224&r1=415223&r2=415224&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-corba/src/plan/plan.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-corba/src/plan/plan.xml Sun Jun 18 18:17:57 2006
@@ -45,13 +45,13 @@
<!-- CORBA -->
- <gbean name="DynamicORBStubClassLoader" class="org.openejb.corba.util.DynamicStubClassLoader">
+ <gbean name="DynamicORBStubClassLoader" class="org.openejb.corba.util.DynamicStubClassLoaderGBean">
<dependency>
<name>SystemProperties</name>
</dependency>
</gbean>
- <gbean name="NameServer" class="org.openejb.corba.SunNameService">
+ <gbean name="NameServer" class="org.openejb.corba.SunNameServiceGBean">
<reference name="ServerInfo">
<name>ServerInfo</name>
</reference>
@@ -63,7 +63,7 @@
</gbean>
<!-- connections require SSL, no client cert, client logs in with password, no identity token -->
- <gbean name="Server" class="org.openejb.corba.CORBABean">
+ <gbean name="Server" class="org.openejb.corba.CORBABeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
@@ -102,7 +102,7 @@
</gbean>
<!-- orb with no security whatsoever -->
- <gbean name="UnprotectedServer" class="org.openejb.corba.CORBABean">
+ <gbean name="UnprotectedServer" class="org.openejb.corba.CORBABeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
@@ -142,7 +142,7 @@
<!-- tss bean examples, specify requirements for connection to orb. Provide a ref in an ejb -->
<!--
- <gbean name="SSLClientCert" class="org.openejb.corba.TSSBean">
+ <gbean name="SSLClientCert" class="org.openejb.corba.TSSBeanGBean">
<attribute name="POAName">SSLClientCert</attribute>
<reference name="Server">
<name>Server</name>
@@ -169,7 +169,7 @@
</xml-attribute>
</gbean>
- <gbean name="SSLClientPassword" class="org.openejb.corba.TSSBean">
+ <gbean name="SSLClientPassword" class="org.openejb.corba.TSSBeanGBean">
<attribute name="POAName">SSLClientPassword</attribute>
<reference name="Server">
<name>Server</name>
@@ -200,7 +200,7 @@
</dependency>
</gbean>
- <gbean name="SSLIdentityToken" class="org.openejb.corba.TSSBean">
+ <gbean name="SSLIdentityToken" class="org.openejb.corba.TSSBeanGBean">
<attribute name="POAName">SSLIdentityToken</attribute>
<reference name="Server">
<name>Server</name>
@@ -233,7 +233,7 @@
</dependency>
</gbean>
- <gbean name="IdentityTokenNoSecurity" class="org.openejb.corba.TSSBean">
+ <gbean name="IdentityTokenNoSecurity" class="org.openejb.corba.TSSBeanGBean">
<attribute name="POAName">IdentityTokenNoSecurity</attribute>
<reference name="Server">
<name>UnprotectedServer</name>
@@ -262,7 +262,7 @@
</dependency>
</gbean>
- <gbean name="SSLClientCertIdentityToken" class="org.openejb.corba.TSSBean">
+ <gbean name="SSLClientCertIdentityToken" class="org.openejb.corba.TSSBeanGBean">
<attribute name="POAName">SSLClientCertIdentityToken</attribute>
<reference name="Server">
<name>Server</name>
@@ -297,7 +297,7 @@
-->
<!--CSS beans for client security. These specify what the client is willing to provide -->
<!--
- <gbean name="SSLClientCert" class="org.openejb.corba.CSSBean">
+ <gbean name="SSLClientCert" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
@@ -338,7 +338,7 @@
</dependency>
</gbean>
- <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBean">
+ <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
@@ -380,7 +380,7 @@
</dependency>
</gbean>
- <gbean name="SSLIdentityTokenPrincipal" class="org.openejb.corba.CSSBean">
+ <gbean name="SSLIdentityTokenPrincipal" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
@@ -421,7 +421,7 @@
</dependency>
</gbean>
- <gbean name="SSLIdentityTokenCert" class="org.openejb.corba.CSSBean">
+ <gbean name="SSLIdentityTokenCert" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
@@ -462,7 +462,7 @@
</dependency>
</gbean>
- <gbean name="NoSecurityIdentityTokenPrincipal" class="org.openejb.corba.CSSBean">
+ <gbean name="NoSecurityIdentityTokenPrincipal" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
@@ -499,7 +499,7 @@
</dependency>
</gbean>
- <gbean name="NoSecurityIdentityTokenCert" class="org.openejb.corba.CSSBean">
+ <gbean name="NoSecurityIdentityTokenCert" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
@@ -536,7 +536,7 @@
</dependency>
</gbean>
- <gbean name="NoSecurity" class="org.openejb.corba.CSSBean">
+ <gbean name="NoSecurity" class="org.openejb.corba.CSSBeanGBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/project.xml?rev=415224&r1=415223&r2=415224&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/project.xml Sun Jun 18 18:17:57 2006
@@ -130,6 +130,14 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-interceptor</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-management</artifactId>
<version>${geronimo_version}</version>
<properties>
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-server/project.xml?rev=415224&r1=415223&r2=415224&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-server/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-server/project.xml Sun Jun 18 18:17:57 2006
@@ -61,6 +61,14 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-interceptor</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>${geronimo_version}</version>
<properties>
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml?rev=415224&r1=415223&r2=415224&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml Sun Jun 18 18:17:57 2006
@@ -27,6 +27,105 @@
-->
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <gbean name="StatelessEjbContainer" class="org.openejb.slsb.DefaultStatelessEjbContainerGBean">
+ <reference name="TransactionContextManager">
+ <module>*</module>
+ <name>TransactionContextManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <module>*</module>
+ <name>ConnectionTracker</name>
+ </reference>
+ <reference name="TransactedTimer">
+ <module>*</module>
+ <name>TransactionalThreadPooledTimer</name>
+ </reference>
+ <reference name="NontransactedTimer">
+ <module>*</module>
+ <name>NonTransactionalThreadPooledTimer</name>
+ </reference>
+ <attribute name="securityEnabled">true</attribute>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ <attribute name="useContextHandler">true</attribute>
+ </gbean>
+
+ <gbean name="StatefulEjbContainer" class="org.openejb.sfsb.DefaultStatefulEjbContainerGBean">
+ <reference name="TransactionContextManager">
+ <module>*</module>
+ <name>TransactionContextManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <module>*</module>
+ <name>ConnectionTracker</name>
+ </reference>
+ <attribute name="securityEnabled">true</attribute>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ <attribute name="useContextHandler">true</attribute>
+ </gbean>
+
+ <gbean name="BmpEjbContainer" class="org.openejb.entity.bmp.DefaultBmpEjbContainerGBean">
+ <reference name="TransactionContextManager">
+ <module>*</module>
+ <name>TransactionContextManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <module>*</module>
+ <name>ConnectionTracker</name>
+ </reference>
+ <reference name="TransactedTimer">
+ <module>*</module>
+ <name>TransactionalThreadPooledTimer</name>
+ </reference>
+ <reference name="NontransactedTimer">
+ <module>*</module>
+ <name>NonTransactionalThreadPooledTimer</name>
+ </reference>
+ <attribute name="securityEnabled">true</attribute>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ <attribute name="useContextHandler">true</attribute>
+ </gbean>
+
+ <gbean name="CmpEjbContainer" class="org.openejb.entity.cmp.DefaultCmpEjbContainerGBean">
+ <reference name="TransactionContextManager">
+ <module>*</module>
+ <name>TransactionContextManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <module>*</module>
+ <name>ConnectionTracker</name>
+ </reference>
+ <reference name="TransactedTimer">
+ <module>*</module>
+ <name>TransactionalThreadPooledTimer</name>
+ </reference>
+ <reference name="NontransactedTimer">
+ <module>*</module>
+ <name>NonTransactionalThreadPooledTimer</name>
+ </reference>
+ <attribute name="securityEnabled">true</attribute>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ <attribute name="useContextHandler">true</attribute>
+ </gbean>
+
+ <gbean name="MdbEjbContainer" class="org.openejb.mdb.DefaultMdbContainerGBean">
+ <reference name="TransactionContextManager">
+ <module>*</module>
+ <name>TransactionContextManager</name>
+ </reference>
+ <reference name="TrackedConnectionAssociator">
+ <module>*</module>
+ <name>ConnectionTracker</name>
+ </reference>
+ <reference name="TransactedTimer">
+ <module>*</module>
+ <name>TransactionalThreadPooledTimer</name>
+ </reference>
+ <reference name="NontransactedTimer">
+ <module>*</module>
+ <name>NonTransactionalThreadPooledTimer</name>
+ </reference>
+ <attribute name="doAsCurrentCaller">true</attribute>
+ </gbean>
<gbean name="EJBNetworkService" class="org.activeio.xnet.StandardServiceStackGBean">
<attribute name="name">EJB</attribute>
@@ -44,8 +143,8 @@
</gbean>
<gbean name="EJBServer" class="org.openejb.server.ejbd.EjbServerGBean">
- <reference name="ContainerIndex">
- <name>ContainerIndex</name>
+ <reference name="DeploymentIndex">
+ <name>DeploymentIndex</name>
</reference>
<reference name="ORBRefs">
<name>Server</name>
@@ -53,7 +152,7 @@
</gbean>
<!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
- <gbean name="ContainerIndex" class="org.openejb.ContainerIndex">
+ <gbean name="DeploymentIndex" class="org.openejb.DeploymentIndexGBean">
<references name="EJBContainers">
<pattern>
<type>StatelessSessionBean</type>
@@ -72,5 +171,4 @@
<name>MBeanServerReference</name>
</reference>
</gbean>
-
</module>
Modified: geronimo/branches/dain/openejb-2.2-merge/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/rmi-naming/project.xml?rev=415224&r1=415223&r2=415224&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/rmi-naming/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/rmi-naming/project.xml Sun Jun 18 18:17:57 2006
@@ -209,6 +209,14 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-interceptor</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
<version>${geronimo_version}</version>
</dependency>