Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
===================================================================
diff -u -r36a3488f8517a3143da11d93f287c782f7e758bd -rc624fa1214cb17e6966fc6593f13080404b0df0f
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision 36a3488f8517a3143da11d93f287c782f7e758bd)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision c624fa1214cb17e6966fc6593f13080404b0df0f)
@@ -61,8 +61,9 @@
 	<!--  repository (as repositoryAdminService) and ticket are the two main interfaces -->
 	<!--  into the repository and as such have transaction definitions on their interfaces -->
 
-	<!--  don't actually have to specify to roll back on RepositoryRuntimeException (as Runtime exceptions roll back -->
-	<!--  automatically, but put then in here as documentation	-->
+	<!--  Only rollback on runtime exceptions - the checked exceptions may be handled by -->
+	<!--  the calling code, so we don't want to mark the transaction as rollback.        -->
+	<!--  Exceptions that we don't want people to catch shouldn't be a checked exception -->
 	<bean id="repositoryService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name ="transactionManager">
 			<ref bean ="transactionManager"/>
@@ -72,23 +73,23 @@
 		</property>
 		<property name="transactionAttributes">
 			<props>
-				<prop key="login">PROPAGATION_SUPPORTS,readOnly,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="addWorkspace">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="createCredentials">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="assignCredentials">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="updateCredentials">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="addFileItem">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="addPackageItem">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="updateFileItem">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="updatePackageItem">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="deleteVersion">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="deleteNode">PROPAGATION_REQUIRED,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="logout">PROPAGATION_SUPPORTS,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="setProperty">PROPAGATION_SUPPORTS,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
+				<prop key="login">PROPAGATION_SUPPORTS,readOnly</prop>
+				<prop key="addWorkspace">PROPAGATION_REQUIRED</prop>
+				<prop key="createCredentials">PROPAGATION_REQUIRED</prop>
+				<prop key="assignCredentials">PROPAGATION_REQUIRED</prop>
+				<prop key="updateCredentials">PROPAGATION_REQUIRED</prop>
+				<prop key="addFileItem">PROPAGATION_REQUIRED</prop>
+				<prop key="addPackageItem">PROPAGATION_REQUIRED</prop>
+				<prop key="updateFileItem">PROPAGATION_REQUIRED</prop>
+				<prop key="updatePackageItem">PROPAGATION_REQUIRED</prop>
+				<prop key="deleteVersion">PROPAGATION_REQUIRED</prop>
+				<prop key="deleteNode">PROPAGATION_REQUIRED</prop>
+				<prop key="logout">PROPAGATION_SUPPORTS</prop>
+				<prop key="setProperty">PROPAGATION_SUPPORTS</prop>
 				<!--  Read only methods -->
-				<prop key="getFileItem">PROPAGATION_REQUIRED,readOnly,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="getVersionHistory">PROPAGATION_REQUIRED,readOnly,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
-				<prop key="getNodeList">PROPAGATION_REQUIRED,readOnly,-RepositoryCheckedException,-RepositoryRuntimeException</prop>
+				<prop key="getFileItem">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="getVersionHistory">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="getNodeList">PROPAGATION_REQUIRED,readOnly</prop>
 			</props>
 		</property>
 		<property name="preInterceptors">
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/package.html
===================================================================
diff -u -r76ec9f8751b089a3c39e97bd92e72e4d11b41911 -rc624fa1214cb17e6966fc6593f13080404b0df0f
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/package.html	(.../package.html)	(revision 76ec9f8751b089a3c39e97bd92e72e4d11b41911)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/package.html	(.../package.html)	(revision c624fa1214cb17e6966fc6593f13080404b0df0f)
@@ -77,16 +77,16 @@
 
 <p>Note:  All interfaces with Admin in their name are only to be used within the repository and must not be used by tools. </p>
 
-<h2>Spring Context File</h2>
+<h2>Spring Context</h2>
 
 <p>The context file for Spring is available as /org/lamsfoundation/lams/contentrepository/applicationContext.xml.</p>
 
 <p>The only bean that should be accessed directly is the repository service. The
 bean reference is "repositoryService".</p>
 
