Index: trunk/build/platforms/jbossService.xml
===================================================================
--- trunk/build/platforms/jbossService.xml (revision 2929)
+++ trunk/build/platforms/jbossService.xml (revision 2938)
@@ -153,6 +153,8 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" />
+  	<!--
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" />
+    -->
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/>
Index: trunk/config/bwbuild/jboss-postgresql/bedework-card-ds.xml
===================================================================
---  (revision )
+++ trunk/config/bwbuild/jboss-postgresql/bedework-card-ds.xml (revision 2938)
@@ -1,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
+<!-- $Id: mysql-ds.xml 88948 2009-05-15 14:09:08Z jesper.pedersen $ -->
+<!--  Datasource config for MySQL using 3.0.9 available from:
+http://www.mysql.com/downloads/api-jdbc-stable.html
+-->
+
+<datasources>
+  <local-tx-datasource>
+    <jndi-name>CardDS</jndi-name>
+    <connection-url>jdbc:postgresql://localhost:5433/bwcard3p6</connection-url>
+    <driver-class>org.postgresql.Driver</driver-class>
+    <user-name>bedework</user-name>
+    <password></password>
+        <!-- sql to call when connection is created.  Can be anything, select 1 is valid for PostgreSQL
+        <new-connection-sql>select 1</new-connection-sql>
+        -->
+
+        <!-- sql to call on an existing pooled connection when it is obtained from pool.  Can be anything, select 1 is valid for PostgreSQL
+        <check-valid-connection-sql>select 1</check-valid-connection-sql>
+        -->
+
+      <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+      <metadata>
+         <type-mapping>PostgreSQL 8.0</type-mapping>
+      </metadata>
+  </local-tx-datasource>
+
+
+</datasources>
+
Index: trunk/config/bwbuild/jboss-postgresql/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/cal.properties (revision 2877)
+++ trunk/config/bwbuild/jboss-postgresql/cal.properties (revision 2938)
@@ -47,4 +47,5 @@
 # much grief. 
 org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS
+org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS
 
 # Hibernate caching parameters
@@ -145,4 +146,7 @@
 # If set to true or yes will copy in the bedework db datasource def bedework-ds.xml
 org.bedework.global.copy.bedeworkds.config=yes
+#
+# If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml
+org.bedework.global.copy.bedeworkcardds.config=yes
 
 # ------------------------------------------------------------------------
Index: trunk/config/bwbuild/jboss-postgresql/carddav.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/carddav.options.xml (revision 2933)
+++ trunk/config/bwbuild/jboss-postgresql/carddav.options.xml (revision 2938)
@@ -104,6 +104,25 @@
             <debug>true</debug>
           </group-principal-dirHandler>
-
+          
           <!-- handle the user address book hierarchy -->
+          
+          <user-dirHandler classname="org.bedework.carddav.util.DbDirHandlerConfig" >
+            <pathPrefix>/user</pathPrefix>
+            
+            <className>org.bedework.carddav.server.dirHandlers.db.DbAddrBookDirHandler</className>
+
+            <queryLimit>1000</queryLimit> <!-- unimplemented -->
+          
+            <!-- This is the access set at the root. I'll do this as XML soon -->
+            <rootAccess>WONyA WANyFyS </rootAccess>
+          
+            <!-- This is the owner of the user root and user home -->
+            <rootOwner>/principals/users/root</rootOwner>
+            
+            <debug>true</debug>
+          </user-dirHandler>
+
+          <!-- handle the user address book hierarchy
+               How it might be done with ldap 
           <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
             <pathPrefix>/user</pathPrefix>
@@ -132,5 +151,6 @@
             <debug>true</debug>
           </user-dirHandler>
-
+          -->
+ 
           <public-locations-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
             <pathPrefix>/public/locations</pathPrefix>
@@ -207,7 +227,11 @@
           <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
 
-          <defaultAddressbook>address-book</defaultAddressbook>
-
+          <defaultAddressbook>addressbook</defaultAddressbook>
+
+          <!-- This will act as the root for the file system -->
           <addressBookHandlerPrefix>/user</addressBookHandlerPrefix>
+          
+          <!-- Needed for access calculations -->
+          <userHomeRoot>/user</userHomeRoot>
 
           <principalRoot>/principals</principalRoot>
@@ -229,7 +253,10 @@
           <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
 
-          <defaultAddressbook>address-book</defaultAddressbook>
+          <defaultAddressbook>addressbook</defaultAddressbook>
 
           <addressBookHandlerPrefix>/public</addressBookHandlerPrefix>
+          
+          <!-- Needed for access calculations -->
+          <userHomeRoot>/user</userHomeRoot>
 
           <principalRoot>/principals</principalRoot>
Index: trunk/config/bwbuild/jboss/bedework-card-ds.xml
===================================================================
---  (revision )
+++ trunk/config/bwbuild/jboss/bedework-card-ds.xml (revision 2938)
@@ -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>CardDS</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/CardDb3p6;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: trunk/config/bwbuild/jboss/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss/cal.properties (revision 2829)
+++ trunk/config/bwbuild/jboss/cal.properties (revision 2938)
@@ -42,4 +42,5 @@
 # much grief. 
 org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS
+org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS
 
 # Hibernate caching parameters
@@ -154,4 +155,7 @@
 # If set to true or yes will copy in the bedework db datasource def bedework-ds.xml
 org.bedework.global.copy.bedeworkds.config=yes
+#
+# If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml
+org.bedework.global.copy.bedeworkcardds.config=yes
 
 # ------------------------------------------------------------------------
Index: trunk/deployment/caldavTest/shellscr/resources/bwruntest.sh
===================================================================
--- trunk/deployment/caldavTest/shellscr/resources/bwruntest.sh (revision 994)
+++ trunk/deployment/caldavTest/shellscr/resources/bwruntest.sh (revision 2938)
@@ -5,5 +5,10 @@
 # JAVA_HOME needs to be defined
 
-cp=@CP@
+cp=.:./classes:./resources
+
+for i in lib/*
+  do
+    cp=$cp:$i
+done
 
 RUNCMD="$JAVA_HOME/bin/java -cp $cp @CALDAVTEST-CLASS@"