Index: releases/bedework-3.4.1.1/build/buildsh.xml
===================================================================
--- trunk/build/buildsh.xml (revision 1429)
+++ releases/bedework-3.4.1.1/build/buildsh.xml (revision 1808)
@@ -112,5 +112,5 @@
 
     <!-- Include the quickstart jdbc driver -->
-    <copy todir="${app.dest.lib}" file="${hsqldb.jdbcdriver.jar}"/>
+    <copy todir="${app.dest.lib}" file="${appserver.jdbcdriver.jar}"/>
 
     <copy todir="${app.dest.classes}">
Index: releases/bedework-3.4.1.1/build/quickstart-build.xml
===================================================================
--- releases/bedework-3.4.1/build/quickstart-build.xml (revision 1754)
+++ releases/bedework-3.4.1.1/build/quickstart-build.xml (revision 1808)
@@ -83,4 +83,8 @@
     <!-- Load user property definition overrides -->
     <property file="${org.bedework.user.build.properties}" />
+
+    <!-- This may have defined the config properties location. Load that now to get overrides -->
+    <property file="${org.bedework.config.properties}" />
+
 
     <!-- Unfortunately it sits on top of everything
Index: releases/bedework-3.4.1.1/deployment/resources/build.xml
===================================================================
--- trunk/deployment/resources/build.xml (revision 1193)
+++ releases/bedework-3.4.1.1/deployment/resources/build.xml (revision 1808)
@@ -105,20 +105,27 @@
       </then>
       <else>
-        <!-- Just copy into a common location -->
-        <property name="cmn.destdir"
-                  location="${org.bedework.appserver.dir}/${org.bedework.global.common.deploydir}"/>
         <if>
-          <isset property="org.bedework.use.dojo" />
+          <not>
+            <isset property="org.bedework.global.noskins" />
+          </not>
           <then>
-            <!-- Add dojo -->
-            <copy todir="${cmn.destdir}/javascript/dojo">
-              <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" />
+            <!-- Just copy into a common location -->
+            <property name="cmn.destdir"
+                      location="${org.bedework.appserver.dir}/${org.bedework.global.common.deploydir}"/>
+            <if>
+              <isset property="org.bedework.use.dojo" />
+              <then>
+                <!-- Add dojo -->
+                <copy todir="${cmn.destdir}/javascript/dojo">
+                  <fileset dir="${common.resources.dir}/javascript/${dojo.dir}" />
+                </copy>
+              </then>
+            </if>
+
+            <copy todir="${cmn.destdir}">
+              <fileset dir="${common.resources.dir}/xsl" />
             </copy>
           </then>
         </if>
-
-        <copy todir="${cmn.destdir}">
-          <fileset dir="${common.resources.dir}/xsl" />
-        </copy>
       </else>
     </if>
Index: releases/bedework-3.4.1.1/deployment/termination/jboss/build.xml
===================================================================
--- releases/bedework-3.4.1/deployment/termination/jboss/build.xml (revision 1764)
+++ releases/bedework-3.4.1.1/deployment/termination/jboss/build.xml (revision 1808)
@@ -9,6 +9,8 @@
     <dirname property="this.dir" file="${ant.file}"/>
 
+    <property name="app.ear.file.name"
+              value="${org.bedework.global.ear.name}.ear" />
     <property name="app.ear.file"
-              location="${dist.home}/${org.bedework.global.ear.name}.ear" />
+              location="${dist.home}/${app.ear.file.name}" />
     <property name="app.resources.dir"
               location="${this.dir}/../webapp/resources" />
@@ -25,5 +27,5 @@
 
     <property name="ear.dir"
-              location="${org.bedework.temp.dir}/ear" />
+              location="${org.bedework.temp.dir}/${app.ear.file.name}" />
 
     <property name="properties.dir"
@@ -88,4 +90,21 @@
     <zip destfile="${app.ear.file}"
          basedir="${ear.dir}"/>
+
+    <!-- Deploy common resources -->
+    <ant antfile="${org.bedework.common.resources}/build.xml"
+         inheritrefs="true" target="deploy" />
+
+    <!-- copy the ear - at the moment copy the uncompressed. -->
+
+    <if>
+      <isset property="org.bedework.appserver.deploy.dir" />
+      <then>
+        <delete dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" />
+        <mkdir dir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}" />
+        <copy todir="${org.bedework.appserver.deploy.dir}/${app.ear.file.name}">
+          <fileset dir="${ear.dir}"/>
+        </copy>
+      </then>
+    </if>
   </target>
 
Index: releases/bedework-3.4.1.1/deployment/webadmin/jboss/build.xml
===================================================================
--- trunk/bedework/deployment/webadmin/jboss/build.xml (revision 952)
+++ releases/bedework-3.4.1.1/deployment/webadmin/jboss/build.xml (revision 1808)
@@ -26,4 +26,15 @@
     <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" />
     <echo message="***************************************************************" />
+    <if>
+      <not>
+        <isset property="org.bedework.global.noskins" />
+      </not>
+      <then>
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
+          <fileset dir="${this.dir}/../webapp/resources" />
+        </copy>
+      </then>
+    </if>
   </target>
 
