Index: j2ee-deployer-plan.xml
===================================================================
--- j2ee-deployer-plan.xml	(revision 169701)
+++ j2ee-deployer-plan.xml	(working copy)
@@ -58,15 +58,16 @@
         <uri>geronimo/jars/geronimo-service-builder-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
+        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
     </dependency>
+<!-- Comment out this if no EJB container -->
     <dependency>
-        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
+        <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
     </dependency>
-
     <dependency>
         <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
     </dependency>
+<!-- ==================================== -->
     <dependency>
         <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
     </dependency>
@@ -167,9 +168,6 @@
         <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>
         <!--domain set to wildcard so datasources may be deployed independently on client. -->
@@ -179,8 +177,8 @@
         <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="EJBReferenceBuilder"><name>EJBBuilder</name></reference>
+        <reference name="EJBConfigBuilder"><name>EJBBuilder</name></reference> <!-- Comment this line for no EJB -->
+        <reference name="EJBReferenceBuilder"><name>EJBBuilder</name></reference> 
         <reference name="WebConfigBuilder"><name>WebBuilder</name></reference>
         <reference name="ConnectorConfigBuilder"><name>ConnectorBuilder</name></reference>
         <reference name="ResourceReferenceBuilder"><name>ConnectorBuilder</name></reference>
@@ -245,17 +243,28 @@
  xpoweredBy=false</attribute>
         <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
     </gbean>
+    <!--====================================================================-->
+<!-- Uncomment this for no EJB 
+    <gbean name="EJBReferenceBuilder" class="org.apache.geronimo.j2ee.deployment.UnavailableEJBReferenceBuilder"/>
+    <gbean name="ClientEJBReferenceBuilder" 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>
 
+    <!--====================================================================-->
     <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
         <attribute name="defaultMaxSize">10</attribute>