Index: releases/bedework-3.6/build/platforms/geronimo.xml
===================================================================
---  (revision )
+++ releases/bedework-3.6/build/platforms/geronimo.xml (revision 2828)
@@ -1,0 +1,12 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     This file is imported by termination/build.xml and adds the targets
+     which will be invoked by that file.
+        doPlatform - misc stuff
+     =================================================================== -->
+
+<project name="bedework.platformTermination" default="doPlatform" >
+  <target name="doPlatform" >
+  </target>
+</project>
Index: releases/bedework-3.6/build/platforms/jboss.xml
===================================================================
---  (revision )
+++ releases/bedework-3.6/build/platforms/jboss.xml (revision 2828)
@@ -1,0 +1,43 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     This file is imported by termination/build.xml and adds the targets
+     which will be invoked by that file.
+        doPlatform - misc stuff
+     =================================================================== -->
+
+<project name="bedework.platformTermination" default="doPlatform" >
+  <target name="doPlatform" >
+    <if>
+      <isset property="org.bedework.appserver.deploy.dir" />
+      <then>
+        <!-- If requested copy in the activemq configuration. -->
+
+        <if>
+          <istrue value="${org.bedework.global.copy.activemq.config}" />
+          <then>
+            <copy file="${org.bedework.config.home}/activemq-ra.xml"
+                  tofile="${org.bedework.global.activemq.dir}/META-INF/ra.xml"
+                  overwrite="yes" />
+            <copy file="${org.bedework.config.home}/activemq-broker-config.xml"
+                  tofile="${org.bedework.global.activemq.dir}/broker-config.xml"
+                  overwrite="yes" />
+            <copy file="${org.bedework.config.home}/activemq-jms-ds.xml"
+                  tofile="${org.bedework.appserver.deploy.dir}/activemq-jms-ds.xml"
+                  overwrite="yes" />
+          </then>
+        </if>
+        <!-- If requested copy in the activemq configuration. -->
+
+        <if>
+          <istrue value="${org.bedework.global.copy.bedeworkds.config}" />
+          <then>
+            <copy file="${org.bedework.config.home}/bedework-ds.xml"
+                  tofile="${org.bedework.appserver.deploy.dir}/bedework-ds.xml"
+                  overwrite="yes" />
+          </then>
+        </if>
+      </then>
+    </if>
+  </target>
+</project>
Index: releases/bedework-3.6/build/platforms/jbossWar.xml
===================================================================
--- releases/bedework-3.6/build/platforms/jbossWar.xml (revision 2737)
+++ releases/bedework-3.6/build/platforms/jbossWar.xml (revision 2828)
@@ -180,21 +180,4 @@
           <fileset dir="${org.bedework.ear.dir}"/>
         </copy>
-
-        <!-- If requested we also copy in the activemq configuration. -->
-
-        <if>
-          <istrue value="${org.bedework.global.copy.activemq.config}" />
-          <then>
-            <copy file="${org.bedework.config.home}/activemq-ra.xml"
-            	    tofile="${org.bedework.global.activemq.dir}/META-INF/ra.xml"
-                  overwrite="yes" />
-            <copy file="${org.bedework.config.home}/activemq-broker-config.xml"
-                  tofile="${org.bedework.global.activemq.dir}/broker-config.xml"
-                  overwrite="yes" />
-            <copy file="${org.bedework.config.home}/activemq-jms-ds.xml"
-                  tofile="${org.bedework.appserver.deploy.dir}/activemq-jms-ds.xml"
-                  overwrite="yes" />
-          </then>
-        </if>
       </then>
     </if>
