geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r417891 [1/2] - in /geronimo/trunk: ./ configs/activemq/ configs/client-corba/ configs/client-corba/src/plan/ configs/client-deployer/ configs/client/ configs/console-jetty/ configs/j2ee-corba/src/plan/ configs/j2ee-deployer/ configs/j2ee-d...
Date Wed, 28 Jun 2006 22:45:10 GMT
Author: dain
Date: Wed Jun 28 15:45:07 2006
New Revision: 417891

URL: http://svn.apache.org/viewvc?rev=417891&view=rev
Log:
This commit is an aggregation of the commits to geronimo/branches/dain/openejb-2.2-merge, and was created with the following svn merge commane:

$ svn merge -r 415216:HEAD https://svn.apache.org/repos/asf/geronimo/branches/dain/openejb-2.2-merge

A log of the commits to the merge branch follow:

$ svn log -r HEAD:415216 https://svn.apache.org/repos/asf/geronimo/branches/dain/openejb-2.2-merge 

r417555 fix openejb checkout directory

r417321 Fix version number for openejb

r416533 Applied GERONIMO-1960 which verifies GBean references when the final configuration data is created in a deployment context.
Fixed broken openejb references
Server now starts and runs

r416483 Server now builds but doesn't start

r416428 Updated plans to reflect new openejb code.

r415721 Updated to match API changes in openejb

r415720 Updated to match new openejb module names

r415225 Set svn:ignore on new interceptor module

r415224 svn merge -r 378403:378404 https://svn.apache.org/repos/asf/geronimo/trunk@378404
Added dependencies on geronimo-interceptor
Updated the OpenEJB gbean class names

r415222 svn merge -r 378358:378359 https://svn.apache.org/repos/asf/geronimo/trunk@378359
Added additional createStatic method signature

r415220 svn merge -r 378346:378347 https://svn.apache.org/repos/asf/geronimo/trunk@378347
Added additional createStatic method signature

r415218 svn merge -r 378182:378183 https://svn.apache.org/repos/asf/geronimo/trunk@378183
Created a geronimo-interceptor package just for the interceptor API.
Nothing left in org.apache.geronimo.core anymore, though there is code
in that module still.  

r415217 svn merge -r 378161:378162 https://svn.apache.org/repos/asf/geronimo/trunk@378162
Cleaned tons of unused code.  Most of it existed around ProxyContainer, and only 5 lines of it was needed.

Added:
    geronimo/trunk/modules/interceptor/   (props changed)
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/
    geronimo/trunk/modules/interceptor/LICENSE.txt
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/LICENSE.txt
    geronimo/trunk/modules/interceptor/NOTICE.txt
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/NOTICE.txt
    geronimo/trunk/modules/interceptor/maven.xml
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/maven.xml
    geronimo/trunk/modules/interceptor/pom.xml
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/pom.xml
    geronimo/trunk/modules/interceptor/project.xml
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/project.xml
    geronimo/trunk/modules/interceptor/src/
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/
    geronimo/trunk/modules/interceptor/src/main/
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/
    geronimo/trunk/modules/interceptor/src/main/java/
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/
    geronimo/trunk/modules/interceptor/src/main/java/org/
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/
    geronimo/trunk/modules/interceptor/src/main/java/org/apache/
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/
    geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/
    geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/
    geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/Interceptor.java
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/Interceptor.java
    geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/Invocation.java
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/Invocation.java
    geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/InvocationKey.java
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/InvocationKey.java
    geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/InvocationResult.java
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/InvocationResult.java
    geronimo/trunk/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/SimpleInvocationResult.java
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/main/java/org/apache/geronimo/interceptor/SimpleInvocationResult.java
    geronimo/trunk/modules/interceptor/src/test/
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/test/
    geronimo/trunk/modules/interceptor/src/test/java/
      - copied from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/interceptor/src/test/java/
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/MarshalledMethod.java
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/MarshalledMethod.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/ReflexiveInterceptor.java
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/ReflexiveInterceptor.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/SerializableInvocation.java
      - copied unchanged from r417880, geronimo/branches/dain/openejb-2.2-merge/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/SerializableInvocation.java
Removed:
    geronimo/trunk/modules/core/src/java/org/apache/geronimo/core/service/
    geronimo/trunk/modules/core/src/java/org/apache/geronimo/proxy/
Modified:
    geronimo/trunk/configs/activemq/project.xml
    geronimo/trunk/configs/client-corba/project.xml
    geronimo/trunk/configs/client-corba/src/plan/plan.xml
    geronimo/trunk/configs/client-deployer/project.xml
    geronimo/trunk/configs/client/project.xml
    geronimo/trunk/configs/console-jetty/project.xml
    geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-deployer/project.xml
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-server/project.xml
    geronimo/trunk/configs/openejb-deployer/project.xml
    geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
    geronimo/trunk/configs/openejb/project.xml
    geronimo/trunk/configs/openejb/src/plan/plan.xml
    geronimo/trunk/configs/rmi-naming/project.xml
    geronimo/trunk/configs/system-database/project.xml
    geronimo/trunk/maven.xml
    geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
    geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/SingleElementCollection.java
    geronimo/trunk/modules/naming/project.xml
    geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/enc/EnterpriseNamingContext.java
    geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java
    geronimo/trunk/modules/security/project.xml
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptorInvoker.java
    geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManager.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/UserTransactionImpl.java
    geronimo/trunk/modules/webservices/project.xml
    geronimo/trunk/modules/webservices/src/java/org/apache/geronimo/webservices/MessageContextInvocationKey.java

