Index: trunk/build.xml
===================================================================
--- trunk/build.xml (revision 2807)
+++ trunk/build.xml (revision 2811)
@@ -714,4 +714,7 @@
           file="${org.bedework.config.options}" />
 
+    <copy tofile="${app.dest.properties}/sysevents.properties"
+          file="${org.bedework.config.sysevents.properties}" />
+
     <path id="run.classpath">
       <fileset dir="${org.bedework.project.bedework}/applib">
Index: trunk/config/bwbuild/jboss/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss/cal.properties (revision 2796)
+++ trunk/config/bwbuild/jboss/cal.properties (revision 2811)
@@ -33,10 +33,4 @@
 org.bedework.global.hibernate.dialect=org.bedework.calcore.DerbyDialect
 
-# Parameters for shell apps - set the db name in the url below
-org.bedework.global.jdbcdriver=org.apache.derby.jdbc.ClientDriver
-org.bedework.global.jdbcurl="jdbc:derby://localhost:1527/bedework3p6
-org.bedework.global.jdbcid=sa
-org.bedework.global.jdbcpw=
-
 # DB Datasource for jboss services
 # There doesn't appear to be the extra level of indirection that the jboss-web.xml
@@ -94,9 +88,16 @@
 org.bedework.jquery.dir=jquery
 
+# ------------------------------------------------------------------------
+# Extra jars
+# ------------------------------------------------------------------------
+#
 # A place to put extra jars and files, e.g. jdbc drivers.
 # This can be directed at any local directory
 #
-# There can be three directories inside this, jdbc, shell and war.
+# There can be three directories inside this, server, shell and war.
 # org.bedework.global.ext.lib=${org.bedework.config.home}/lib
+
+# A list of jars to copy, delimited by ","
+org.bedework.global.extra.jars=${org.bedework.project.bedework}/projects/rpiutil/dist/rpiutil-3.6.jar
 
 # ------------------------------------------------------------------------
@@ -135,4 +136,18 @@
 #  Set to yes if you want your log4j.xml overwritten
 org.bedework.deploy.log4j.config=no
+
+# ------------------------------------------------------------------------
+# Parameters for shell apps - set the db name in the url below
+# ------------------------------------------------------------------------
+
+org.bedework.global.jdbcdriver=org.apache.derby.jdbc.ClientDriver
+org.bedework.global.jdbcurl="jdbc:derby://localhost:1527/${org.bedework.jboss.data.dir}/derby/CalDb3p6
+org.bedework.global.jdbcid=sa
+org.bedework.global.jdbcpw=
+
+#org.bedework.global.jdbcdriver=org.apache.derby.jdbc.EmbeddedDriver
+#org.bedework.global.jdbcurl=jdbc:derby:${org.bedework.jboss.data.dir}/derby/CalDb3p6
+#org.bedework.global.jdbcid=sa
+#org.bedework.global.jdbcpw=
 
 # ------------------------------------------------------------------------
Index: trunk/deployment/build.xml
===================================================================
--- trunk/deployment/build.xml (revision 2717)
+++ trunk/deployment/build.xml (revision 2811)
@@ -237,18 +237,25 @@
     <!-- copy jdbc jar so datasources work -->
     <if>
-      <available file="${org.bedework.global.ext.lib}/jdbc" type="dir" />
+      <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}/jdbc">
+          <fileset dir="${org.bedework.global.ext.lib}/server">
             <include name="*.jar"/>
           </fileset>
         </copy>
       </then>
-      <else>
-        <!-- Include the quickstart jdbc driver -->
-        <copy todir="${appserver.lib.dir}" file="${org.bedework.appjar.hsqldb}"/>
-      </else>
+    </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>
 
@@ -260,4 +267,8 @@
     </if>
   </target>
+	
+	<target name="copyToServer">
+    <copy todir="${appserver.lib.dir}" file="${org.bedework.extra.jar}" />
+	</target>
 
   <!-- =================================================================