Index: releases/bedework-3.6/build/platforms/tomcat5.xml
===================================================================
---  (revision )
+++ releases/bedework-3.6/build/platforms/tomcat5.xml (revision 2828)
@@ -1,0 +1,12 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     This file is imported by termination/build.xml and adds the targets
+     which will be invoked by that file.
+        doPlatform - misc stuff
+     =================================================================== -->
+
+<project name="bedework.platformTermination" default="doPlatform" >
+  <target name="doPlatform" >
+  </target>
+</project>
Index: releases/bedework-3.6/config/bwbuild/jboss/bedework-ds.xml
===================================================================
---  (revision )
+++ releases/bedework-3.6/config/bwbuild/jboss/bedework-ds.xml (revision 2828)
@@ -1,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE datasources
+        PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+        "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+
+<datasources>
+  <local-tx-datasource>
+    <jndi-name>CalendarDS</jndi-name>
+
+    <!-- Embedded mode - does not need mbean
+    <driver-class>org.apache.derby.jdbc.EmbeddedDriver</driver-class>
+
+    <connection-url>jdbc:derby:${jboss.server.data.dir}/bedework/derby/CalDb3p6;create=true</connection-url>
+    -->
+
+    <!-- Server mode needs the mbean -->
+    <driver-class>org.apache.derby.jdbc.ClientDriver</driver-class>
+
+    <connection-url>jdbc:derby://localhost:1527/${jboss.server.data.dir}/bedework/derby/CalDb3p6;create=true</connection-url>
+
+    <depends>org.bedework:service=DerbyDb</depends>
+
+    <user-name>sa</user-name>
+    <password>bw</password>
+    <min-pool-size>5</min-pool-size>
+    <max-pool-size>20</max-pool-size>
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+    <track-statements/>
+
+    <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+    <metadata>
+      <type-mapping>Derby</type-mapping>
+    </metadata>
+  </local-tx-datasource>
+
+  <!-- mbean for server mode -->
+  <mbean code="edu.rpi.cmt.jboss.jdbc.DerbyDb" 
+         name="org.bedework:service=DerbyDb">
+    <!-- Should be done like this
+    <attribute name="Port">        
+      <value-factory bean="ServiceBindingManager" method="getIntBinding" 
+           parameter="jboss:service=Hypersonic"/>
+    </attribute>
+    -->
+    <attribute name="Port">1527</attribute>
+    <!--
+    <attribute name="BindAddress">        
+        <value-factory bean="ServiceBindingManager" method="getStringBinding" 
+           parameter="jboss:service=Hypersonic"/>
+    </attribute>     
+    -->
+    <attribute name="Account">sa</attribute>
+    <attribute name="Pw">bw</attribute>
+  </mbean>
+</datasources>
+
Index: releases/bedework-3.6/config/bwbuild/jboss/cal.properties
===================================================================
--- releases/bedework-3.6/config/bwbuild/jboss/cal.properties (revision 2818)
+++ releases/bedework-3.6/config/bwbuild/jboss/cal.properties (revision 2828)
@@ -151,4 +151,7 @@
 #org.bedework.global.jdbcid=sa
 #org.bedework.global.jdbcpw=
+#
+# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml
+org.bedework.global.copy.bedeworkds.config=yes
 
 # ------------------------------------------------------------------------
Index: releases/bedework-3.6/deployment/build.xml
===================================================================
--- releases/bedework-3.6/deployment/build.xml (revision 2812)
+++ releases/bedework-3.6/deployment/build.xml (revision 2828)
@@ -226,49 +226,9 @@
     </antcall>
 