Modified: geronimo/trunk/configs/activemq/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq/project.xml (original)
+++ geronimo/trunk/configs/activemq/project.xml Wed Jun 28 15:45:07 2006
@@ -34,47 +34,11 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>1</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <packaging.config.order>2</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>3</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>axis-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>4</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>client-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>5</packaging.config.order>
+                <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
 

Modified: geronimo/trunk/configs/client-corba/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-corba/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/project.xml (original)
+++ geronimo/trunk/configs/client-corba/project.xml Wed Jun 28 15:45:07 2006
@@ -41,33 +41,6 @@
                 <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>2</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>3</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>axis-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>4</packaging.config.order>
-            </properties>
-        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/trunk/configs/client-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-corba/src/plan/plan.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-corba/src/plan/plan.xml Wed Jun 28 15:45:07 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>
@@ -55,16 +54,16 @@
         <attribute name="props">
             com.sun.CORBA.ORBServerHost=${PlanORBSSLHost}
         </attribute>
-        <dependency>
+        <!--dependency>
             <name>SecurityService</name>
-        </dependency>
+        </dependenc-->
         <dependency>
             <name>CORBASystemProperties</name>
         </dependency>
     </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/trunk/configs/client-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-deployer/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/client-deployer/project.xml (original)
+++ geronimo/trunk/configs/client-deployer/project.xml Wed Jun 28 15:45:07 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/trunk/configs/client/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/client/project.xml (original)
+++ geronimo/trunk/configs/client/project.xml Wed Jun 28 15:45:07 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/trunk/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-jetty/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.xml (original)
+++ geronimo/trunk/configs/console-jetty/project.xml Wed Jun 28 15:45:07 2006
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>openejb-deployer</artifactId>
+            <artifactId>axis-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>axis-deployer</artifactId>
+            <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>

Modified: geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml Wed Jun 28 15:45:07 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/trunk/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-deployer/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/project.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/project.xml Wed Jun 28 15:45:07 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/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Wed Jun 28 15:45:07 2006
@@ -22,6 +22,7 @@
     <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
         <!--domain set to wildcard so datasources may be deployed independently on client. -->
         <!--a better solution is to get the domain and server from the parent module -->
+        <attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
         <attribute name="transactionContextManagerAbstractName">?name=TransactionContextManager</attribute>
         <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
         <attribute name="transactionalTimerAbstractName">?name=TransactionalThreadPooledTimer</attribute>

Modified: geronimo/trunk/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-server/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/j2ee-server/project.xml Wed Jun 28 15:45:07 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/trunk/configs/openejb-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb-deployer/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/project.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/project.xml Wed Jun 28 15:45:07 2006
@@ -39,7 +39,7 @@
                 <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
-        
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml Wed Jun 28 15:45:07 2006
@@ -17,12 +17,14 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
-
-    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
+    <gbean name="EJBBuilder" class="org.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>
@@ -57,8 +59,12 @@
     <gbean name="CSSAttributeBuilder" class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
     <gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
 
-    <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
-    <gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEJBReferenceBuilder"/>
+    <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEjbReferenceBuilder">
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanOpenEJBPort}</attribute>
+    </gbean>
+
+    <gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEjbReferenceBuilder"/>
     <gbean name="WebServiceEJBLinkTemplate" class="org.openejb.server.axis.WSContainerGBean"/>
 
 </module>

Modified: geronimo/trunk/configs/openejb/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/project.xml (original)
+++ geronimo/trunk/configs/openejb/project.xml Wed Jun 28 15:45:07 2006
@@ -68,7 +68,7 @@
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <geronimo.dependency>true</geronimo.dependency>
+                <geronimo.import>true</geronimo.import>
             </properties>
         </dependency>
 

Modified: geronimo/trunk/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb/src/plan/plan.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb/src/plan/plan.xml Wed Jun 28 15:45:07 2006
@@ -27,6 +27,87 @@
 
 -->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+  <gbean name="StatelessEjbContainer" class="org.openejb.slsb.DefaultStatelessEjbContainerGBean">
