Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java,v
diff -u -r1.5 -r1.6
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	21 Sep 2007 03:34:24 -0000	1.5
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	12 Dec 2007 05:40:46 -0000	1.6
@@ -115,7 +115,8 @@
 		}else{
 			Integer orgId = (Integer)serverOrgMapForm.get("orgId");
 			if(orgId.equals(-1)){
-				errors.add("orgId",new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation")));
+				// LDEV-1284 no need for integration organisation anymore
+				// errors.add("orgId",new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation")));
 			}else{
 				org = (Organisation)userService.findById(Organisation.class, orgId);
 			}
Index: lams_admin/web/servermaintain.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/servermaintain.jsp,v
diff -u -r1.6 -r1.7
--- lams_admin/web/servermaintain.jsp	14 Jun 2007 06:12:40 -0000	1.6
+++ lams_admin/web/servermaintain.jsp	12 Dec 2007 05:40:46 -0000	1.7
@@ -36,18 +36,16 @@
 		<td><fmt:message key="sysadmin.disabled" />:</td>
 		<td><html:checkbox property="disabled" /></td>
 	</tr>
+	<logic:notEqual name="ServerOrgMapForm" property="orgId" value="-1">
 	<tr>
 		<td><fmt:message key="sysadmin.organisation" />:</td>
 		<td>
 			<html:select property="orgId" >
 				<html:options collection="orgs" property="organisationId" labelProperty="name"/> 
 			</html:select> &nbsp; 
-			<fmt:message key="label.or" /> &nbsp;
-			<html:checkbox property="newOrg" onclick="changeStatus(this)" /> 
-			<fmt:message key="sysadmin.organisation.create" />
-			<html:text property="orgName" disabled="true" size="20"/> *
 		</td>
 	</tr>
+	</logic:notEqual>
 	<tr>
 		<td><fmt:message key="sysadmin.userinfoUrl" />:</td>
 		<td><html:text property="userinfoUrl" size="70"/> *</td>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/Attic/ExtServerOrgMap.hbm.xml,v
diff -u -r1.3 -r1.4
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	23 Sep 2006 12:05:18 -0000	1.3
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml	12 Dec 2007 05:40:47 -0000	1.4
@@ -213,11 +213,9 @@
     <many-to-one
         name="organisation"
         class="org.lamsfoundation.lams.usermanagement.Organisation"
-        not-null="true"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
-            not-null="true"
            @hibernate.column name="orgid"         
         </meta>
         <column name="orgid" />
Index: lams_common/db/sql/updatescripts/alter_21_branching.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/updatescripts/Attic/alter_21_branching.sql,v
diff -u -r1.24 -r1.25
--- lams_common/db/sql/updatescripts/alter_21_branching.sql	9 Dec 2007 23:25:19 -0000	1.24
+++ lams_common/db/sql/updatescripts/alter_21_branching.sql	12 Dec 2007 05:40:47 -0000	1.25
@@ -270,3 +270,6 @@
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('LearnerProgressBatchSize', '10', 'config.learner.progress.batch.size', 'config.header.look.feel', 'LONG', 1);
+
+-- LDEV-1284 integration organisation no longer mandatory
+alter table lams_ext_server_org_map modify column orgid bigint(20);