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.3.4.2 -r1.3.4.3
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	21 Sep 2007 03:49:25 -0000	1.3.4.2
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java	12 Dec 2007 05:46:30 -0000	1.3.4.3
@@ -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.5 -r1.5.6.1
--- lams_admin/web/servermaintain.jsp	4 Dec 2006 23:22:57 -0000	1.5
+++ lams_admin/web/servermaintain.jsp	12 Dec 2007 05:46:30 -0000	1.5.6.1
@@ -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.3.10.1
--- 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:46:30 -0000	1.3.10.1
@@ -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" />
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/db/sql/updatescripts/alter_206_integration.sql'.
Fisheye: No comparison available.  Pass `N' to diff?