Index: j2ee-runtime-deployer-plan.xml
===================================================================
--- j2ee-runtime-deployer-plan.xml	(revision 169701)
+++ j2ee-runtime-deployer-plan.xml	(working copy)
@@ -54,9 +54,11 @@
     <dependency>
         <uri>geronimo/jars/geronimo-service-builder-${geronimo_version}.jar</uri>
     </dependency>
+<!-- Comment this if no EJB container -->
     <dependency>
         <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
     </dependency>
+
     <dependency>
         <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
     </dependency>
@@ -106,17 +108,14 @@
         <reference name="XmlAttributeBuilders"><name>*</name></reference>
     </gbean>
 
-    <gbean name="CSSAttributeBuilder" class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
-    <gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
-
     <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
         <attribute name="transactionContextManagerObjectName">geronimo.server:name=TransactionContextManager,*</attribute>
         <attribute name="connectionTrackerObjectName">geronimo.server:name=ConnectionTracker,*</attribute>
         <attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
         <attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-        <reference name="EJBConfigBuilder"><name>EJBBuilder</name></reference>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>  
+        <reference name="EJBConfigBuilder"><name>EJBBuilder</name></reference>  <!-- Comment this for no EJB-->
         <reference name="EJBReferenceBuilder"><name>EJBBuilder</name></reference>
         <reference name="WebConfigBuilder"><name>WebBuilder</name></reference>
         <reference name="ConnectorConfigBuilder"><name>ConnectorBuilder</name></reference>
@@ -191,16 +190,27 @@
     <gbean name="POJOTemplate" class="org.apache.geronimo.jetty.JettyPOJOWebServiceHolder">
         <attribute name="servletName">dummy</attribute>
     </gbean>
+   <!--==============================================================================-->
+   <!-- Uncomment this for no EJB 
+    <gbean name="ClientEJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder"/>
+    <gbean name="EJBBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder"/>
+    -->
+    <!-- Comment this for no EJB -->
+    <gbean name="CSSAttributeBuilder" class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
+    <gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
 
     <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
         <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+
 <!--        <reference name="SkeletonGenerator"><gbean-name>openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</gbean-name></reference>-->
+
         <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
     </gbean>
 
     <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
 
+    <!--================================================================================-->
     <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
         <attribute name="defaultMaxSize">10</attribute>