geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r442665 [1/4] - in /geronimo/server/branches/sachin: ./ applications/magicGball/magicGball-ear/src/main/plan/ assemblies/geronimo-boilerplate-minimal/ configs/axis-deployer/src/plan/ configs/client-deployer/src/plan/ configs/client/ configs...
Date Tue, 12 Sep 2006 18:15:29 GMT
Author: sppatel
Date: Tue Sep 12 11:15:24 2006
New Revision: 442665

URL: http://svn.apache.org/viewvc?view=rev&rev=442665
Log:
merge from head

Added:
    geronimo/server/branches/sachin/applications/magicGball/magicGball-ear/src/main/plan/
      - copied from r442660, geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/
    geronimo/server/branches/sachin/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
      - copied unchanged from r442660, geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
    geronimo/server/branches/sachin/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml
      - copied unchanged from r442660, geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml
    geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ActivationSpecInfoLocator.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ActivationSpecInfoLocator.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/CorbaGBeanNameSource.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/CorbaGBeanNameSource.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/HandlerInfoInfo.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/HandlerInfoInfo.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollectionGBean.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollectionGBean.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/CorbaRefBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/CorbaRefBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/GBeanRefBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/PersistenceContextRefBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/PersistenceContextRefBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UnavailableRefBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UnavailableRefBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UserTransactionRefBuilder.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/UserTransactionRefBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/connector/
      - copied from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/connector/
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/connector/deployment/
      - copied from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/connector/deployment/
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
    geronimo/server/branches/sachin/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/PersistenceContextReference.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/reference/PersistenceContextReference.java
    geronimo/server/branches/sachin/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/Closeable.java
      - copied unchanged from r442660, geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/Closeable.java
Removed:
    geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/schema/geronimo-application-client-1.0.xsd
    geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/schema/geronimo-application-client-1.1.xsd
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/schema/geronimo-connector-1.0.xsd
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/schema/geronimo-connector-1.1.xsd
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/TimedOutPooledExecutor.java
    geronimo/server/branches/sachin/modules/geronimo-core/src/main/java/org/apache/geronimo/pool/ClockPool.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/RefContext.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ResourceReferenceBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ServiceReferenceBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableServiceReferenceBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/schema/geronimo-application-1.0.xsd
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/schema/geronimo-application-1.1.xsd
    geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/main/schema/geronimo-jetty-1.0.xsd
    geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/main/schema/geronimo-jetty-1.1.xsd
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/schema/geronimo-naming-1.0.xsd
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/schema/geronimo-naming-1.1.xsd
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/MessageDestinationTest.java
    geronimo/server/branches/sachin/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/java/ComponentContextBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-naming/src/test/java/org/apache/geronimo/naming/java/ContextBuilderTest.java
    geronimo/server/branches/sachin/modules/geronimo-security-builder/src/main/schema/geronimo-login-config-1.0.xsd
    geronimo/server/branches/sachin/modules/geronimo-security-builder/src/main/schema/geronimo-login-config-1.1.xsd
    geronimo/server/branches/sachin/modules/geronimo-security-builder/src/main/schema/geronimo-security-1.1.xsd
    geronimo/server/branches/sachin/modules/geronimo-service-builder/src/main/schema/geronimo-config-1.0.xsd
    geronimo/server/branches/sachin/modules/geronimo-service-builder/src/main/schema/geronimo-module-1.1.xsd
    geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/src/main/schema/geronimo-tomcat-1.0.xsd
    geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/src/main/schema/geronimo-tomcat-1.1.xsd
    geronimo/server/branches/sachin/modules/geronimo-web-builder/src/main/schema/geronimo-web-1.0.xsd
    geronimo/server/branches/sachin/modules/geronimo-web-builder/src/main/schema/geronimo-web-1.1.xsd
Modified:
    geronimo/server/branches/sachin/BUILDING.txt
    geronimo/server/branches/sachin/all_changes.log
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/client/pom.xml
    geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/j2ee-system/pom.xml
    geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/openejb/pom.xml
    geronimo/server/branches/sachin/configs/openejb/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/rmi-naming/pom.xml
    geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/unavailable-ejb-deployer/src/plan/plan.xml
    geronimo/server/branches/sachin/configs/unavailable-webservices-deployer/src/plan/plan.xml
    geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
    geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/NullWorkExecutorPool.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/ScheduleWorkExecutor.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/StartWorkExecutor.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/SyncWorkExecutor.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutor.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutorPool.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/pool/WorkExecutorPoolImpl.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/work/PooledWorkManagerTest.java
    geronimo/server/branches/sachin/modules/geronimo-core/src/main/java/org/apache/geronimo/pool/GeronimoExecutor.java
    geronimo/server/branches/sachin/modules/geronimo-core/src/main/java/org/apache/geronimo/pool/ThreadPool.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/server/branches/sachin/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
    geronimo/server/branches/sachin/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/JettyWebAppContext.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/schema/geronimo-naming-1.2.xsd
    geronimo/server/branches/sachin/modules/geronimo-security/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java
    geronimo/server/branches/sachin/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
    geronimo/server/branches/sachin/modules/geronimo-system/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-system/src/main/java/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImpl.java
    geronimo/server/branches/sachin/modules/geronimo-timer/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/ExecutorFeedingTimerTask.java
    geronimo/server/branches/sachin/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/ThreadPooledTimer.java
    geronimo/server/branches/sachin/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
    geronimo/server/branches/sachin/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
    geronimo/server/branches/sachin/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
    geronimo/server/branches/sachin/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
    geronimo/server/branches/sachin/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/vm/VMWorkerPersistence.java
    geronimo/server/branches/sachin/modules/geronimo-timer/src/test/java/org/apache/geronimo/timer/AbstractThreadPooledTimerTest.java
    geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
    geronimo/server/branches/sachin/modules/geronimo-tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/server/branches/sachin/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
    geronimo/server/branches/sachin/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
    geronimo/server/branches/sachin/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
    geronimo/server/branches/sachin/pom.xml

Modified: geronimo/server/branches/sachin/BUILDING.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/BUILDING.txt?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/BUILDING.txt (original)
+++ geronimo/server/branches/sachin/BUILDING.txt Tue Sep 12 11:15:24 2006
@@ -40,7 +40,7 @@
 
     mvn -Ptools geronimo:start
     ...
-    mvn -Ptools geronimo:stop
+    CTRL-C or from another terminal: mvn -Ptools geronimo:stop
 
 
 Subsequent builds

Modified: geronimo/server/branches/sachin/all_changes.log
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/all_changes.log?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/all_changes.log (original)
+++ geronimo/server/branches/sachin/all_changes.log Tue Sep 12 11:15:24 2006
@@ -1,14 +1,14 @@
 All changes in dead-1.2 branch
 
 