-    <!-- copy startup website that sends you to the applications -->
-  	<property name="startup.website.dir"
-  	          location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/bedework" />
-    <delete dir="${startup.website.dir}"/>
-    <mkdir dir="${startup.website.dir}"/>
-    <copy todir="${startup.website.dir}">
-      <fileset dir="${app.root.dir}/resources/bedework"/>
-    </copy>
-
-    <!-- copy jdbc jar so datasources work -->
-    <if>
-      <available file="${org.bedework.global.ext.lib}/server" type="dir" />
-      <then>
-        <!-- jdbc drivers -->
-        <copy todir="${appserver.lib.dir}" flatten="yes" >
-          <!-- local jdbc drivers -->
-          <fileset dir="${org.bedework.global.ext.lib}/server">
-            <include name="*.jar"/>
-          </fileset>
-        </copy>
-      </then>
-    </if>
-  	
-  	<if>
-      <isset property="org.bedework.global.extra.jars" />
-      <then>
-      	<foreach list="${org.bedework.global.extra.jars}"
-      	         target="copyToServer"
-      	         param="org.bedework.extra.jar"
-      	         inheritall="true"
-      	         trim="true" />
-      </then>
-    </if>
-
-    <if>
-      <available file="${java.tools.jar}" />
-      <then>
-        <copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/>
-      </then>
-    </if>
-  </target>
-	
-	<target name="copyToServer">
-    <copy todir="${appserver.lib.dir}" file="${org.bedework.extra.jar}" />
-	</target>
+    <!-- ================= termination tasks for deployment ================ -->
+
+    <ant antfile="${org.bedework.deployment.base}/termination/build.xml"
+         inheritrefs="true" target="deploy" />
+  </target>
 
   <!-- =================================================================
@@ -300,7 +260,7 @@
     </forEachApp>
 
-    <!-- ======================= termination tasks ================= -->
-
-    <ant antfile="${org.bedework.deployment.base}/termination/build.xml"
+    <!-- ==================== termination tasks for apps ================= -->
+
+    <ant antfile="${org.bedework.deployment.base}/termination/${org.bedework.deploy.kind}/build.xml"
          inheritrefs="true" target="build.configured" />
   </target>
@@ -342,5 +302,5 @@
     </forEachApp>
 
-    <!-- ======================= termination tasks ================= -->
+    <!-- =================== termination tasks for apps ================= -->
 
     <ant antfile="${org.bedework.deployment.base}/termination/${org.bedework.deploy.kind}/build.xml"
Index: releases/bedework-3.6/deployment/termination/build.xml
===================================================================
---  (revision )
+++ releases/bedework-3.6/deployment/termination/build.xml (revision 2828)
@@ -1,0 +1,67 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+     terminations task.
+     =================================================================== -->
+
+<project name="bwdeploy.termination" default="deploy" >
+  <import file="${org.bedework.deployment.base}/deployprops.xml" />
+
+  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}.xml" />
+
+  <dirname property="this.dir" file="${ant.file}"/>
+
+  <target name="init">
+  </target>
+
+  <target name="deploy" depends="init,build.configured" >
+    <!-- copy startup website that sends you to the applications -->
+    <property name="startup.website.dir"
+              location="${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/bedework" />
+    <delete dir="${startup.website.dir}"/>
+    <mkdir dir="${startup.website.dir}"/>
+    <copy todir="${startup.website.dir}">
+      <fileset dir="${app.root.dir}/resources/bedework"/>
+    </copy>
+
+    <!-- copy any jars required in the server lib (jdbc etc) -->
+    <if>
+      <available file="${org.bedework.global.ext.lib}/server" type="dir" />
+      <then>
+        <copy todir="${appserver.lib.dir}" flatten="yes" >
+          <fileset dir="${org.bedework.global.ext.lib}/server">
+            <include name="*.jar"/>
+          </fileset>
+        </copy>
+      </then>
+    </if>
+    
+    <if>
+      <isset property="org.bedework.global.extra.jars" />
+      <then>
+        <foreach list="${org.bedework.global.extra.jars}"
+                 target="copyToServer"
+                 param="org.bedework.extra.jar"
+                 inheritall="true"
+                 trim="true" />
+      </then>
+    </if>
+
+    <if>
+      <available file="${java.tools.jar}" />
+      <then>
+        <copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/>
+      </then>
+    </if>
+  	
+    <!-- Platform specific -->
+    <antcall target="doPlatform" inheritRefs="true" />
+  </target>
+
+  <target name="build.configured" depends="init" >
+  </target>
+  
+  <target name="copyToServer">
+    <copy todir="${appserver.lib.dir}" file="${org.bedework.extra.jar}" />
+  </target>
+</project>