Index: C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/java/org/trails/demo/Organization.java
===================================================================
--- C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/java/org/trails/demo/Organization.java	(revision 490)
+++ C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/java/org/trails/demo/Organization.java	(working copy)
@@ -15,6 +15,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -110,7 +111,14 @@
         return league;
     }
 
-    @OneToOne
+    @OneToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "director_fk", insertable = true, updatable = true, nullable = true)
+
+    //@OneToOne(cascade = CascadeType.ALL)
+    //@JoinTable(name = "OrganizationDirector",
+    //        joinColumns = @JoinColumn(name = "director_fk", insertable = true, updatable = true, nullable = true),
+    //        inverseJoinColumns = {@JoinColumn(name = "organization_fk", insertable = true, updatable = true, nullable = true)}
+    //)
     @OrderBy("lastName")
     @PropertyDescriptor(index = 2)
     public Director getDirector() {
Index: C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/java/org/trails/demo/Director.java
===================================================================
--- C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/java/org/trails/demo/Director.java	(revision 490)
+++ C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/java/org/trails/demo/Director.java	(working copy)
@@ -2,9 +2,8 @@
 
 import java.io.Serializable;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
 import javax.persistence.OneToOne;
 
 import org.apache.commons.beanutils.BeanUtils;
@@ -43,7 +42,12 @@
         setApplicationRole(EApplicationRole.DIRECTOR);
     }
 
-    @OneToOne(optional = true, mappedBy = "director")
+    //@OneToOne(optional = false, mappedBy = "director")
+    //@JoinTable(name = "OrganizationDirector",
+    //        joinColumns = @JoinColumn(name = "organization_fk", insertable = true, updatable = true, nullable = true),
+    //        inverseJoinColumns = {@JoinColumn(name = "director_fk", insertable = true, updatable = true, nullable = true)}
+    //)
+    @OneToOne(cascade = CascadeType.ALL, mappedBy = "director")
     public Organization getOrganization() {
         return organization;
     }
Index: C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/resources/applicationContext.xml
===================================================================
--- C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/resources/applicationContext.xml	(revision 490)
+++ C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/resources/applicationContext.xml	(working copy)
@@ -250,7 +250,7 @@
                         <constructor-arg index="1"><value>enumEditor</value></constructor-arg>
                     </bean>
                 </entry>
-                <!-- disabled for 1.0 release pending review
+                <!-- disabled for 1.0 release pending review -->
                 <entry>
                     <key><value>supportsExtension('org.trails.descriptor.BlobDescriptorExtension')</value></key>
                     <bean class="org.apache.tapestry.util.ComponentAddress">
@@ -258,8 +258,8 @@
                         <constructor-arg index="1"><value>blobEditor</value></constructor-arg>
                     </bean>
                 </entry>
-                -->
-                <!-- disabled for 1.0 release pending review
+
+                <!-- disabled for 1.0 release pending review -->
                 <entry>
                     <key><value>owningObjectReference</value></key>
                     <bean class="org.apache.tapestry.util.ComponentAddress">
@@ -267,7 +267,7 @@
                         <constructor-arg index="1"><value>owningReferenceEditor</value></constructor-arg>
                     </bean>
                 </entry>
-                -->
+
                 <entry>
                 <key><value>objectReference</value></key>
                 <bean class="org.apache.tapestry.util.ComponentAddress">
Index: C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/resources/hibernate.properties
===================================================================
--- C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/resources/hibernate.properties	(revision 490)
+++ C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/src/main/resources/hibernate.properties	(working copy)
@@ -1,11 +1,9 @@
-hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.show_sql=true
 hibernate.hbm2ddl.auto=update
-
-hibernate.connection.driver_class=org.hsqldb.jdbcDriver
-hibernate.connection.url=jdbc:hsqldb:mem:test
-hibernate.connection.username=sa
-hibernate.connection.password=
-
-hibernate.max_fetch_depth=9
+hibernate.max_fetch_depth=10
+hibernate.connection.driver_class=com.mysql.jdbc.Driver
+hibernate.connection.url=jdbc:mysql://localhost:3306/roster?jdbcCompliantTruncation=false
+hibernate.connection.username=root
+hibernate.connection.password=admin
 hibernate.jdbc.batch_versioned_data=true
\ No newline at end of file
Index: C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/pom.xml
===================================================================
--- C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/pom.xml	(revision 490)
+++ C:/Prototype/Mavenized/Product/trails/trunk/trails/examples/roster/pom.xml	(working copy)
@@ -40,36 +40,6 @@
           </includes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <version>0.2</version>
-        <configuration>
-          <wait>false</wait>
-          <container>
-            <containerId>tomcat5x</containerId>
-            <zipUrlInstaller>
-              <url>http://apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.zip</url>
-            </zipUrlInstaller>
-          </container>
-        </configuration>
-        <executions>
-          <execution>
-            <id>start-container</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>start</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>stop-container</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>stop</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>