-Not Merged,  r358649 , jlaskowski , 2005-12-22 14:39:35 -0800 (Thu, 22 Dec 2005) , 10 lines  Applied patch by Jakob Faerch (@see jrf-patch-partially-20051222.patch at http://issues.apache.org/jira/browse/GERONIMO-1164)  Some small changes:  + change portToConnectToWebservices to webServicePort  + web-service-address changed its content to reference webServicePort  + get default goal to work  WARNING: Web Services keep failing because of missing class - java.lang.ClassNotFoundException: org.apache.jasper.servlet.JspServlet
+Merged,  r358649 , jlaskowski , 2005-12-22 14:39:35 -0800 (Thu, 22 Dec 2005) , 10 lines  Applied patch by Jakob Faerch (@see jrf-patch-partially-20051222.patch at http://issues.apache.org/jira/browse/GERONIMO-1164)  Some small changes:  + change portToConnectToWebservices to webServicePort  + web-service-address changed its content to reference webServicePort  + get default goal to work  WARNING: Web Services keep failing because of missing class - java.lang.ClassNotFoundException: org.apache.jasper.servlet.JspServlet
 Unnecessary,  r358662 , jlaskowski , 2005-12-22 16:12:46 -0800 (Thu, 22 Dec 2005) , 3 lines  Configure MailGBean. It is the first time I could see Checkout Complete at the checkout procedure.
 Unnecessary,  r360404 , jlaskowski , 2005-12-31 10:56:51 -0800 (Sat, 31 Dec 2005) , 2 lines  svn propset svn:ignore
 Unnecessary,  r360411 , jlaskowski , 2005-12-31 11:04:50 -0800 (Sat, 31 Dec 2005) , 5 lines  Make j2ee-installer work  + change Geronimo IZPack Plugin to accept the latest release notes version  Thanks Sachin for the idea and patch!
 Unnecessary,  r360413 , jlaskowski , 2005-12-31 11:07:09 -0800 (Sat, 31 Dec 2005) , 2 lines  Add the license
 Unnecessary,  r360478 , gdamour , 2005-12-31 23:36:08 -0800 (Sat, 31 Dec 2005) , 3 lines  GERONIMO-1409 - A Filter is initialized with a wrong TCCL  Set the Web-app CL as the TCCL when starting a Filter.
 Merged,  r365285 , djencks , 2006-01-01 20:19:48 -0800 (Sun, 01 Jan 2006) , 1 line  GERONIMO-1411 fix some servlet schema transformation problems
-Not Merged,  r365364 , jlaskowski , 2006-01-02 07:46:13 -0800 (Mon, 02 Jan 2006) , 11 lines  Jakob's patch applied. @see http://issues.apache.org/jira/browse/GERONIMO-1164#action_12361517  The changes (copied from Jakob's comment):   + Moved the deployer-configurable properties from maven.xml to project.properties  + Changed the geronimo artifact id used in unpackServer from the tomcat distribution to the jetty distribution, as I experienced some problems with the Tomcat distro.  + Added dependencies for geronimo-javamail-transport-1.0.jar, and added them to the list of jars being copied manually in the unpackServer goal  + Moved around some of the properties in the configuration of the MailGBean and SMTPTransportGBean. It seems that the SMTPTransportGBean isn't necessary, so I have removed it.  Great job! Thanks Jakob!
+Merged,  r365364 , jlaskowski , 2006-01-02 07:46:13 -0800 (Mon, 02 Jan 2006) , 11 lines  Jakob's patch applied. @see http://issues.apache.org/jira/browse/GERONIMO-1164#action_12361517  The changes (copied from Jakob's comment):   + Moved the deployer-configurable properties from maven.xml to project.properties  + Changed the geronimo artifact id used in unpackServer from the tomcat distribution to the jetty distribution, as I experienced some problems with the Tomcat distro.  + Added dependencies for geronimo-javamail-transport-1.0.jar, and added them to the list of jars being copied manually in the unpackServer goal  + Moved around some of the properties in the configuration of the MailGBean and SMTPTransportGBean. It seems that the SMTPTransportGBean isn't necessary, so I have removed it.  Great job! Thanks Jakob!
 Unnecessary,  r365370 , jlaskowski , 2006-01-02 08:11:15 -0800 (Mon, 02 Jan 2006) , 4 lines  #1401: Updates to BUILDING.txt about the last changes to the build process  Thanks Anita!
 Unnecessary,  r365738 , jlaskowski , 2006-01-03 12:42:08 -0800 (Tue, 03 Jan 2006) , 2 lines  Remove the mail server
 Unnecessary,  r365750 , jlaskowski , 2006-01-03 13:39:23 -0800 (Tue, 03 Jan 2006) , 3 lines  Exclude geronimo/daytrader-derby-jetty/1.0-SNAPSHOT/car from being run. It doesn't work well under Java 5
