Index: lams_common/web/WEB-INF/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/Attic/applicationContext.xml,v
diff -u -r1.12 -r1.13
--- lams_common/web/WEB-INF/applicationContext.xml	13 Jan 2005 05:43:31 -0000	1.12
+++ lams_common/web/WEB-INF/applicationContext.xml	17 Jan 2005 05:15:26 -0000	1.13
@@ -108,6 +108,7 @@
 		<property name="userDAO"><ref local="userDAO"/></property>
 		<property name="roleDAO"><ref local="roleDAO"/></property>
 		<property name="organisationDAO"><ref local="organisationDAO"/></property>
+		<property name="organisationTypeDAO"><ref local="organisationTypeDAO"/></property>
 		<property name="userOrganisationDAO"><ref local="userOrganisationDAO"/></property>
 		<property name="userOrganisationRoleDAO"><ref local="userOrganisationRoleDAO"/></property>
 		<property name="authenticationMethodDAO"><ref local="authenticationMethodDAO"/></property>
@@ -120,7 +121,11 @@
 		<property name="transactionAttributes">
 			<props>
 				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
 				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>
@@ -137,6 +142,10 @@
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 
+	<bean id="organisationTypeDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
 	<bean id="authenticationMethodDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO">
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
@@ -149,8 +158,4 @@
 		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
 	</bean>
 
-	<bean id="organisationTypeDAO" class="com.lamsinternational.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-
 </beans>
Index: lams_common/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.5 -r1.6
--- lams_common/web/WEB-INF/struts/struts-config.xml	14 Jan 2005 05:51:56 -0000	1.5
+++ lams_common/web/WEB-INF/struts/struts-config.xml	17 Jan 2005 05:15:01 -0000	1.6
@@ -15,7 +15,11 @@
 	
     <form-bean name="PasswordChangeActionForm"
                type="com.lamsinternational.lams.web.PasswordChangeActionForm" />
+    
+    <form-bean name="OrganisationActionForm"
+               type="com.lamsinternational.lams.usermanagement.web.OrganisationActionForm" />
                
+               
 	</form-beans>
 	<!-- ========== Global Exceptions Definitions =================================== -->
 	<!--
@@ -38,11 +42,8 @@
     <action path="/home"
             type="com.lamsinternational.lams.web.HomeAction"
             parameter="method">
-      <forward name="sysadmin"
-               path=".admin.sysadmin">
-      </forward>
       <forward name="admin"
-               path="/admin.jsp">
+               path=".admin">
       </forward>
       <forward name="staff"
                path="/staff.jsp">
@@ -64,9 +65,26 @@
       <forward name="organisation"
                path=".admin.organisation">
       </forward>
+      <forward name="error"
+               path=".admin.error">
+      </forward>
 	</action>
 
+    <action path="/organisation"
+            type="com.lamsinternational.lams.usermanagement.web.OrganisationAction"
+            name="OrganisationActionForm"
+            scope="session"
+            input=".admin.organisation"
+            validate="true">
+      <forward name="admin"
+               path=".admin">
+      </forward>
+      <forward name="error"
+               path=".admin.error">
+      </forward>
+	</action>
 
+
     <action path="/passwordChanged"
             type="com.lamsinternational.lams.web.PasswordChangeAction"
             name="PasswordChangeActionForm"