+    <reference name="TransactionContextManager">
+      <name>TransactionContextManager</name>
+    </reference>
+    <reference name="TrackedConnectionAssociator">
+      <name>ConnectionTracker</name>
+    </reference>
+    <reference name="TransactedTimer">
+      <name>TransactionalThreadPooledTimer</name>
+    </reference>
+    <reference name="NontransactedTimer">
+      <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">
+      <name>TransactionContextManager</name>
+    </reference>
+    <reference name="TrackedConnectionAssociator">
+      <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">
+      <name>TransactionContextManager</name>
+    </reference>
+    <reference name="TrackedConnectionAssociator">
+      <name>ConnectionTracker</name>
+    </reference>
+    <reference name="TransactedTimer">
+      <name>TransactionalThreadPooledTimer</name>
+    </reference>
+    <reference name="NontransactedTimer">
+      <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">
+      <name>TransactionContextManager</name>
+    </reference>
+    <reference name="TrackedConnectionAssociator">
+      <name>ConnectionTracker</name>
+    </reference>
+    <reference name="TransactedTimer">
+      <name>TransactionalThreadPooledTimer</name>
+    </reference>
+    <reference name="NontransactedTimer">
+      <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">
+      <name>TransactionContextManager</name>
+    </reference>
+    <reference name="TrackedConnectionAssociator">
+      <name>ConnectionTracker</name>
+    </reference>
+    <reference name="TransactedTimer">
+      <name>TransactionalThreadPooledTimer</name>
+    </reference>
+    <reference name="NontransactedTimer">
+      <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 +125,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,8 +134,8 @@
   </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">
-      <references name="EJBContainers">
+  <gbean name="DeploymentIndex" class="org.openejb.DeploymentIndexGBean">
+      <references name="EjbDeployments">
           <pattern>
               <type>StatelessSessionBean</type>
           </pattern>
@@ -67,10 +148,9 @@
       </references>
   </gbean>
 
-  <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB">
+  <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJBGBean">
       <reference name="MBeanServerReference">
           <name>MBeanServerReference</name>
       </reference>
   </gbean>
-
 </module>

Modified: geronimo/trunk/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/rmi-naming/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/project.xml (original)
+++ geronimo/trunk/configs/rmi-naming/project.xml Wed Jun 28 15:45:07 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>

Modified: geronimo/trunk/configs/system-database/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/system-database/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/project.xml (original)
+++ geronimo/trunk/configs/system-database/project.xml Wed Jun 28 15:45:07 2006
@@ -34,47 +34,11 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>1</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <packaging.config.order>2</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>client-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>3</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>4</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>axis-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>5</packaging.config.order>
+                <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
 

Modified: geronimo/trunk/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/maven.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/maven.xml (original)
+++ geronimo/trunk/maven.xml Wed Jun 28 15:45:07 2006
@@ -44,7 +44,7 @@
     </goal>
 
     <goal name="new2">
-        <maven:reactor basedir="${basedir}" includes="openejb/modules/core/project.xml,openejb/modules/pkgen-builder/project.xml,openejb/modules/openejb-builder/project.xml"
+        <maven:reactor basedir="${basedir}" includes="openejb/modules/openejb-core/project.xml,openejb/modules/openejb-pkgen-builder/project.xml,openejb/modules/openejb-builder/project.xml"
             excludes="" goals="multiproject:install-callback" banner="openejb" ignoreFailures="false" />
     </goal>
 

Modified: geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Wed Jun 28 15:45:07 2006
@@ -363,6 +363,7 @@
                     earContext.getConfigurationManager(),
                     null, //no server name needed on client
                     clientBaseName,
+                    null,
                     transactionContextManagerObjectName,
                     connectionTrackerObjectName,
                     null,

Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Wed Jun 28 15:45:07 2006
@@ -72,13 +72,13 @@
 import org.apache.geronimo.kernel.config.NullConfigurationStore;
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.ArtifactManager;
+import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
 import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.ImportType;
 import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.kernel.repository.ArtifactManager;
-import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.tranql.sql.jdbc.JDBCUtil;
 
@@ -151,7 +151,7 @@
     private Kernel kernel;
     private EditableConfigurationManager configurationManager;
     private static final Naming naming = new Jsr77Naming();
-    private static final Artifact bootId = new Artifact("test", "test", "", "car");
+    private static final Artifact bootId = new Artifact("test", "test", "42", "car");
 
     private static final AbstractNameQuery connectionTrackerName = new AbstractNameQuery(null, Collections.singletonMap("name", "ConnectionTracker"));
     private AbstractName serverName;
@@ -162,18 +162,24 @@
         JarFile rarFile = null;
         try {
             rarFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear-noger.ear"));
-            EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment, transactionContextManagerName, connectionTrackerName, null, null, null, new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()), null, null, ejbReferenceBuilder, null,
+
+            EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment, null, transactionContextManagerName, connectionTrackerName, null, null, null, new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()), null, null, ejbReferenceBuilder, null,
                     new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching),
                     resourceReferenceBuilder, null, serviceReferenceBuilder, kernel.getNaming());
             ConfigurationData configData = null;
             DeploymentContext context = null;
             ArtifactManager artifactManager = new DefaultArtifactManager();
             ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.EMPTY_SET, null);
+
             try {
                 File planFile = new File(basedir, "src/test-data/data/external-application-plan.xml");
                 ModuleIDBuilder idBuilder = new ModuleIDBuilder();
                 Object plan = configBuilder.getDeploymentPlan(planFile, rarFile, idBuilder);
                 context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, rarFile, idBuilder), plan, rarFile, Collections.singleton(configurationStore), artifactResolver, configurationStore);