@@ -209,9 +209,9 @@
 Unnecessary,  r382352 , gdamour , 2006-03-02 03:13:09 -0800 (Thu, 02 Mar 2006) , 7 lines  GERONIMO-1434 Allow GBeans to be bound into a component's java:comp/env namespace  This commit allows to bind a GBean reference into the ENC of a J2EE component.   Based on the XSD, it seems that we also need to support the case where a collection of GBeans is put in the ENC.
 Unnecessary,  r382362 , jlaskowski , 2006-03-02 04:19:37 -0800 (Thu, 02 Mar 2006) , 6 lines  Correct Geronimo JavaMail specs version Add Apache repo  Maven2 build is yet broken, though :(
 Unnecessary,  r382366 , gdamour , 2006-03-02 04:51:31 -0800 (Thu, 02 Mar 2006) , 3 lines  rename org.apache.geronimo.base.dir to org.apache.geronimo.home.dir as suggested by John.
-Not Merged,  r382389 , jlaskowski , 2006-03-02 06:23:02 -0800 (Thu, 02 Mar 2006) , 1 line  GERONIMO-1670: SMTPTransport not throwing correct exception for message send failures
+Unnecessary,  r382389 , jlaskowski , 2006-03-02 06:23:02 -0800 (Thu, 02 Mar 2006) , 1 line  GERONIMO-1670: SMTPTransport not throwing correct exception for message send failures
 Unnecessary,  r382793 , jlaskowski , 2006-03-03 04:58:26 -0800 (Fri, 03 Mar 2006) , 4 lines  GERONIMO-1678 - Interceptor module added to m2  Thanks Henri!
-Not Merged,  r383090 , jlaskowski , 2006-03-04 03:24:20 -0800 (Sat, 04 Mar 2006) , 4 lines  GERONIMO-1673 SMTPTransport is not performing byte-stuffing and newline canonicalization on message data  Thanks Rick!
+Unnecessary,  r383090 , jlaskowski , 2006-03-04 03:24:20 -0800 (Sat, 04 Mar 2006) , 4 lines  GERONIMO-1673 SMTPTransport is not performing byte-stuffing and newline canonicalization on message data  Thanks Rick!
 Unnecessary,  r383095 , jlaskowski , 2006-03-04 03:55:42 -0800 (Sat, 04 Mar 2006) , 6 lines  GERONIMO-1675 Add NNTP transport to the javamail package  Thanks Rick!  NOTE: It requires the latest version of geronimo-javamail_1.3.1_spec-1.1-SNAPSHOT.jar. Will have to ask how ot publish it.
 Merged,  r383111 , jlaskowski , 2006-03-04 05:26:30 -0800 (Sat, 04 Mar 2006) , 4 lines  GERONIMO-1667 Remove console-web module as it has now become obsolete  There's a brand new console in applications/console*
 Unnecessary,  r383116 , jlaskowski , 2006-03-04 06:23:10 -0800 (Sat, 04 Mar 2006) , 4 lines  Generate geronimo-version.properties using Maven2 Antrun plugin  Note: I'm not sure if it's in a correct phase, but it works
@@ -230,7 +230,7 @@
 Unnecessary,  r383870 , jlaskowski , 2006-03-07 04:56:53 -0800 (Tue, 07 Mar 2006) , 4 lines  GERONIMO-1698 hot-deploy module migration to Maven2  Thanks Rakesh!
 Unnecessary,  r383872 , jlaskowski , 2006-03-07 05:04:45 -0800 (Tue, 07 Mar 2006) , 3 lines  Add hot-deploy module to the M2 modules Change the name of the M2 repo so that it will add more value to the build logs
 Unnecessary,  r383906 , jlaskowski , 2006-03-07 07:29:45 -0800 (Tue, 07 Mar 2006) , 1 line  Not used
-Not Merged,  r383915 , jlaskowski , 2006-03-07 08:01:25 -0800 (Tue, 07 Mar 2006) , 1 line  Revert to the old directory setting until something better is implemented as it broke the m1-based build
+Unnecessary,  r383915 , jlaskowski , 2006-03-07 08:01:25 -0800 (Tue, 07 Mar 2006) , 1 line  Revert to the old directory setting until something better is implemented as it broke the m1-based build
 Unnecessary,  r383941 , jlaskowski , 2006-03-07 09:53:44 -0800 (Tue, 07 Mar 2006) , 1 line  Specify additional (likely useful) repository properties
 Unnecessary,  r384273 , jlaskowski , 2006-03-08 09:25:03 -0800 (Wed, 08 Mar 2006) , 1 line  Include tomcat module in the parent pom
 Unnecessary,  r384276 , jlaskowski , 2006-03-08 09:39:30 -0800 (Wed, 08 Mar 2006) , 2 lines  GERONIMO-1715 derby module migration to Maven2
@@ -265,8 +265,8 @@
 Unnecessary,  r386837 , jlaskowski , 2006-03-18 02:43:16 -0800 (Sat, 18 Mar 2006) , 3 lines  GERONIMO-1646 - Module migration to Maven2: tomcat-builder Submitted by: Anita Kulshreshtha
 Unnecessary,  r386840 , jlaskowski , 2006-03-18 03:05:09 -0800 (Sat, 18 Mar 2006) , 1 line  Correct some XML-wise goodies
 Unnecessary,  r386910 , jlaskowski , 2006-03-18 18:13:26 -0800 (Sat, 18 Mar 2006) , 31 lines  All migrated to M2 modules build properly from the top-level
-Not Merged,  r387174 , jlaskowski , 2006-03-20 01:47:23 -0800 (Mon, 20 Mar 2006) , 1 line  Fix the failing SecurityTest and add resources to svn:ignore
-Not Merged,  r387197 , jlaskowski , 2006-03-20 04:20:28 -0800 (Mon, 20 Mar 2006) , 1 line  Fix the remaining inappropriately-migrated tests
+Unnecessary,  r387174 , jlaskowski , 2006-03-20 01:47:23 -0800 (Mon, 20 Mar 2006) , 1 line  Fix the failing SecurityTest and add resources to svn:ignore
+Unnecessary,  r387197 , jlaskowski , 2006-03-20 04:20:28 -0800 (Mon, 20 Mar 2006) , 1 line  Fix the remaining inappropriately-migrated tests
 Unnecessary,  r387216 , jlaskowski , 2006-03-20 07:00:28 -0800 (Mon, 20 Mar 2006) , 3 lines  GERONIMO-1753 - Add support for a mail.nntp.from property to configure the default From: address for NNTP posts Submitted by: Rick McGuire
 Merged,  r387218 , jlaskowski , 2006-03-20 07:12:37 -0800 (Mon, 20 Mar 2006) , 3 lines  GERONIMO-1754 - Add GBeans for configuring NNTPTransport and NNTPStore access Submitted by: Rick McGuire
 Unnecessary,  r387275 , jlaskowski , 2006-03-20 10:56:44 -0800 (Mon, 20 Mar 2006) , 3 lines  GERONIMO-1732 - Module migration to Maven 2: jetty-builder Submitted by: Prasad Kashyap
@@ -301,7 +301,7 @@
 Unnecessary,  r390634 , jlaskowski , 2006-04-01 01:59:07 -0800 (Sat, 01 Apr 2006) , 3 lines  GERONIMO-1777 - Application migration to Maven 2: JMXDebug Submitted by: Prasad Kashyap
 Unnecessary,  r390636 , jlaskowski , 2006-04-01 02:03:32 -0800 (Sat, 01 Apr 2006) , 3 lines  GERONIMO-1780 - Application migration to Maven 2: ldap-realm, remote-deploy, uddi, welcome Submitted by: Prasad Kashyap
 Unnecessary,  r390638 , jlaskowski , 2006-04-01 02:07:59 -0800 (Sat, 01 Apr 2006) , 3 lines  GERONIMO-1785 - Application migration to Maven 2: magicGball Submitted by: Prasad Kashyap
-Not Merged,  r390662 , jlaskowski , 2006-04-01 04:46:02 -0800 (Sat, 01 Apr 2006) , 2 lines  Enable M2 to be able to run in applications. Previously, there were some bizzare changes that duplicated content of several files.
+Unnecessary,  r390662 , jlaskowski , 2006-04-01 04:46:02 -0800 (Sat, 01 Apr 2006) , 2 lines  Enable M2 to be able to run in applications. Previously, there were some bizzare changes that duplicated content of several files.
 Not Merged,  r390687 , ammulder , 2006-04-01 07:54:02 -0800 (Sat, 01 Apr 2006) , 6 lines  Now one Geronimo server can pull configurations from another  - Expose the contents of the Geronimo config-store & repository as a Maven    repository.  - Add an authentication option to the import configuration process.  - Switch the configuration descriptor file to XML and add more detail
 Not Merged,  r390688 , ammulder , 2006-04-01 08:08:34 -0800 (Sat, 01 Apr 2006) , 3 lines  Don't show configurations where the current server doesn't meet the   prerequisites
 Not Merged,  r390690 , ammulder , 2006-04-01 08:11:22 -0800 (Sat, 01 Apr 2006) , 2 lines  Only prompt for eligible configurations at the command line

Modified: geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml Tue Sep 12 11:15:24 2006
@@ -124,10 +124,6 @@
                                     <artifactId>backport-util-concurrent</artifactId>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>concurrent</groupId>
-                                    <artifactId>concurrent</artifactId>
-                                </artifactItem>
-                                <artifactItem>
                                     <groupId>cglib</groupId>
                                     <artifactId>cglib-nodep</artifactId>
                                 </artifactItem>

Modified: geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml Tue Sep 12 11:15:24 2006
@@ -19,4 +19,21 @@
 
     <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
 
+    <gbean name="AxisServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-axis</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+        <reference name="AxisBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
+    </gbean>
+
 </module>

Modified: geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml Tue Sep 12 11:15:24 2006
@@ -27,28 +27,35 @@
         <reference name="ServiceBuilders">
             <name>GBeanBuilder</name>
         </reference>
-        <references name="EJBReferenceBuilder">
+        <references name="NamingBuilders">
             <pattern>
-                <name>ClientEJBReferenceBuilder</name>
+                <name>GBeanRefBuilder</name>
             </pattern>
             <pattern>
-                <name>UnavailableClientEJBReferenceBuilder</name>
+                <name>PersistenceContextRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>ResourceRefBuilder</name>
             </pattern>
-        </references>
-        <reference name="ConnectorModuleBuilder">
-            <name>ClientConnectorBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ClientConnectorBuilder</name>
-        </reference>
-        <references name="ServiceReferenceBuilder">
             <pattern>
-                <name>WebServiceBuilder</name>
+                <name>AdminObjectRefBuilder</name>
             </pattern>
             <pattern>
-                <name>UnavailableWebServiceBuilder</name>
+                <name>EnvironmentEntryBuilder</name>
+            </pattern>
+            <pattern>
+                <name>AxisServiceRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>OpenEjbClientRemoteRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>CorbaRefBuilder</name>
             </pattern>
         </references>
+        <reference name="ConnectorModuleBuilder">
+            <name>ClientConnectorBuilder</name>
+        </reference>
         <xml-attribute name="defaultServerEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>

Modified: geronimo/server/branches/sachin/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client/pom.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/client/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client/pom.xml Tue Sep 12 11:15:24 2006
@@ -196,6 +196,14 @@
              concurrent, jdom -->
 
         <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+        </dependency>
+
+        <!--
+        NOTE: Used by dependencies... :-(
+        -->
+        <dependency>
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
         </dependency>

Modified: geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml Tue Sep 12 11:15:24 2006
@@ -57,25 +57,6 @@
                 <name>UnavailableAppClientBuilder</name>
             </pattern>
         </references>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <references name="ServiceReferenceBuilder">
-            <pattern>
-                <name>WebServiceBuilder</name>
-            </pattern>
-            <pattern>
-                <name>UnavailableWebServiceBuilder</name>
-            </pattern>
-        </references>
-        <references name="EJBReferenceBuilder">
-            <pattern>
-                <name>ServerEJBReferenceBuilder</name>
-            </pattern>
-            <pattern>
-                <name>UnavailableServerEJBReferenceBuilder</name>
-            </pattern>
-        </references>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>
@@ -135,6 +116,44 @@
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
 
+    <gbean name="NamingBuilders" class="org.apache.geronimo.j2ee.deployment.NamingBuilderCollectionGBean">
+        <attribute name="baseElementQNameNamespaceURI">http://geronimo.apache.org/xml/ns/naming-1.2</attribute>
+        <attribute name="baseElementQNameLocalPart">abstract-naming-entry</attribute>
+        <references name="NamingBuilders">
+            <pattern>
+                <name>GBeanRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>PersistenceContextRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>ResourceRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>AdminObjectRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>EnvironmentEntryBuilder</name>
+            </pattern>
+            <pattern>
+                <name>AxisServiceRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>OpenEjbRemoteRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>OpenEjbLocalRefBuilder</name>
+            </pattern>
+            <pattern>
+                <name>CorbaRefBuilder</name>
+            </pattern>
+        </references>
+    </gbean>
 
+    <gbean name="GBeanRefBuilder" class="org.apache.geronimo.naming.deployment.GBeanRefBuilder"/>
+    <gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.naming.deployment.PersistenceContextRefBuilder"/>
+    <gbean name="ResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder"/>
+    <gbean name="AdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder"/>
+    <gbean name="EnvironmentEntryBuilder" class="org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder"/>
 
 </module>

Modified: geronimo/server/branches/sachin/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-system/pom.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-system/pom.xml Tue Sep 12 11:15:24 2006
@@ -135,10 +135,6 @@
                             <artifactId>backport-util-concurrent</artifactId>
                         </element>
                         <element>
-                            <groupId>concurrent</groupId>
-                            <artifactId>concurrent</artifactId>
-                        </element>
-                        <element>
                             <groupId>xerces</groupId>
                             <artifactId>xercesImpl</artifactId>
                             <classpathPrefix>../lib/endorsed</classpathPrefix>

Modified: geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/jetty-deployer/src/plan/plan.xml Tue Sep 12 11:15:24 2006
@@ -48,6 +48,9 @@
                 <name>UnavailableWebServiceBuilder</name>
             </pattern>
         </references>
+        <reference name="NamingBuilders">
+            <name>NamingBuilders</name>
+        </reference>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>

Modified: geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/openejb-deployer/src/plan/plan.xml Tue Sep 12 11:15:24 2006
@@ -43,6 +43,12 @@
                 <name>UnavailableWebServiceBuilder</name>
             </pattern>
         </references>
+        <reference name="NamingBuilders">
+            <name>NamingBuilders</name>
+        </reference>
+        <reference name="ActivationSpecInfoLocator">
+            <name>ConnectorBuilder</name>
+        </reference>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>
@@ -65,12 +71,50 @@
     <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="OpenEjbRemoteRefBuilder" class="org.openejb.deployment.OpenEjbRemoteRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openejb</groupId>
+                        <artifactId>openejb-core</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="OpenEjbClientRemoteRefBuilder" class="org.openejb.deployment.OpenEjbClientRemoteRefBuilder">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanOpenEJBPort}</attribute>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openejb</groupId>
+                        <artifactId>openejb-core</artifactId>
+                        <type>jar</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
     </gbean>
 
-    <gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEjbReferenceBuilder"/>
+    <gbean name="OpenEjbLocalRefBuilder" class="org.openejb.deployment.OpenEjbLocalRefBuilder"/>
+
+    <gbean name="CorbaRefBuilder" class="org.apache.geronimo.naming.deployment.CorbaRefBuilder">
+        <reference name="CorbaGBeanNameSource">
+            <name>EarBuilder</name>
+        </reference>
+    </gbean>
+    <gbean name="ClientCorbaRefBuilder" class="org.apache.geronimo.naming.deployment.CorbaRefBuilder">
+        <reference name="CorbaGBeanNameSource">
+            <name>AppClientBuilder</name>
+        </reference>
+    </gbean>
+
+
     <gbean name="WebServiceEJBLinkTemplate" class="org.openejb.server.axis.WSContainerGBean"/>
 
 </module>

Modified: geronimo/server/branches/sachin/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/openejb/pom.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/openejb/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/openejb/pom.xml Tue Sep 12 11:15:24 2006
@@ -33,21 +33,21 @@
     <packaging>car</packaging>
     
     <dependencies>
-    
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -60,6 +60,11 @@
             <artifactId>openejb-core</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+        </dependency>
+
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/openejb/src/plan/plan.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/openejb/src/plan/plan.xml Tue Sep 12 11:15:24 2006
@@ -100,7 +100,13 @@
         </reference>
         <attribute name="doAsCurrentCaller">true</attribute>
     </gbean>
-
+    
+    <gbean name="DefaultThreadPoolExecutorAdapter" class="org.openejb.util.BackportExecutorAdapter">
+        <reference name="TargetExecutor">
+            <name>DefaultThreadPool</name>
+        </reference>
+    </gbean>
+    
     <gbean name="EJBNetworkService" class="org.activeio.xnet.StandardServiceStackGBean">
         <attribute name="name">EJB</attribute>
         <attribute name="port">${PlanOpenEJBPort}</attribute>
@@ -109,7 +115,7 @@
         <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
         <attribute name="logOnFailure">HOST,NAME</attribute>
         <reference name="Executor">
-            <name>DefaultThreadPool</name>
+            <name>DefaultThreadPoolExecutorAdapter</name>
         </reference>
         <reference name="Server">
             <name>EJBServer</name>

Modified: geronimo/server/branches/sachin/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/rmi-naming/pom.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/rmi-naming/pom.xml Tue Sep 12 11:15:24 2006
@@ -184,6 +184,11 @@
             <artifactId>activeio</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+        </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml Tue Sep 12 11:15:24 2006
@@ -35,6 +35,9 @@
                 <name>UnavailableWebServiceBuilder</name>
             </pattern>
         </references>
+        <reference name="NamingBuilders">
+            <name>NamingBuilders</name>
+        </reference>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>

Modified: geronimo/server/branches/sachin/configs/unavailable-ejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/unavailable-ejb-deployer/src/plan/plan.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/unavailable-ejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/unavailable-ejb-deployer/src/plan/plan.xml Tue Sep 12 11:15:24 2006
@@ -21,8 +21,9 @@
 
     <gbean name="UnavailableEJBBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableModuleBuilder" />
 
-    <gbean name="UnavailableClientEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />
+    <!-- TODO include new-style unavaliable naming builders -->
+    <!--<gbean name="UnavailableClientEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />-->
 
-    <gbean name="UnavailableServerEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />
+    <!--<gbean name="UnavailableServerEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder" />-->
 
 </module>

Modified: geronimo/server/branches/sachin/configs/unavailable-webservices-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/unavailable-webservices-deployer/src/plan/plan.xml?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/configs/unavailable-webservices-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/unavailable-webservices-deployer/src/plan/plan.xml Tue Sep 12 11:15:24 2006
@@ -21,6 +21,5 @@
 
     <gbean name="UnavailableWebServiceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableWebServiceBuilder" />
 
-    <gbean name="UnavailableServiceReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableServiceReferenceBuilder" />
-
+    <!--TODO need an unavailable naming builder -->
 </module>

Modified: geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java Tue Sep 12 11:15:24 2006
@@ -57,14 +57,13 @@
 import org.apache.geronimo.axis.server.POJOProvider;
 import org.apache.geronimo.axis.server.ServiceInfo;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.DeployableModule;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
+import org.apache.geronimo.j2ee.deployment.HandlerInfoInfo;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.xbeans.geronimo.naming.GerPortCompletionType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerPortType;
@@ -78,7 +77,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class AxisBuilder implements ServiceReferenceBuilder, WebServiceBuilder {
+public class AxisBuilder implements WebServiceBuilder {
 //    private static final Class[] SERVICE_CONSTRUCTOR_TYPES = new Class[]{Map.class, Map.class};
 
     private static final SOAPConstants SOAP_VERSION = SOAPConstants.SOAP11_CONSTANTS;
@@ -146,7 +145,7 @@
 
 
     //ServicereferenceBuilder
-    public Object createService(Class serviceInterface, URI wsdlURI, URI jaxrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlerInfos, Object serviceRefType, DeploymentContext deploymentContext, Module module, ClassLoader classLoader) throws DeploymentException {
+    public Object createService(Class serviceInterface, URI wsdlURI, URI jaxrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlerInfos, Object serviceRefType, Module module, ClassLoader classLoader) throws DeploymentException {
         GerServiceRefType gerServiceRefType = (GerServiceRefType) serviceRefType;
         DeployableModule deployableModule = module.getModuleFile();
         SchemaInfoBuilder schemaInfoBuilder = null;
@@ -157,10 +156,10 @@
             mapping = WSDescriptorParser.readJaxrpcMapping(deployableModule, jaxrpcMappingURI);
         }
 
-        return createService(serviceInterface, schemaInfoBuilder, mapping, serviceQName, SOAP_VERSION, handlerInfos, gerServiceRefType, deploymentContext, module, classLoader);
+        return createService(serviceInterface, schemaInfoBuilder, mapping, serviceQName, SOAP_VERSION, handlerInfos, gerServiceRefType, module, classLoader);
     }
 
-    public Object createService(Class serviceInterface, SchemaInfoBuilder schemaInfoBuilder, JavaWsdlMappingType mapping, QName serviceQName, SOAPConstants soapVersion, List handlerInfos, GerServiceRefType serviceRefType, DeploymentContext context, Module module, ClassLoader classloader) throws DeploymentException {
+    public Object createService(Class serviceInterface, SchemaInfoBuilder schemaInfoBuilder, JavaWsdlMappingType mapping, QName serviceQName, SOAPConstants soapVersion, List handlerInfos, GerServiceRefType serviceRefType, Module module, ClassLoader classloader) throws DeploymentException {
         Map seiPortNameToFactoryMap = new HashMap();
         Map seiClassNameToFactoryMap = new HashMap();
         if (schemaInfoBuilder != null) {
@@ -521,7 +520,6 @@
 
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(AxisBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addInterface(ServiceReferenceBuilder.class);
         infoBuilder.addInterface(WebServiceBuilder.class);
 
         GBEAN_INFO = infoBuilder.getBeanInfo();

Modified: geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ServiceReferenceTest.java Tue Sep 12 11:15:24 2006
@@ -181,7 +181,7 @@
         JavaWsdlMappingType mapping = buildLightweightMappingType();
         QName serviceQName = new QName(NAMESPACE, "MockService");
         AxisBuilder builder = new AxisBuilder();
-        Object reference = builder.createService(MockService.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, context, module, isolatedCl);
+        Object reference = builder.createService(MockService.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, module, isolatedCl);
         assertNotNull(reference);
         assertTrue(reference instanceof AxisServiceReference);
         AxisServiceReference claReference = (AxisServiceReference) reference;
@@ -203,7 +203,7 @@
         JavaWsdlMappingType mapping = mappingDocument.getJavaWsdlMapping();
         QName serviceQName = new QName("http://www.Monson-Haefel.com/jwsbook/BookQuote", "BookQuoteService");
         AxisBuilder builder = new AxisBuilder();
-        Object reference = builder.createService(BookQuoteService.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, context, module, isolatedCl);
+        Object reference = builder.createService(BookQuoteService.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, module, isolatedCl);
         assertNotNull(reference);
         assertTrue(reference instanceof AxisServiceReference);
         AxisServiceReference claReference = (AxisServiceReference) reference;
@@ -225,7 +225,7 @@
         JavaWsdlMappingType mapping = mappingDocument.getJavaWsdlMapping();
         QName serviceQName = new QName("http://tempuri.org/4s4c/1/3/wsdl/def/interopLab", "interopLab");
         AxisBuilder builder = new AxisBuilder();
-        Object proxy = builder.createService(InteropLab.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, context, module, isolatedCl);
+        Object proxy = builder.createService(InteropLab.class, schemaInfoBuilder, mapping, serviceQName, SOAPConstants.SOAP11_CONSTANTS, handlerInfos, gerServiceRefType, module, isolatedCl);
         assertNotNull(proxy);
         assertTrue(proxy instanceof InteropLab);
         InteropTestPortType interopTestPort = ((InteropLab) proxy).getinteropTestPort();

Modified: geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Tue Sep 12 11:15:24 2006
@@ -28,6 +28,7 @@
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.HashMap;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
@@ -38,7 +39,10 @@
 import org.apache.geronimo.client.AppClientContainer;
 import org.apache.geronimo.client.StaticJndiContextPlugin;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.*;
+import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.util.NestedJarFile;
@@ -52,13 +56,12 @@
 import org.apache.geronimo.gbean.SingleElementCollection;
 import org.apache.geronimo.j2ee.deployment.AppClientModule;
 import org.apache.geronimo.j2ee.deployment.EARContext;
-import org.apache.geronimo.j2ee.deployment.EJBReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
-import org.apache.geronimo.j2ee.deployment.RefContext;
-import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
-import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.SecurityBuilder;
+import org.apache.geronimo.j2ee.deployment.CorbaGBeanNameSource;
+import org.apache.geronimo.j2ee.deployment.NamingBuilder;
+import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.J2EEAppClientModuleImpl;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
@@ -66,20 +69,18 @@
 import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
+import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.security.deploy.DefaultPrincipal;
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientDocument;
 import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientType;
 import org.apache.geronimo.xbeans.geronimo.client.GerResourceType;
-import org.apache.geronimo.xbeans.geronimo.naming.GerMessageDestinationType;
+import org.apache.geronimo.xbeans.geronimo.naming.GerAbstractNamingEntryDocument;
 import org.apache.geronimo.xbeans.j2ee.ApplicationClientDocument;
 import org.apache.geronimo.xbeans.j2ee.ApplicationClientType;
-import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
-import org.apache.geronimo.xbeans.j2ee.MessageDestinationType;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 
@@ -87,22 +88,20 @@
 /**
  * @version $Rev:385232 $ $Date$
  */
-public class AppClientModuleBuilder implements ModuleBuilder {
+public class AppClientModuleBuilder implements ModuleBuilder, CorbaGBeanNameSource {
     private static final Log log = LogFactory.getLog(AppClientModuleBuilder.class);
     private static final String LINE_SEP = System.getProperty("line.separator");
-    
+
     private final Environment defaultClientEnvironment;
     private final Environment defaultServerEnvironment;
     private final AbstractNameQuery corbaGBeanObjectName;
 
     private final AbstractNameQuery transactionManagerObjectName;
     private final AbstractNameQuery connectionTrackerObjectName;
-    private final SingleElementCollection ejbReferenceBuilder;
     private final SingleElementCollection connectorModuleBuilder;
-    private final SingleElementCollection resourceReferenceBuilder;
-    private final SingleElementCollection serviceReferenceBuilder;
     private final SingleElementCollection securityBuilder;
     private final NamespaceDrivenBuilderCollection serviceBuilder;
+    private final NamingBuilderCollection namingBuilders;
 
     private static final String GERAPPCLIENT_NAMESPACE = GerApplicationClientDocument.type.getDocumentElementName().getNamespaceURI();
 
@@ -111,34 +110,28 @@
             AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery corbaGBeanObjectName,
-            EJBReferenceBuilder ejbReferenceBuilder,
             ModuleBuilder connectorModuleBuilder,
-            ResourceReferenceBuilder resourceReferenceBuilder,
-            ServiceReferenceBuilder serviceReferenceBuilder,
             NamespaceDrivenBuilder securityBuilder,
-            NamespaceDrivenBuilder serviceBuilder) {
+            NamespaceDrivenBuilder serviceBuilder,
+            Collection namingBuilders) {
         this(defaultClientEnvironment,
                 defaultServerEnvironment,
                 transactionManagerObjectName,
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
-                new SingleElementCollection(ejbReferenceBuilder),
                 new SingleElementCollection(connectorModuleBuilder),
-                new SingleElementCollection(resourceReferenceBuilder),
-                new SingleElementCollection(serviceReferenceBuilder),
                 new SingleElementCollection(securityBuilder),
-                serviceBuilder == null? Collections.EMPTY_SET: Collections.singleton(serviceBuilder));
+                serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder),
+                namingBuilders == null ? Collections.EMPTY_SET : namingBuilders);
     }
 
     public AppClientModuleBuilder(AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery corbaGBeanObjectName,
-            Collection ejbReferenceBuilder,
             Collection connectorModuleBuilder,
-            Collection resourceReferenceBuilder,
-            Collection serviceReferenceBuilder,
             Collection securityBuilder,
             Collection serviceBuilder,
+            Collection namingBuilders,
             Environment defaultClientEnvironment,
             Environment defaultServerEnvironment) {
         this(defaultClientEnvironment,
@@ -146,12 +139,10 @@
                 transactionManagerObjectName,
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
-                new SingleElementCollection(ejbReferenceBuilder),
                 new SingleElementCollection(connectorModuleBuilder),
-                new SingleElementCollection(resourceReferenceBuilder),
-                new SingleElementCollection(serviceReferenceBuilder),
                 new SingleElementCollection(securityBuilder),
-                serviceBuilder);
+                serviceBuilder,
+                namingBuilders);
     }
 
     private AppClientModuleBuilder(Environment defaultClientEnvironment,
@@ -159,54 +150,42 @@
             AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery corbaGBeanObjectName,
-            SingleElementCollection ejbReferenceBuilder,
             SingleElementCollection connectorModuleBuilder,
-            SingleElementCollection resourceReferenceBuilder,
-            SingleElementCollection serviceReferenceBuilder,
             SingleElementCollection securityBuilder,
-            Collection serviceBuilder) {
+            Collection serviceBuilder, Collection namingBuilders) {
         this.defaultClientEnvironment = defaultClientEnvironment;
         this.defaultServerEnvironment = defaultServerEnvironment;
         this.corbaGBeanObjectName = corbaGBeanObjectName;
         this.transactionManagerObjectName = transactionManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
-        this.ejbReferenceBuilder = ejbReferenceBuilder;
         this.connectorModuleBuilder = connectorModuleBuilder;
-        this.resourceReferenceBuilder = resourceReferenceBuilder;
-        this.serviceReferenceBuilder = serviceReferenceBuilder;
         this.securityBuilder = securityBuilder;
         this.serviceBuilder = new NamespaceDrivenBuilderCollection(serviceBuilder);
+        this.namingBuilders = new NamingBuilderCollection(namingBuilders, GerAbstractNamingEntryDocument.type.getDocumentElementName());
     }
 
-    private EJBReferenceBuilder getEjbReferenceBuilder() {
-        return (EJBReferenceBuilder) ejbReferenceBuilder.getElement();
+
+    public AbstractNameQuery getCorbaGBeanName() {
+        return corbaGBeanObjectName;
     }
 
     private ModuleBuilder getConnectorModuleBuilder() {
         return (ModuleBuilder) connectorModuleBuilder.getElement();
     }
 
-    private ResourceReferenceBuilder getResourceReferenceBuilder() {
-        return (ResourceReferenceBuilder) resourceReferenceBuilder.getElement();
-    }
-
-    private ServiceReferenceBuilder getServiceReferenceBuilder() {
-        return (ServiceReferenceBuilder) serviceReferenceBuilder.getElement();
-    }
-
     private org.apache.geronimo.j2ee.deployment.SecurityBuilder getSecurityBuilder() {
         return (SecurityBuilder) securityBuilder.getElement();
     }
 
-    public Module createModule(File plan, DeployableModule moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         return createModule(plan, moduleFile, "app-client", null, null, null, naming, idBuilder);
     }
 
-    public Module createModule(Object plan, DeployableModule moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         return createModule(plan, moduleFile, targetPath, specDDUrl, environment, earName, naming, idBuilder);
     }
 
-    private Module createModule(Object plan, DeployableModule moduleFile, String targetPath, URL specDDUrl, Environment earEnvironment, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment earEnvironment, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         assert moduleFile != null: "moduleFile is null";
         assert targetPath != null: "targetPath is null";
         assert !targetPath.endsWith("/"): "targetPath must not end with a '/'";
@@ -216,7 +195,7 @@
         ApplicationClientType appClient;
         try {
             if (specDDUrl == null) {
-                specDDUrl = moduleFile.resolve("META-INF/application-client.xml");
+                specDDUrl = DeploymentUtil.createJarURL(moduleFile, "META-INF/application-client.xml");
             }
 
             // read in the entire specDD as a string, we need this for getDeploymentDescriptor
@@ -243,25 +222,27 @@
 
         EnvironmentType clientEnvironmentType = gerAppClient.getClientEnvironment();
         Environment clientEnvironment = EnvironmentBuilder.buildEnvironment(clientEnvironmentType, defaultClientEnvironment);
-        String name = moduleFile.getRoot().getName();
-        if(standAlone) {
-            idBuilder.resolve(clientEnvironment, name+"_"+name, "jar");
+        if (standAlone) {
+            String name = new File(moduleFile.getName()).getName();
+            idBuilder.resolve(clientEnvironment, name + "_" + name, "jar");
         } else {
             Artifact earConfigId = earEnvironment.getConfigId();
-            idBuilder.resolve(clientEnvironment, earConfigId.getArtifactId() + "_" + name, "jar");
+            idBuilder.resolve(clientEnvironment, earConfigId.getArtifactId() + "_" + new File(moduleFile.getName()).getName(), "jar");
         }
         EnvironmentType serverEnvironmentType = gerAppClient.getServerEnvironment();
         Environment serverEnvironment = EnvironmentBuilder.buildEnvironment(serverEnvironmentType, defaultServerEnvironment);
         if (!standAlone) {
             EnvironmentBuilder.mergeEnvironments(earEnvironment, serverEnvironment);
             serverEnvironment = earEnvironment;
-            if(!serverEnvironment.getConfigId().isResolved()) {
-                throw new IllegalStateException("Server environment module ID should be fully resolved (not "+serverEnvironment.getConfigId()+")");
+            if (!serverEnvironment.getConfigId().isResolved()) {
+                throw new IllegalStateException("Server environment module ID should be fully resolved (not " + serverEnvironment.getConfigId() + ")");
             }
         } else {
-            idBuilder.resolve(serverEnvironment, name, "jar");
+            idBuilder.resolve(serverEnvironment, new File(moduleFile.getName()).getName(), "jar");
         }
 
+        namingBuilders.buildEnvironment(appClient, gerAppClient, clientEnvironment);
+
         AbstractName moduleName;
         if (earName == null) {
             earName = naming.createRootName(earEnvironment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
@@ -273,7 +254,7 @@
         return new AppClientModule(standAlone, moduleName, serverEnvironment, clientEnvironment, moduleFile, targetPath, appClient, gerAppClient, specDD);
     }
 
-    GerApplicationClientType getGeronimoAppClient(Object plan, DeployableModule moduleFile, boolean standAlone, String targetPath, ApplicationClientType appClient, Environment environment) throws DeploymentException {
+    GerApplicationClientType getGeronimoAppClient(Object plan, JarFile moduleFile, boolean standAlone, String targetPath, ApplicationClientType appClient, Environment environment) throws DeploymentException {
         GerApplicationClientType gerAppClient;
         XmlObject rawPlan = null;
         try {
@@ -285,7 +266,7 @@
                     if (plan != null) {
                         rawPlan = XmlBeansUtil.parse((File) plan);
                     } else {
-                        URL path = moduleFile.resolve("META-INF/geronimo-application-client.xml");
+                        URL path = DeploymentUtil.createJarURL(moduleFile, "META-INF/geronimo-application-client.xml");
                         rawPlan = XmlBeansUtil.parse(path, getClass().getClassLoader());
                     }
                 }
@@ -300,7 +281,7 @@
                 String path;
                 if (standAlone) {
                     // default configId is based on the moduleFile name
-                    path = moduleFile.getRoot().getName();
+                    path = new File(moduleFile.getName()).getName();
                 } else {
                     // default configId is based on the module uri from the application.xml
                     path = targetPath;
@@ -341,7 +322,7 @@
         return geronimoAppClient;
     }
 
-    public void installModule(DeployableModule earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
+    public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
         // extract the app client jar file into a standalone packed jar file and add the contents to the output
         JarFile moduleFile = module.getModuleFile();
         try {
@@ -350,7 +331,7 @@
             throw new DeploymentException("Unable to copy app client module jar into configuration: " + moduleFile.getName());
         }
         AppClientModule appClientModule = (AppClientModule) module;
-        appClientModule.setEar(earFile);
+        appClientModule.setEarFile(earFile);
         //create the ear context for the app client.
         Environment clientEnvironment = appClientModule.getClientEnvironment();
         if (!appClientModule.isStandAlone() || clientEnvironment.getConfigId() == null) {
@@ -382,9 +363,10 @@
                     connectionTrackerObjectName,
                     null,
                     null,
-                    corbaGBeanObjectName,
-                    new RefContext(getEjbReferenceBuilder(), getResourceReferenceBuilder(), getServiceReferenceBuilder()));
+                    corbaGBeanObjectName
+            );
             appClientModule.setEarContext(appClientDeploymentContext);
+            appClientModule.setRootEarContext(earContext);
         } catch (DeploymentException e) {
             cleanupAppClientDir(appClientDir);
             throw e;
@@ -430,9 +412,9 @@
         Map componentContext;
         GBeanData appClientModuleGBeanData = new GBeanData(appClientModuleName, J2EEAppClientModuleImpl.GBEAN_INFO);
         try {
-            appClientModuleGBeanData.setReferencePatterns("J2EEServer", Collections.singleton(earContext.getServerName()));
+            appClientModuleGBeanData.setReferencePattern("J2EEServer", earContext.getServerName());
             if (!module.isStandAlone()) {
-                appClientModuleGBeanData.setReferencePatterns("J2EEApplication", Collections.singleton(earContext.getModuleName()));
+                appClientModuleGBeanData.setReferencePattern("J2EEApplication", earContext.getModuleName());
             }
             appClientModuleGBeanData.setAttribute("deploymentDescriptor", appClientModule.getOriginalSpecDD());
 
@@ -456,10 +438,7 @@
             try {
 
                 //register the message destinations in the app client ear context.
-                MessageDestinationType[] messageDestinations = appClient.getMessageDestinationArray();
-                GerMessageDestinationType[] gerMessageDestinations = geronimoAppClient.getMessageDestinationArray();
-
-                ENCConfigBuilder.registerMessageDestinations(appClientDeploymentContext.getRefContext(), appClientModule.getName(), messageDestinations, gerMessageDestinations);
+                namingBuilders.initContext(appClient, geronimoAppClient, appClientDeploymentContext.getConfiguration(), earContext.getConfiguration(), appClientModule);
                 // extract the client Jar file into a standalone packed jar file and add the contents to the output
                 URI moduleBase = new URI(appClientModule.getTargetPath());
                 try {
@@ -469,7 +448,7 @@
                 }
 
                 // add manifest class path entries to the app client context
-                addManifestClassPath(appClientDeploymentContext, appClientModule.getEar(), moduleFile, moduleBase);
+                addManifestClassPath(appClientDeploymentContext, appClientModule.getEarFile(), moduleFile, moduleBase);
 
                 // get the classloader
                 ClassLoader appClientClassLoader = appClientDeploymentContext.getClassLoader();
@@ -507,7 +486,7 @@
                             } else {
                                 path = resource.getInternalRar();
                                 try {
-                                    connectorFile = new NestedJarFile(appClientModule.getEar(), path);
+                                    connectorFile = new NestedJarFile(appClientModule.getEarFile(), path);
                                 } catch (IOException e) {
                                     throw new DeploymentException("Could not locate connector inside ear", e);
                                 }
@@ -541,7 +520,7 @@
                 AbstractName jndiContextName = earContext.getNaming().createChildName(appClientDeploymentContext.getModuleName(), "StaticJndiContext", "StaticJndiContext");
                 GBeanData jndiContextGBeanData = new GBeanData(jndiContextName, StaticJndiContextPlugin.GBEAN_INFO);
                 try {
-                    componentContext = buildComponentContext(appClientDeploymentContext, earContext, appClientModule, appClient, geronimoAppClient, appClientClassLoader);
+                    componentContext = buildComponentContext(appClientDeploymentContext, earContext, appClientModule, appClient, geronimoAppClient);
                     jndiContextGBeanData.setAttribute("context", componentContext);
                 } catch (DeploymentException e) {
                     throw e;
@@ -614,7 +593,7 @@
         return GERAPPCLIENT_NAMESPACE;
     }
 
-    public void addManifestClassPath(DeploymentContext deploymentContext, DeployableModule earFile, DeployableModule jarFile, URI jarFileLocation) throws DeploymentException {
+    public void addManifestClassPath(DeploymentContext deploymentContext, JarFile earFile, JarFile jarFile, URI jarFileLocation) throws DeploymentException {
         Manifest manifest;
         try {
             manifest = jarFile.getManifest();
@@ -680,40 +659,29 @@
         }
     }
 
-    private Map buildComponentContext(EARContext appClientContext, EARContext ejbContext, AppClientModule appClientModule, ApplicationClientType appClient, GerApplicationClientType geronimoAppClient, ClassLoader cl) throws DeploymentException {
-
-        return ENCConfigBuilder.buildComponentContext(appClientContext,
-                ejbContext.getConfiguration(),
-                appClientModule,
-                null, //no user transaction yet
-                appClient.getEnvEntryArray(),
-                appClient.getEjbRefArray(), geronimoAppClient.getEjbRefArray(),
-                new EjbLocalRefType[0], null,
-                appClient.getResourceRefArray(), geronimoAppClient.getResourceRefArray(),
-                appClient.getResourceEnvRefArray(), geronimoAppClient.getResourceEnvRefArray(),
-                appClient.getMessageDestinationRefArray(),
-                appClient.getServiceRefArray(), geronimoAppClient.getServiceRefArray(),
-                geronimoAppClient.getGbeanRefArray(),
-                cl);
-
+    private Map buildComponentContext(EARContext appClientContext, EARContext ejbContext, AppClientModule appClientModule, ApplicationClientType appClient, GerApplicationClientType geronimoAppClient) throws DeploymentException {
+        Map componentContext = new HashMap();
+        Configuration localConfiguration = appClientContext.getConfiguration();
+        Configuration remoteConfiguration = ejbContext.getConfiguration();
+        namingBuilders.buildNaming(appClient, geronimoAppClient, localConfiguration, remoteConfiguration, appClientModule, componentContext);
+        return componentContext;
     }
 
-    private boolean cleanupAppClientDir(File configurationDir)
-    {
+    private boolean cleanupAppClientDir(File configurationDir) {
         LinkedList cannotBeDeletedList = new LinkedList();
-               
-        if (!DeploymentUtil.recursiveDelete(configurationDir,cannotBeDeletedList)) {
+
+        if (!DeploymentUtil.recursiveDelete(configurationDir, cannotBeDeletedList)) {
             // Output a message to help user track down file problem
-            log.warn("Unable to delete " + cannotBeDeletedList.size() + 
-                    " files while recursively deleting directory " 
+            log.warn("Unable to delete " + cannotBeDeletedList.size() +
+                    " files while recursively deleting directory "
                     + configurationDir + LINE_SEP +
-                    "The first file that could not be deleted was:" + LINE_SEP + "  "+
-                    ( !cannotBeDeletedList.isEmpty() ? cannotBeDeletedList.getFirst() : "") );
+                    "The first file that could not be deleted was:" + LINE_SEP + "  " +
+                    (!cannotBeDeletedList.isEmpty() ? cannotBeDeletedList.getFirst() : ""));
             return false;
         }
         return true;
-    }  
-    
+    }
+
     public static final GBeanInfo GBEAN_INFO;
 
     static {
@@ -723,24 +691,20 @@
         infoBuilder.addAttribute("transactionManagerObjectName", AbstractNameQuery.class, true);
         infoBuilder.addAttribute("connectionTrackerObjectName", AbstractNameQuery.class, true);
         infoBuilder.addAttribute("corbaGBeanObjectName", AbstractNameQuery.class, true);
-        infoBuilder.addReference("EJBReferenceBuilder", EJBReferenceBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ConnectorModuleBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("ResourceReferenceBuilder", ResourceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
-        infoBuilder.addReference("ServiceReferenceBuilder", ServiceReferenceBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("SecurityBuilder", SecurityBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addReference("NamingBuilders", NamingBuilder.class, NameFactory.MODULE_BUILDER);
 
         infoBuilder.addInterface(ModuleBuilder.class);
 
         infoBuilder.setConstructor(new String[]{"transactionManagerObjectName",
                 "connectionTrackerObjectName",
                 "corbaGBeanObjectName",
-                "EJBReferenceBuilder",
                 "ConnectorModuleBuilder",
-                "ResourceReferenceBuilder",
-                "ServiceReferenceBuilder",
                 "SecurityBuilder",
                 "ServiceBuilders",
+                "NamingBuilders",
                 "defaultClientEnvironment",
                 "defaultServerEnvironment",
         });

Modified: geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java?view=diff&rev=442665&r1=442664&r2=442665
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java Tue Sep 12 11:15:24 2006
@@ -19,7 +19,7 @@
     private AppClientModuleBuilder builder;
 
     protected void setUp() throws Exception {
-        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null, null, null, null, null, null);
+        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null, null, null, null);
     }
 
     public void testResourceRef() throws Exception {



Mime
View raw message