Index: j2ee-server-plan.xml
===================================================================
--- j2ee-server-plan.xml	(revision 169701)
+++ j2ee-server-plan.xml	(working copy)
@@ -71,9 +71,11 @@
     <dependency>
         <uri>tranql/jars/tranql-${tranql_version}.jar</uri>
     </dependency>
+<!-- Comment this for no EJB -->
     <dependency>
         <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
     </dependency>
+
     <dependency>
         <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
     </dependency>
@@ -251,8 +253,9 @@
         <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
         <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
     </gbean>
+    <!--======== EJB Container, Comment out this section if no EJB container -->
+    <!-- EJB Protocol -->   
 
-    <!-- EJB Protocol -->
     <gbean gbeanName="openejb:type=NetworkService,name=EJB" class="org.openejb.server.StandardServiceStackGBean">
         <attribute name="name">EJB</attribute>
         <attribute name="port">4201</attribute>
@@ -266,7 +269,9 @@
     <gbean gbeanName="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
         <reference name="ContainerIndex"><gbean-name>openejb:type=ContainerIndex</gbean-name></reference>
     </gbean>
+
     <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
+
     <gbean gbeanName="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">
         <references name="EJBContainers">
             <pattern><gbean-name>geronimo.server:j2eeType=StatelessSessionBean,*</gbean-name></pattern>
@@ -275,7 +280,9 @@
         </references>
     </gbean>
 
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
 
+    <!--==================================================================-->
     <!-- HTTP/SOAP Protocol is now run through jetty-->
 
     <!-- JSR77 Management Objects -->
@@ -295,6 +302,4 @@
 
     <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
 
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
-
 </configuration>