+
+                // add the a j2ee server so the application context reference can be resolved
+                context.addGBean("geronimo", J2EEServerImpl.GBEAN_INFO);
+
                 configData = context.getConfigurationData();
             } finally {
                 if (context != null) {
@@ -352,8 +358,6 @@
             File tempDir = null;
             try {
                 tempDir = DeploymentUtil.createTempDir();
-                ArtifactManager artifactManager = new DefaultArtifactManager();
-                ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.EMPTY_SET, null);
                 EARContext earContext = new EARContext(tempDir,
                         null,
                         module.getEnvironment(),
@@ -363,6 +367,7 @@
                         Collections.EMPTY_SET,
                         new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()),
                         module.getModuleName(), //hardcode standalone here.
+                        null,
                         transactionContextManagerName,
                         connectionTrackerName,
                         null,

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java Wed Jun 28 15:45:07 2006
@@ -48,6 +48,8 @@
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.ReferencePatterns;
+import org.apache.geronimo.gbean.GReferenceInfo;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Naming;
@@ -57,7 +59,6 @@
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 
 /**
@@ -151,6 +152,11 @@
         configuration.addGBean(gbean);
     }
 
+    public void removeGBean(AbstractName name) throws GBeanNotFoundException {
+        if (name == null) throw new NullPointerException("name is null");
+        configuration.removeGBean(name);
+    }
+
     public Set getGBeanNames() {
         return new HashSet(configuration.getGBeans().keySet());
     }
@@ -363,7 +369,18 @@
         childConfigurationDatas.put(moduleName, configurationData);
     }
 
-    public ConfigurationData getConfigurationData() {
+    public ConfigurationData getConfigurationData() throws DeploymentException {
+        List failures = verify();
+        if (!failures.isEmpty()) {
+            StringBuffer message = new StringBuffer();
+            for (Iterator iterator = failures.iterator(); iterator.hasNext();) {
+                String failure = (String) iterator.next();
+                if (message.length() > 0) message.append("\n");
+                message.append(failure);
+            }
+            throw new DeploymentException(message.toString());
+        }
+
         ConfigurationData configurationData = new ConfigurationData(configuration.getModuleType(),
                 new LinkedHashSet(configuration.getClassPath()),
                 new ArrayList(configuration.getGBeans().values()),
@@ -377,7 +394,7 @@
             ConfigurationData ownedConfiguration = (ConfigurationData) iterator.next();
             configurationData.addOwnedConfigurations(ownedConfiguration.getId());
         }
-        
+
         return configurationData;
     }
 
@@ -387,5 +404,81 @@
 
     public List getAdditionalDeployment() {
         return additionalDeployment;
+    }
+
+    public List verify() throws DeploymentException {
+        List failures = new ArrayList();
+        for (Iterator iterator = configuration.getGBeans().entrySet().iterator(); iterator.hasNext();) {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            AbstractName name = (AbstractName) entry.getKey();
+            GBeanData gbean = (GBeanData) entry.getValue();
+
+            for (Iterator iterator1 = gbean.getReferences().entrySet().iterator(); iterator1.hasNext();) {
+                Map.Entry referenceEntry = (Map.Entry) iterator1.next();
+                String referenceName = (String) referenceEntry.getKey();
+                ReferencePatterns referencePatterns = (ReferencePatterns) referenceEntry.getValue();
+
+                String failure = verifyReference(gbean, referenceName, referencePatterns);
+                if (failure != null) {
+                    failures.add(failure);
+                }
+            }
+
+            for (Iterator iterator1 = gbean.getDependencies().iterator(); iterator1.hasNext();) {
+                ReferencePatterns referencePatterns = (ReferencePatterns) iterator1.next();
+                String failure = verifyDependency(name, referencePatterns);
+                if (failure != null) {
+                    failures.add(failure);
+                }
+            }
+        }
+        return failures;
+    }
+
+    private String verifyReference(GBeanData gbean, String referenceName, ReferencePatterns referencePatterns) {
+        GReferenceInfo referenceInfo = gbean.getGBeanInfo().getReference(referenceName);
+
+        // if there is no reference info we can't verify
+        if (referenceInfo == null) return null;
+
+        // A collection valued reference doesn't need to be verified
+        if (referenceInfo.getProxyType().equals(Collection.class.getName())) return null;
+
+        if (!isVerifyReference(referencePatterns)) {
+            return "Unable to resolve reference \"" + referenceName + "\" in gbean " +
+                    gbean.getAbstractName() + " to a gbean matching the pattern " + referencePatterns.getPatterns();
+        }
+        return null;
+    }
+
+    private String verifyDependency(AbstractName name, ReferencePatterns referencePatterns) {
+        if (!isVerifyReference(referencePatterns)) {
+            return "Unable to resolve dependency in gbean " + name +
+                    " to a gbean matching the pattern " + referencePatterns.getPatterns();
+        }
+
+        return null;
+    }
+
+    private boolean isVerifyReference(ReferencePatterns referencePatterns) {
+        // we can't verify a resolved reference since it will have a specific artifact already set...
+        // hopefully the deployer won't generate bad resolved references
+        if (referencePatterns.isResolved()) return true;
+
+        // Do not verify the reference if it has an explicit depenency on another artifact, because it it likely
+        // that the other artifact is not in the "environment" (if it were you wouldn't use the long form)
+        Set patterns = referencePatterns.getPatterns();
+        for (Iterator iterator = patterns.iterator(); iterator.hasNext();) {
+            AbstractNameQuery query = (AbstractNameQuery) iterator.next();
+            if (query.getArtifact() != null) return true;
+        }
+
+        // attempt to find the bean
+        try {
+            findGBean(patterns);
+            return true;
+        } catch (GBeanNotFoundException e) {
+            return false;
+        }
     }
 }

Propchange: geronimo/trunk/modules/interceptor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 28 15:45:07 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Wed Jun 28 15:45:07 2006
@@ -61,25 +61,23 @@
 import org.apache.geronimo.gbean.SingleElementCollection;
 import org.apache.geronimo.j2ee.ApplicationInfo;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.management.impl.J2EEApplicationImpl;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.SimpleConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.SimpleConfigurationManager;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.management.J2EEServer;
 import org.apache.geronimo.management.J2EEResource;
+import org.apache.geronimo.management.J2EEServer;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.security.deployment.SecurityBuilder;
 import org.apache.geronimo.security.deployment.SecurityConfiguration;
@@ -114,6 +112,7 @@
 
     private final Environment defaultEnvironment;
     private final AbstractNameQuery serverName;
+    private final AbstractNameQuery transactionManagerObjectName;
     private final AbstractNameQuery transactionContextManagerObjectName;
     private final AbstractNameQuery connectionTrackerObjectName;
     private final AbstractNameQuery transactionalTimerObjectName;
@@ -121,8 +120,8 @@
     private final AbstractNameQuery corbaGBeanObjectName;
     private final Naming naming;
 
-
     public EARConfigBuilder(Environment defaultEnvironment,
+            AbstractNameQuery transactionManagerAbstractName,
             AbstractNameQuery transactionContextManagerAbstractName,
             AbstractNameQuery connectionTrackerAbstractName,
             AbstractNameQuery transactionalTimerAbstractName,
@@ -139,6 +138,7 @@
             Collection serviceReferenceBuilder,
             Kernel kernel) {
         this(defaultEnvironment,
+                transactionManagerAbstractName,
                 transactionContextManagerAbstractName,
                 connectionTrackerAbstractName,
                 transactionalTimerAbstractName,
@@ -157,6 +157,7 @@
                 kernel.getNaming());
     }
     public EARConfigBuilder(Environment defaultEnvironment,
+            AbstractNameQuery transactionManagerAbstractName,
             AbstractNameQuery transactionContextManagerAbstractName,
             AbstractNameQuery connectionTrackerAbstractName,
             AbstractNameQuery transactionalTimerAbstractName,
@@ -173,6 +174,7 @@
             ServiceReferenceBuilder serviceReferenceBuilder,
             Naming naming) {
         this(defaultEnvironment,
+                transactionManagerAbstractName,
                 transactionContextManagerAbstractName,
                 connectionTrackerAbstractName,
                 transactionalTimerAbstractName,
@@ -192,6 +194,7 @@
     }
 
     private EARConfigBuilder(Environment defaultEnvironment,
+            AbstractNameQuery transactionManagerAbstractName,
             AbstractNameQuery transactionContextManagerAbstractName,
             AbstractNameQuery connectionTrackerAbstractName,
             AbstractNameQuery transactionalTimerAbstractName,
@@ -219,6 +222,7 @@
         this.connectorConfigBuilder = connectorConfigBuilder;
         this.appClientConfigBuilder = appClientConfigBuilder;
         this.serviceReferenceBuilder = serviceReferenceBuilder;
+        this.transactionManagerObjectName = transactionManagerAbstractName;
         this.transactionContextManagerObjectName = transactionContextManagerAbstractName;
         this.connectionTrackerObjectName = connectionTrackerAbstractName;
         this.transactionalTimerObjectName = transactionalTimerAbstractName;
@@ -455,6 +459,7 @@
                     repositories,
                     serverName,
                     applicationInfo.getBaseName(),
+                    transactionManagerObjectName,
                     transactionContextManagerObjectName,
                     connectionTrackerObjectName,
                     transactionalTimerObjectName,
@@ -915,6 +920,7 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EARConfigBuilder.class, NameFactory.CONFIG_BUILDER);
         infoFactory.addAttribute("defaultEnvironment", Environment.class, true, true);
+        infoFactory.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class, true);
         infoFactory.addAttribute("transactionContextManagerAbstractName", AbstractNameQuery.class, true);
         infoFactory.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class, true);
         infoFactory.addAttribute("transactionalTimerAbstractName", AbstractNameQuery.class, true);
@@ -937,6 +943,7 @@
 
         infoFactory.setConstructor(new String[]{
                 "defaultEnvironment",
+                "transactionManagerAbstractName",
                 "transactionContextManagerAbstractName",
                 "connectionTrackerAbstractName",
                 "transactionalTimerAbstractName",

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java Wed Jun 28 15:45:07 2006
@@ -29,14 +29,13 @@
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.security.deployment.SecurityConfiguration;
 
 /**
  * @version $Rev:386276 $ $Date$
  */
 public class EARContext extends DeploymentContext {
-
+    private final AbstractNameQuery transactionManagerObjectName;
     private final AbstractNameQuery transactionContextManagerObjectName;
     private final AbstractNameQuery connectionTrackerObjectName;
 
@@ -61,6 +60,7 @@
             ConfigurationManager configurationManager, Collection repositories,
             AbstractNameQuery serverName,
             AbstractName baseName,
+            AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery transactionContextManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery transactedTimerName,
@@ -68,10 +68,10 @@
             AbstractNameQuery corbaGBeanObjectName,
             RefContext refContext) throws DeploymentException {
         super(baseDir, inPlaceConfigurationDir, environment, moduleType, naming, configurationManager, repositories);
-        
+
         moduleName = baseName;
         this.serverName = serverName;
-
+        this.transactionManagerObjectName = transactionManagerObjectName;
         this.transactionContextManagerObjectName = transactionContextManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
         this.transactedTimerName = transactedTimerName;
@@ -88,6 +88,7 @@
             ConfigurationManager configurationManager,
             AbstractNameQuery serverName,
             AbstractName baseName,
+            AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery transactionContextManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery transactedTimerName,
@@ -99,6 +100,7 @@
         moduleName = baseName;
         this.serverName = serverName;
 
+        this.transactionManagerObjectName = transactionManagerObjectName;
         this.transactionContextManagerObjectName = transactionContextManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
         this.transactedTimerName = transactedTimerName;
@@ -112,6 +114,7 @@
         moduleName = baseName;
         this.serverName = parent.getServerName();
 
+        this.transactionManagerObjectName = parent.getTransactionManagerObjectName();
         this.transactionContextManagerObjectName = parent.getTransactionContextManagerObjectName();
         this.connectionTrackerObjectName = parent.getConnectionTrackerObjectName();
         this.transactedTimerName = parent.getTransactedTimerName();
@@ -122,6 +125,10 @@
 
     public AbstractNameQuery getServerName() {
         return serverName;
+    }
+
+    public AbstractNameQuery getTransactionManagerObjectName() {
+        return transactionManagerObjectName;
     }
 
     public AbstractNameQuery getTransactionContextManagerObjectName() {

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java Wed Jun 28 15:45:07 2006
@@ -28,9 +28,11 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev: 385487 $ $Date$
+ * @version $Rev$ $Date$
  */
 public class EJBModule extends Module {
+    private AbstractName moduleCmpEngineName;
+
     public EJBModule(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
         super(standAlone, moduleName, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
     }
@@ -41,6 +43,14 @@
 
     public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {
         context.addClass(location, fqcn, bytes);
+    }
+
+    public AbstractName getModuleCmpEngineName() {
+        return moduleCmpEngineName;
+    }
+
+    public void setModuleCmpEngineName(AbstractName moduleCmpEngineName) {
+        this.moduleCmpEngineName = moduleCmpEngineName;
     }
 }
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Wed Jun 28 15:45:07 2006
@@ -42,6 +42,7 @@
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
 import org.apache.geronimo.kernel.Jsr77Naming;
 import org.apache.geronimo.kernel.Naming;
 import org.apache.geronimo.kernel.config.ConfigurationData;
@@ -99,6 +100,7 @@
     private Environment defaultParentId;
     private static String contextRoot = "test";
     private static final Map portMap = null;
+    private final AbstractNameQuery transactionManagerAbstractNameQuery = new AbstractNameQuery(transactionManagerObjectName, null);
     private final AbstractNameQuery transactionContextManagerAbstractNameQuery = new AbstractNameQuery(transactionManagerObjectName, null);
     private final AbstractNameQuery connectionTrackerAbstractNameQuery = new AbstractNameQuery(connectionTrackerObjectName, null);
     private final AbstractNameQuery transactionalTimerAbstractNameQuery = new AbstractNameQuery(transactionalTimerObjectName, null);
@@ -259,6 +261,7 @@
         DeploymentContext context = null;
         try {
             EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
+                    transactionManagerAbstractNameQuery,
                     transactionContextManagerAbstractNameQuery,
                     connectionTrackerAbstractNameQuery,
                     transactionalTimerAbstractNameQuery,
@@ -277,7 +280,7 @@
 
             Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
-            configurationData = context.getConfigurationData();
+            configurationData = getConfigurationData(context);
         } finally {
             if (context != null) {
                 context.close();
@@ -290,6 +293,7 @@
 
     public void testBadEJBJARConfiguration() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
+                transactionManagerAbstractNameQuery,
                 transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
@@ -311,7 +315,7 @@
         try {
             Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-ejb-jar.xml"), earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
-            configurationData = context.getConfigurationData();
+            configurationData = getConfigurationData(context);
             fail("Should have thrown a DeploymentException");
         } catch (DeploymentException e) {
             if (e.getCause() instanceof IOException) {
@@ -329,6 +333,7 @@
 
     public void testBadWARConfiguration() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
+                transactionManagerAbstractNameQuery,
                 transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
@@ -350,7 +355,7 @@
         try {
             Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-war.xml"), earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
-            configurationData = context.getConfigurationData();
+            configurationData = getConfigurationData(context);
             fail("Should have thrown a DeploymentException");
         } catch (DeploymentException e) {
             if (e.getCause() instanceof IOException) {
@@ -368,6 +373,7 @@
 
     public void testBadRARConfiguration() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
+                transactionManagerAbstractNameQuery,
                 transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
@@ -389,7 +395,7 @@
         try {
             Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-rar.xml"), earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
-            configurationData = context.getConfigurationData();
+            configurationData = getConfigurationData(context);
             fail("Should have thrown a DeploymentException");
         } catch (DeploymentException e) {
             if (e.getCause() instanceof IOException) {
@@ -407,6 +413,7 @@
 
     public void testBadCARConfiguration() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
+                transactionManagerAbstractNameQuery,
                 transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
@@ -428,7 +435,7 @@
         try {
             Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-car.xml"), earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
-            configurationData = context.getConfigurationData();
+            configurationData = getConfigurationData(context);
             fail("Should have thrown a DeploymentException");
         } catch (DeploymentException e) {
             if (e.getCause() instanceof IOException) {
@@ -446,6 +453,7 @@
 
     public void testNoEJBDeployer() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
+                transactionManagerAbstractNameQuery,
                 transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
@@ -468,7 +476,7 @@
         try {
             Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
-            configurationData = context.getConfigurationData();
+            configurationData = getConfigurationData(context);
             fail("Should have thrown a DeploymentException");
         } catch (DeploymentException e) {
             // expected
@@ -484,6 +492,7 @@
 
     public void testNoWARDeployer() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
+                transactionManagerAbstractNameQuery,
                 transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
@@ -505,7 +514,7 @@
         try {
             Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
-            configurationData = context.getConfigurationData();
+            configurationData = getConfigurationData(context);
             fail("Should have thrown a DeploymentException");
         } catch (DeploymentException e) {
             // expected
@@ -521,6 +530,7 @@
 
     public void testNoConnectorDeployer() throws Exception {
         EARConfigBuilder configBuilder = new EARConfigBuilder(defaultParentId,
+                transactionManagerAbstractNameQuery,
                 transactionContextManagerAbstractNameQuery,
                 connectionTrackerAbstractNameQuery,
                 transactionalTimerAbstractNameQuery,
@@ -542,7 +552,7 @@
         try {
             Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
             context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
-            configurationData = context.getConfigurationData();
+            configurationData = getConfigurationData(context);
             fail("Should have thrown a DeploymentException");
         } catch (DeploymentException e) {
             // expected
@@ -554,6 +564,13 @@
                 DeploymentUtil.recursiveDelete(configurationData.getConfigurationDir());
             }
         }
+    }
+
+    private ConfigurationData getConfigurationData(DeploymentContext context) throws Exception {
+        // add the a j2ee server so the application context reference can be resolved
+        context.addGBean("geronimo", J2EEServerImpl.GBEAN_INFO);
+
+        return context.getConfigurationData();
     }
 
     private static void close(Module module) {

Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Wed Jun 28 15:45:07 2006
@@ -186,6 +186,7 @@
                 repositories,
                 new AbstractNameQuery(serverName),
                 moduleName,
+                null,
                 new AbstractNameQuery(tcmName),
                 new AbstractNameQuery(ctcName),
                 null,

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java Wed Jun 28 15:45:07 2006
@@ -85,6 +85,19 @@
         return createStatic(sourceClass, gbeanType.getName(), gbeanType, null, j2eeType);
     }
 
+    public static GBeanInfoBuilder createStatic(Class sourceClass, Class gbeanType, GBeanInfo source, String j2eeType) {
+        if (sourceClass == null) throw new NullPointerException("sourceClass is null");
+        if (gbeanType == null) throw new NullPointerException("gbeanType is null");
+        return createStatic(sourceClass, gbeanType.getName(), gbeanType, source, j2eeType);
+    }
+
+    public static GBeanInfoBuilder createStatic(Class sourceClass, String name, Class gbeanType, String j2eeType) {
+        if (sourceClass == null) throw new NullPointerException("sourceClass is null");
+        if (name == null) throw new NullPointerException("name is null");
+        if (gbeanType == null) throw new NullPointerException("gbeanType is null");
+        return createStatic(sourceClass, name, gbeanType, null, j2eeType);
+    }
+
     public static GBeanInfoBuilder createStatic(Class sourceClass, String name, Class gbeanType, GBeanInfo source, String j2eeType) {
         if (sourceClass == null) throw new NullPointerException("sourceClass is null");
         if (name == null) throw new NullPointerException("name is null");

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/SingleElementCollection.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/SingleElementCollection.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/SingleElementCollection.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/SingleElementCollection.java Wed Jun 28 15:45:07 2006
@@ -38,7 +38,7 @@
 
     public SingleElementCollection(Collection collection) {
         if (collection == null) {
-            throw new IllegalArgumentException("No collection parameter supplied");
+            collection = Collections.EMPTY_SET;            
         }
 
         this.collection = collection;

Modified: geronimo/trunk/modules/naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/naming/project.xml (original)
+++ geronimo/trunk/modules/naming/project.xml Wed Jun 28 15:45:07 2006
@@ -46,7 +46,7 @@
         <!-- only for ComponentContextInterceptor -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-core</artifactId>
+            <artifactId>geronimo-interceptor</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
 

Modified: geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/enc/EnterpriseNamingContext.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/enc/EnterpriseNamingContext.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/enc/EnterpriseNamingContext.java (original)
+++ geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/enc/EnterpriseNamingContext.java Wed Jun 28 15:45:07 2006
@@ -17,16 +17,21 @@
 
 package org.apache.geronimo.naming.enc;
 
-import javax.naming.Context;
-import javax.naming.LinkRef;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.Reference;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import javax.naming.Context;
+import javax.naming.LinkRef;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.transaction.UserTransaction;
+
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.naming.reference.ClassLoaderAwareReference;
+import org.apache.geronimo.naming.reference.KernelAwareReference;
 
 /**
  * @version $Rev$ $Date$
@@ -35,6 +40,30 @@
     private final Map localBindings;
 
     private final Map globalBindings;
+
+    public static Context createEnterpriseNamingContext(Map componentContext, UserTransaction userTransaction, Kernel kernel, ClassLoader classLoader) throws NamingException {
+        Map map = new HashMap();
+        if (componentContext != null) {
+            map.putAll(componentContext);
+        }
+
+        for (Iterator iterator = map.values().iterator(); iterator.hasNext();) {
+            Object value = iterator.next();
+            if (value instanceof KernelAwareReference) {
+                ((KernelAwareReference) value).setKernel(kernel);
+            }
+            if (value instanceof ClassLoaderAwareReference) {
+                ((ClassLoaderAwareReference) value).setClassLoader(classLoader);
+            }
+        }
+
+        if (userTransaction != null) {
+            map.put("UserTransaction", userTransaction);
+        }
+
+        Context enc = EnterpriseNamingContext.createEnterpriseNamingContext(map);
+        return enc;
+    }
 
     public static Context createEnterpriseNamingContext(Map context) throws NamingException {
         return new EnterpriseNamingContext(context);

Modified: geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java (original)
+++ geronimo/trunk/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextInterceptor.java Wed Jun 28 15:45:07 2006
@@ -17,16 +17,11 @@
 
 package org.apache.geronimo.naming.java;
 
-import java.util.Properties;
-import java.util.Iterator;
-import java.util.Map;
 import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 
-import org.apache.geronimo.core.service.Interceptor;
-import org.apache.geronimo.core.service.Invocation;
-import org.apache.geronimo.core.service.InvocationResult;
+import org.apache.geronimo.interceptor.Interceptor;
+import org.apache.geronimo.interceptor.Invocation;
+import org.apache.geronimo.interceptor.InvocationResult;
 
 /**
  * An interceptor that pushes the current component's java:comp context into

Modified: geronimo/trunk/modules/security/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/security/project.xml?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/security/project.xml (original)
+++ geronimo/trunk/modules/security/project.xml Wed Jun 28 15:45:07 2006
@@ -60,6 +60,7 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-core</artifactId>
+            <artifactId>geronimo-interceptor</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
 

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/InvocationSupport.java Wed Jun 28 15:45:07 2006
@@ -20,8 +20,9 @@
 import java.io.Serializable;
 import java.net.URI;
 
-import org.apache.geronimo.core.service.Invocation;
-import org.apache.geronimo.core.service.InvocationKey;
+import org.apache.geronimo.interceptor.Invocation;
+import org.apache.geronimo.interceptor.InvocationKey;
+
 /**
  * @version $Rev$ $Date$
  */
@@ -47,7 +48,7 @@
     public static void putInvocationType(Invocation invocation, InvocationType type) {
         invocation.put(INVOCATION_TYPE, type);
     }
-    
+
     private final transient String name;
     private final int ordinal;
 
@@ -82,9 +83,9 @@
         }
         return false;
     }
-    
+
     /**
-     * @see org.apache.geronimo.core.service.InvocationKey#isTransient()
+     * @see org.apache.geronimo.interceptor.InvocationKey#isTransient()
      */
     public boolean isTransient() {
         return true;

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java Wed Jun 28 15:45:07 2006
@@ -20,8 +20,8 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.lang.reflect.Proxy;
 
-import org.apache.geronimo.proxy.ProxyContainer;
 import org.apache.geronimo.security.jaas.server.JaasLoginServiceMBean;
 
 
@@ -49,9 +49,8 @@
 
         // Setup the client side container..
         RequestChannelInterceptor remoteInterceptor = new RequestChannelInterceptor(target, cl);
-        ProxyContainer clientContainer = new ProxyContainer(remoteInterceptor);
-        return (JaasLoginServiceMBean) clientContainer.createProxy(cl , new Class[]{JaasLoginServiceMBean.class});
-
+        Class[] interfaces = new Class[]{JaasLoginServiceMBean.class};
+        return (JaasLoginServiceMBean) Proxy.newProxyInstance(cl, interfaces, remoteInterceptor);
     }
 
 }

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java?rev=417891&r1=417890&r2=417891&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java Wed Jun 28 15:45:07 2006
@@ -43,7 +43,6 @@
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.kernel.ObjectNameUtil;
 import org.apache.geronimo.management.geronimo.NetworkConnector;
-import org.apache.geronimo.proxy.ReflexiveInterceptor;
 import org.apache.geronimo.security.jaas.server.JaasLoginServiceMBean;
 
 



Mime
View raw message