Index: releases/bedework-3.4.1.1/deployment/webadmin/webapp/build.xml
===================================================================
--- trunk/deployment/webadmin/webapp/build.xml (revision 1443)
+++ releases/bedework-3.4.1.1/deployment/webadmin/webapp/build.xml (revision 1808)
@@ -40,8 +40,15 @@
 
   <target name="deploy" depends="init,build.configured" >
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
-      <fileset dir="${app.resources.dir}" />
-    </copy>
+    <if>
+      <not>
+        <isset property="org.bedework.global.noskins" />
+      </not>
+      <then>
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
+          <fileset dir="${app.resources.dir}" />
+        </copy>
+      </then>
+    </if>
 
     <!-- Deploy common resources -->
Index: releases/bedework-3.4.1.1/deployment/webconfig/jboss/build.xml
===================================================================
--- trunk/bedework/deployment/webconfig/jboss/build.xml (revision 952)
+++ releases/bedework-3.4.1.1/deployment/webconfig/jboss/build.xml (revision 1808)
@@ -26,4 +26,15 @@
     <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" />
     <echo message="***************************************************************" />
+    <if>
+      <not>
+        <isset property="org.bedework.global.noskins" />
+      </not>
+      <then>
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
+          <fileset dir="${this.dir}/../webapp/resources" />
+        </copy>
+      </then>
+    </if>
   </target>
 
Index: releases/bedework-3.4.1.1/deployment/webconfig/webapp/build.xml
===================================================================
--- trunk/deployment/webconfig/webapp/build.xml (revision 1164)
+++ releases/bedework-3.4.1.1/deployment/webconfig/webapp/build.xml (revision 1808)
@@ -47,8 +47,15 @@
 
   <target name="deploy" depends="init,build.configured" >
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
-      <fileset dir="${app.resources.dir}" />
-    </copy>
+    <if>
+      <not>
+        <isset property="org.bedework.global.noskins" />
+      </not>
+      <then>
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
+          <fileset dir="${app.resources.dir}" />
+        </copy>
+      </then>
+    </if>
 
     <echo message="***************************************************************" />
Index: releases/bedework-3.4.1.1/deployment/webpublic/jboss/build.xml
===================================================================
--- trunk/bedework/deployment/webpublic/jboss/build.xml (revision 952)
+++ releases/bedework-3.4.1.1/deployment/webpublic/jboss/build.xml (revision 1808)
@@ -26,4 +26,17 @@
     <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" />
     <echo message="***************************************************************" />
+    <!-- First copy the resources into the server -->
+
+    <if>
+      <not>
+        <isset property="org.bedework.global.noskins" />
+      </not>
+      <then>
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}" />
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}">
+          <fileset dir="${this.dir}/../webapp/resources/demoskins/${propval.app.cal.suite}" />
+        </copy>
+      </then>
+    </if>
   </target>
 
Index: releases/bedework-3.4.1.1/deployment/websubmit/jboss/build.xml
===================================================================
--- trunk/deployment/websubmit/jboss/build.xml (revision 1580)
+++ releases/bedework-3.4.1.1/deployment/websubmit/jboss/build.xml (revision 1808)
@@ -26,4 +26,10 @@
     <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" />
     <echo message="***************************************************************" />
+    <!-- First copy the resources into the server -->
+
+    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
+    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
+      <fileset dir="${this.dir}/../webapp/resources/demoskins" />
+    </copy>
   </target>
 
Index: releases/bedework-3.4.1.1/deployment/websubmit/webapp/build.xml
===================================================================
--- trunk/deployment/websubmit/webapp/build.xml (revision 1580)
+++ releases/bedework-3.4.1.1/deployment/websubmit/webapp/build.xml (revision 1808)
@@ -46,8 +46,15 @@
     <!-- First copy the resources into the server -->
 
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
-      <fileset dir="${app.resources.dir}/demoskins" />
-    </copy>
+    <if>
+      <not>
+        <isset property="org.bedework.global.noskins" />
+      </not>
+      <then>
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
+          <fileset dir="${app.resources.dir}/demoskins" />
+        </copy>
+      </then>
+    </if>
 
     <!-- Deploy common resources -->
Index: releases/bedework-3.4.1.1/deployment/webuser/jboss/build.xml
===================================================================
--- trunk/bedework/deployment/webuser/jboss/build.xml (revision 952)
+++ releases/bedework-3.4.1.1/deployment/webuser/jboss/build.xml (revision 1808)
@@ -26,4 +26,9 @@
     <echo message="Readying app ${propval.app.war.name}.war for jboss deployment" />
     <echo message="***************************************************************" />
+
+    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
+    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
+      <fileset dir="${this.dir}/../webapp/resources/demoskins" />
+    </copy>
   </target>
 
Index: releases/bedework-3.4.1.1/deployment/webuser/webapp/build.xml
===================================================================
--- trunk/deployment/webuser/webapp/build.xml (revision 1443)
+++ releases/bedework-3.4.1.1/deployment/webuser/webapp/build.xml (revision 1808)
@@ -46,8 +46,15 @@
     <!-- First copy the resources into the server -->
 
-    <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
-    <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
-      <fileset dir="${app.resources.dir}/demoskins" />
-    </copy>
+    <if>
+      <not>
+        <isset property="org.bedework.global.noskins" />
+      </not>
+      <then>
+        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}" />
+        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}">
+          <fileset dir="${app.resources.dir}/demoskins" />
+        </copy>
+      </then>
+    </if>
 
     <!-- Deploy common resources -->