Index: releases/bedework-3.7/build/buildsh.xml
===================================================================
--- releases/bedework-3.7/build/buildsh.xml (revision 3104)
+++ releases/bedework-3.7/build/buildsh.xml (revision 3147)
@@ -42,4 +42,6 @@
 
   <target name="build" depends="init">
+    <infoMsg message="* =========== Building ${propval.app.zip.name}" />
+
     <delete dir="${app.dest.home}" />
 
Index: releases/bedework-3.7/build/platforms/jbossService.xml
===================================================================
--- releases/bedework-3.7/build/platforms/jbossService.xml (revision 3104)
+++ releases/bedework-3.7/build/platforms/jbossService.xml (revision 3147)
@@ -60,4 +60,14 @@
           <fileset dir="${org.bedework.temp.extrajars.dir}" />
         </copy>
+        
+        <if>
+          <istrue value="${propval.app.in.ear}"/>
+          <then>
+            <!-- Preserve extra jars for later -->
+            <copy todir="${org.bedework.temp.ear.extrajars.dir}" >
+              <fileset dir="${org.bedework.temp.extrajars.dir}" />
+            </copy>
+          </then>
+        </if>
       	
         <if>
Index: releases/bedework-3.7/build/platforms/jbossWar.xml
===================================================================
--- releases/bedework-3.7/build/platforms/jbossWar.xml (revision 3104)
+++ releases/bedework-3.7/build/platforms/jbossWar.xml (revision 3147)
@@ -127,4 +127,9 @@
       </then>
     </if>
+    
+    <!-- Add any extra jars -->
+    <copy todir="${org.bedework.temp.ear.extrajars.dir}" >
+      <fileset dir="${org.bedework.temp.extrajars.dir}" />
+    </copy>
 
     <!-- And the extra jars we preserved -->
Index: releases/bedework-3.7/config/bwbuild/default/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/default/cal.properties (revision 3097)
+++ releases/bedework-3.7/config/bwbuild/default/cal.properties (revision 3147)
@@ -18,6 +18,6 @@
 # Define the names of the applications we want to build
 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\
- sysevlog,iosched,monitor,genkeys
+ SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\
+ test,sysevlog,monitor,genkeys
 
 #
Index: releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties (revision 3097)
+++ releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties (revision 3147)
@@ -18,6 +18,6 @@
 # Define the names of the applications we want to build
 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\
- sysevlog,iosched,monitor,genkeys
+ SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\
+ test,sysevlog,monitor,genkeys
 
 #
Index: releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties (revision 3097)
+++ releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties (revision 3147)
@@ -18,6 +18,6 @@
 # Define the names of the applications we want to build
 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\
- sysevlog,iosched,monitor,genkeys
+ SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\
+ test,sysevlog,monitor,genkeys
 
 #
Index: releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties (revision 3097)
+++ releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties (revision 3147)
@@ -18,7 +18,7 @@
 # Define the names of the applications we want to build
 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,Pubcalws,Usercalws,caldavTest,\
- test,indexer,dumpres,\
- sysevlog,iosched,monitor,genkeys
+ SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,\
+ Pubcalws,Usercalws,\
+ test,sysevlog,monitor,genkeys
 
 #
@@ -590,4 +590,5 @@
 org.bedework.app.iosched.project=calendarapi
 org.bedework.app.iosched.sou.dir=
+org.bedework.app.iosched.in.ear=true
 org.bedework.app.iosched.shellscr.name=bwrun
 org.bedework.app.iosched.batscr.name=bwrun.bat
Index: releases/bedework-3.7/deployment/build.xml
===================================================================
--- releases/bedework-3.7/deployment/build.xml (revision 3104)
+++ releases/bedework-3.7/deployment/build.xml (revision 3147)
@@ -62,5 +62,5 @@
             location="${org.bedework.temp.dir}/shellscr" />
 
-  <!-- Recreateed by each app build file. Place extra jars here -->
+  <!-- Recreated by each app build file. Place extra jars here -->
   <property name="org.bedework.temp.extrajars.dir"
             location="${org.bedework.temp.dir}/extrajars" />
@@ -78,4 +78,6 @@
 
   <import file="${build.dir}/loadDeployConfig.xml"/>
+  
+  <property name="ear.meta.dir" location="${this.build.dir}/ear.meta"/>
 
   <target name="init" >