-<p>There is a local context file available as /org/lamsfoundation/lams/contentrepository/localApplicationContext.xml.
-This should only be used in junit testing. This uses a local database (rather than the JNDI datasource) and
-does not use a cache.</p>
+<p>The content repository uses the core datasource and the shared transaction manager
+defined in /org/lamsfoundation/lams/applicationContext.xml. When using the content repository
+for junit testing, make sure you include /org/lamsfoundation/lams/localApplicationContext.xml.
 
 <h2>Typical Usage</h2>
 
@@ -240,12 +240,13 @@
 RepositoryCheckedException.</P>
 
 <p>All the calls on IRepository should be transactional, defined
-in the Spring context file. If any are not defined in the context file, then
-this is a bug and should be corrected!!!!!!!!!. All 
-of the transactions should roll back on both the RepositoryCheckedException
-(as it is defined in the context file) and RepositoryRuntimeException
-as the Spring trasactions will roll back on any RuntimeException.
-However, all we can roll back are database changes. We cannot roll back
+in the Spring context file.  Runtime exceptions will trigger the transaction 
+to be marked for rollback. Checked exceptions will NOT trigger the transaction 
+to be marked for rollback so it is up to the calling code to trigger a 
+rollback if needed. This allows the calling code to handle the exception and 
+continue the transaction.</p>
+
+<p>However, all we can roll back are database changes. We cannot roll back
 file system changes. For this reason, we try to do the database changes
 first. But it isn't perfect. </p>
 
@@ -254,7 +255,7 @@
 <UL>
 <LI><STRONG>Repository location</STRONG> Edit 
 org.lamsfoundation.lams.contentrepository.contentRepositoryApplicationContext.xml 
-(in the src hierarchy). Defaults to D:\repository. This can reside anywhere it 
+(in the src hierarchy). Defaults to /tmp/repository. This can reside anywhere it 
 can be accessed as a directory - it does not need to be under the JBOSS hierarchy.
 <EM>This needs to be changed to pick up the value from the database!</EM></LI>
 <LI><STRONG>Database user and password</STRONG> Edit build.properties (in the root of the project)
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java
===================================================================
diff -u -r36a3488f8517a3143da11d93f287c782f7e758bd -rc624fa1214cb17e6966fc6593f13080404b0df0f
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java	(.../IRepositoryService.java)	(revision 36a3488f8517a3143da11d93f287c782f7e758bd)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java	(.../IRepositoryService.java)	(revision c624fa1214cb17e6966fc6593f13080404b0df0f)
@@ -43,7 +43,13 @@
 import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
 
 /**
- * Tool access to the repository
+ * Tool access to the repository.
+ * <p> 
+ * Runtime exceptions will trigger the transaction to be marked for rollback.
+ * Checked exceptions will NOT trigger the transaction to be marked for 
+ * rollback so it is up to the calling code to trigger a rollback if needed.
+ * This allows the calling code to handle the exception and continue the
+ * transaction.
  */
 public interface IRepositoryService {
 
@@ -85,7 +91,6 @@
 	 * It does not clear the password in the credentials
 	 * @param credentials this user/password must already exist in the repository. Password will be checked.
 	 * @param workspaceName 
-	 * @param credentials   The credentials of the user/tool
 	 * @throws LoginException if credentials are not authorised to add/access the new workspace.
 	 * @throws ItemExistsException if the workspace already exists.
 	 * @throws RepositoryCheckedException if parameters are missing.	 
@@ -212,8 +217,8 @@
      * Sets the property to a value, based on the specified type.  Removes the property if the value is null.
      *
      * @param ticket Mandatory
-     * @pararm uuid Mandatory
-     * @pararm versionId Mandatory
+     * @param uuid Mandatory
+     * @param versionId Mandatory
      * @param name  The name of a property of this node
      * @param value The value to be assigned
      * @param type  The type of the property. See org.lamsfoundation.lams.contentrepository.PropertyType