Index: releases/bedework-3.7/deployment/ear.meta/jboss-service.xml
===================================================================
---  (revision )
+++ releases/bedework-3.7/deployment/ear.meta/jboss-service.xml (revision 3147)
@@ -1,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <!--  guarantee separate classloader -->
+  <loader-repository> 
+    org.bedework:archive=bedework-services 
+  </loader-repository> 
+  
+  <mbean code="org.bedework.indexer.BwIndexer"
+         name="org.bedework:service=Indexer">
+    <attribute name="Account">admin</attribute>
+    <attribute name="SkipPaths">/public/unbrowsable:/public/aliases</attribute>
+
+    <!-- We need activemq -->    
+    <depends>jboss.jca:service=ConnectionFactoryBinding,name=activemq/QueueConnectionFactory</depends>
+    
+    <!-- We also need the bedework database -->
+    <depends>jboss.jca:service=DataSourceBinding,name=CalendarDS</depends>
+  </mbean>
+  
+  <mbean code="org.bedework.inoutsched.BwInoutSched"
+         name="org.bedework:service=BwInoutSched">
+         <!--  no attributes yet
+    <attribute name="Account">admin</attribute>
+    <attribute name="SkipPaths">/public/unbrowsable:/public/aliases</attribute>
+    -->
+
+    <!-- We need activemq -->    
+    <depends>jboss.jca:service=ConnectionFactoryBinding,name=activemq/QueueConnectionFactory</depends>
+    
+    <!-- We also need the bedework database -->
+    <depends>jboss.jca:service=DataSourceBinding,name=CalendarDS</depends>
+  </mbean>
+  
+  <mbean code="org.bedework.dumprestore.BwDumpRestore"
+         name="org.bedework:service=DumpRestore">
+    <attribute name="Account">admin</attribute>
+    
+    <attribute name="Appname">dumpres</attribute>
+    
+    <!-- Create tables - false for safety - set true in console -->
+    <attribute name="Create">false</attribute>
+    
+    <!-- Statement delimiter -->
+    <attribute name="Delimiter">;</attribute>
+    
+    <!-- Drop tables - false for safety - set true in console -->
+    <attribute name="Drop">false</attribute>
+    
+    <!-- Export to database? - false for safety - set true in console -->
+    <attribute name="Export">false</attribute>
+    
+    <!-- Format the output? -->
+    <attribute name="Format">true</attribute>
+    
+    <!-- Do we halt on error? -->
+    <attribute name="HaltOnError">true</attribute>
+    
+    <!-- Schema Output file name - full path, folders must exist -->
+    <attribute name="SchemaOutFile">${jboss.server.data.dir}/bedework/dumprestore/schema.txt</attribute>
+    
+    <!-- SQL input file name - full path. Used instead of the configuration? -->
+    <!--  There appears to be a bug in the hibernate code. Everybody initialises
+        this to /import.sql. Set to null causes an NPE 
+        Make sure it refers toa non-existant file -->
+    <attribute name="SqlIn">not-a-file.sql</attribute>
+    
+    <!-- XML data input file name - full path. Used for data restore -->
+    <attribute name="DataIn">${jboss.server.data.dir}/bedework/dumprestore/initbedework.xml</attribute>
+    
+    <!-- XML data output directory - full path. Used for data dump -->
+    <attribute name="DataOut">${jboss.server.data.dir}/bedework/dumprestore/</attribute>
+    
+    <!-- XML data output file prefix - for data dump -->
+    <attribute name="DataOutPrefix">bwdata</attribute>
+
+    <!-- We need activemq -->    
+    <depends>jboss.jca:service=ConnectionFactoryBinding,name=activemq/QueueConnectionFactory</depends>
+    
+    <!-- We also need the bedework database -->
+    <depends>jboss.jca:service=DataSourceBinding,name=CalendarDS</depends>
+  </mbean>
+</server>
Index: releases/bedework-3.7/deployment/inoutsched/shellscr/build.xml
===================================================================
--- trunk/deployment/inoutsched/shellscr/build.xml (revision 2715)
+++ releases/bedework-3.7/deployment/inoutsched/shellscr/build.xml (revision 3147)
@@ -42,5 +42,12 @@
 
   <target name="deploy" depends="init,build.configured" >
-    <antcall target="deployService" inheritRefs="true" />
+    <if>
+      <not>
+        <istrue value="${propval.app.in.ear}"/>
+      </not>
+      <then>
+        <antcall target="deployService" inheritRefs="true" />
+      </then>
+    </if>
   </target>
 
Index: releases/bedework-3.7/deployment/termination/webapp/appjars.xml
===================================================================
---  (revision )
+++ releases/bedework-3.7/deployment/termination/webapp/appjars.xml (revision 3147)
@@ -1,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     Fetch extra jars for an ear application
+     =================================================================== -->
+<project name="extraJars" basedir="." default="">
+  <macrodef name="getExtraJars">
+    <sequential>
+      <delete dir="${org.bedework.temp.extrajars.dir}" />
+      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-inoutsched" version="${org.bedework.calendarapi.version}"
+              projecthome="${bw.project.home}/projects/calendarapi" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-indexer" version="${org.bedework.indexer.version}"
+              projecthome="${bw.project.home}/projects/indexer" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-dumpres" version="${org.bedework.dumprestore.version}"
+              projecthome="${bw.project.home}/projects/dumprestore" />
+    </sequential>
+ </macrodef>
+</project>
Index: releases/bedework-3.7/deployment/termination/webapp/build.xml
===================================================================
--- releases/bedework-3.7/deployment/termination/webapp/build.xml (revision 3104)
+++ releases/bedework-3.7/deployment/termination/webapp/build.xml (revision 3147)
@@ -12,8 +12,11 @@
   <dirname property="this.dir" file="${ant.file}"/>
 
+  <import file="${this.dir}/appjars.xml" />
+
   <!-- ensure has value -->
   <property name="propval.app.cal.suite" value="" />
 
   <target name="init">
+    <getExtraJars />
   </target>