Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ConfigDTO.java
===================================================================
diff -u -r7bb18278d88ece8eb4f86532540d5d366597fe3b -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ConfigDTO.java	(.../ConfigDTO.java)	(revision 7bb18278d88ece8eb4f86532540d5d366597fe3b)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ConfigDTO.java	(.../ConfigDTO.java)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -28,21 +28,11 @@
 
     String serverURL;
 
-    String version;
-
     public String getServerURL() {
         return serverURL;
     }
-    public String getVersion() {
-	return version;
-    }
 
     public void setServerURL(String serverURL) {
         this.serverURL = serverURL;
     }
-
-    public void setVersion(String version) {
-	this.version = version;
-    }
-
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
===================================================================
diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	(.../DimdimService.java)	(revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	(.../DimdimService.java)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -447,7 +447,7 @@
     public String getDimdimJoinConferenceURL(UserDTO userDTO, String meetingKey) throws Exception {
 
 	// Get Dimdim server url
-	String serverURL = getConfigValue(Constants.CFG_SERVER_URL);
+	String serverURL = getServerUrl().getValue();
 	if (serverURL == null) {
 	    DimdimService.logger.error("Config item : '" + Constants.CFG_SERVER_URL + "' not defined");
 	    throw new DimdimException("Standard server url not defined");
@@ -475,47 +475,30 @@
     public String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey, String returnURL, int maxAttendeeMikes)
 	    throws Exception {
 
-	String serverURL = getConfigValue(Constants.CFG_SERVER_URL);
+	String serverURL = getServerUrl().getValue();
 	if (serverURL == null) {
 	    DimdimService.logger.error("Config item : '" + Constants.CFG_SERVER_URL + "' not defined");
 	    throw new DimdimException("Standard server url not defined");
 	}
 
-	String version = getConfigValue(Constants.CFG_VERSION);
-	if (version == null) {
-	    DimdimService.logger.error("Config value " + Constants.CFG_VERSION + " returned null");
-	    throw new DimdimException("Server version not defined");
-	}
+	URL url = new URL(serverURL + "/dimdim/StartNewConferenceCheck.action?" + "email="
+		+ URLEncoder.encode(userDTO.getEmail(), "UTF8") + "&displayName="
+		+ URLEncoder.encode(userDTO.getFirstName() + " " + userDTO.getLastName(), "UTF8") + "&confKey="
+		+ URLEncoder.encode(meetingKey, "UTF8") + "&lobby=false" + "&networkProfile=3" + "&meetingHours=99"
+		+ "&maxAttendeeMikes=" + maxAttendeeMikes + "&returnUrl=" + URLEncoder.encode(returnURL, "UTF8")
+		+ "&presenterAV=av" + "&privateChatEnabled=true" + "&publicChatEnabled=true"
+		+ "&screenShareEnabled=true" + "&whiteboardEnabled=true");
+	//TODO remove this commented part if this tool works Ok
+//	url = new URL(serverURL + "/dimdim/StartNewConferenceCheck.action?" + "email="
+//		+ URLEncoder.encode(userDTO.getEmail(), "UTF8") + "&meetingRoomName="
+//		+ URLEncoder.encode(meetingKey, "UTF8") + "&displayName="
+//		+ URLEncoder.encode(userDTO.getFirstName() + " " + userDTO.getLastName(), "UTF8") + "&confName="
+//		+ "QandA" + "&lobby=" + "false" + "&networkProfile=" + "3" + "&meetingHours" + "=2"
+//		+ "&meetingMinutes=" + "0" + "&presenterAV=" + "av" + "&maxAttendeeMikes=" + maxAttendeeMikes
+//		+ "&returnUrl=" + URLEncoder.encode(returnURL, "UTF8") + "&whiteboardEnabled=" + "true"
+//		+ "&screenShareEnabled=" + "true" + "&participantListEnabled=true" + "&dialInfoVisible=true");
 
-	String response;
-	URL url;
-	if (version.equals(Constants.CFG_VERSION_STANDARD)) {
-
-	    url = new URL(serverURL + "/dimdim/StartNewConferenceCheck.action?" + "email="
-		    + URLEncoder.encode(userDTO.getEmail(), "UTF8") + "&displayName="
-		    + URLEncoder.encode(userDTO.getFirstName() + " " + userDTO.getLastName(), "UTF8") + "&confKey="
-		    + URLEncoder.encode(meetingKey, "UTF8") + "&lobby=false" + "&networkProfile=3" + "&meetingHours=99"
-		    + "&maxAttendeeMikes=" + maxAttendeeMikes + "&returnUrl=" + URLEncoder.encode(returnURL, "UTF8")
-		    + "&presenterAV=av" + "&privateChatEnabled=true" + "&publicChatEnabled=true"
-		    + "&screenShareEnabled=true" + "&whiteboardEnabled=true");
-
-	} else if (version.equals(Constants.CFG_VERSION_ENTERPRISE)) {
-
-	    url = new URL(serverURL + "/dimdim/StartNewConferenceCheck.action?" + "email="
-		    + URLEncoder.encode(userDTO.getEmail(), "UTF8") + "&meetingRoomName="
-		    + URLEncoder.encode(meetingKey, "UTF8") + "&displayName="
-		    + URLEncoder.encode(userDTO.getFirstName() + " " + userDTO.getLastName(), "UTF8") + "&confName="
-		    + "QandA" + "&lobby=" + "false" + "&networkProfile=" + "3" + "&meetingHours" + "=2"
-		    + "&meetingMinutes=" + "0" + "&presenterAV=" + "av" + "&maxAttendeeMikes=" + maxAttendeeMikes
-		    + "&returnUrl=" + URLEncoder.encode(returnURL, "UTF8") + "&whiteboardEnabled=" + "true"
-		    + "&screenShareEnabled=" + "true" + "&participantListEnabled=true" + "&dialInfoVisible=true");
-
-	} else {
-	    DimdimService.logger.error("Unknown version type: " + version);
-	    throw new DimdimException("Unknown version type");
-	}
-
-	response = sendRequest(url);
+	String response = sendRequest(url);
 	String path = DimdimUtil.getURL(response);
 
 	return serverURL + path;
@@ -540,25 +523,15 @@
     }
 
     @SuppressWarnings("unchecked")
-    public DimdimConfig getConfig(String key) {
-	List<DimdimConfig> list = dimdimConfigDAO.findByProperty(DimdimConfig.class, "key", key);
+    public DimdimConfig getServerUrl() {
+	List<DimdimConfig> list = dimdimConfigDAO.findByProperty(DimdimConfig.class, "key", Constants.CFG_SERVER_URL);
 	if (list.isEmpty()) {
 	    return null;
 	} else {
 	    return list.get(0);
 	}
     }
 
-    @SuppressWarnings("unchecked")
-    public String getConfigValue(String key) {
-	List<DimdimConfig> list = dimdimConfigDAO.findByProperty(DimdimConfig.class, "key", key);
-	if (list.isEmpty()) {
-	    return null;
-	} else {
-	    return list.get(0).getValue();
-	}
-    }
-
     public void saveOrUpdateConfigEntry(DimdimConfig dimdimConfig) {
 	dimdimConfigDAO.insertOrUpdate(dimdimConfig);
     }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
===================================================================
diff -u -r7bb18278d88ece8eb4f86532540d5d366597fe3b -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java	(.../IDimdimService.java)	(revision 7bb18278d88ece8eb4f86532540d5d366597fe3b)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java	(.../IDimdimService.java)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -161,17 +161,11 @@
      * 
      * @param key
      */
-    DimdimConfig getConfig(String key);
+    DimdimConfig getServerUrl();
 
     /**
      * 
      * @param key
-     */
-    String getConfigValue(String key);
-
-    /**
-     * 
-     * @param key
      * @param value
      */
     void saveOrUpdateConfigEntry(DimdimConfig dimdimConfig);
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java
===================================================================
diff -u -r7bb18278d88ece8eb4f86532540d5d366597fe3b -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java	(.../Constants.java)	(revision 7bb18278d88ece8eb4f86532540d5d366597fe3b)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java	(.../Constants.java)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -29,7 +29,6 @@
     public static final String APP_RESOURCES = "org.lamsfoundation.lams.tool.dimdim.ApplicationResources";
 
     // Attribute names
-    public static final String ATTR_ALLOW_VERSION_CHANGE = "allowVersionChange";
     public static final String ATTR_CONFIG_DTO = "configDTO";
     public static final String ATTR_CONTENT_DTO = "contentDTO";
     public static final String ATTR_CONTENT_FOLDER_ID = "contentFolderID";
@@ -40,11 +39,8 @@
     public static final String ATTR_TOOL_SESSION_ID = "toolSessionID";
     public static final String ATTR_USER_DTO = "userDTO";
 
-    // Configuration keys
+    // Configuration key
     public static final String CFG_SERVER_URL = "server_url";
-    public static final String CFG_VERSION = "version";
-    public static final String CFG_VERSION_ENTERPRISE = "enterprise";
-    public static final String CFG_VERSION_STANDARD = "standard";
 
     // Authoring SessionMap key names
     public static final String KEY_CONTENT_FOLDER_ID = "contentFolderID";
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java
===================================================================
diff -u -r7bb18278d88ece8eb4f86532540d5d366597fe3b -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java	(.../DimdimUtil.java)	(revision 7bb18278d88ece8eb4f86532540d5d366597fe3b)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java	(.../DimdimUtil.java)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -54,15 +54,16 @@
     }
 
     // helper functions to extract info from json response.
-
-    // get return code -- enterprise version
-    private static Pattern patternCode = Pattern.compile("code:\"(.*?)\"");
-
-    public static String getCode(String json) {
-	Matcher matcher = patternCode.matcher(json);
-	matcher.find();
-	return matcher.group(1);
-    }
+    //TODO remove commented part  if tool works ok
+//
+//    // get return code -- enterprise version
+//    private static Pattern patternCode = Pattern.compile("code:\"(.*?)\"");
+//
+//    public static String getCode(String json) {
+//	Matcher matcher = patternCode.matcher(json);
+//	matcher.find();
+//	return matcher.group(1);
+//    }
     
     // get result -- standard version
     private static Pattern patternResult = Pattern.compile("result:\"(.*?)\"");
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java
===================================================================
diff -u -re9388fcaba88e920c4f820579bbff3f522829e06 -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java	(.../AdminAction.java)	(revision e9388fcaba88e920c4f820579bbff3f522829e06)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java	(.../AdminAction.java)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -72,10 +72,8 @@
 	    HttpServletResponse response) throws Exception {
 
 	ConfigDTO configDTO = new ConfigDTO();
+	configDTO.setServerURL(dimdimService.getServerUrl().getValue());
 
-	configDTO.setServerURL(dimdimService.getConfigValue(Constants.CFG_SERVER_URL));
-	configDTO.setVersion(dimdimService.getConfigValue(Constants.CFG_VERSION));
-
 	request.setAttribute(Constants.ATTR_CONFIG_DTO, configDTO);
 	return mapping.findForward("view-success");
     }
@@ -84,55 +82,33 @@
 	    HttpServletResponse response) {
 
 	AdminForm adminForm = (AdminForm) form;
+	adminForm.setServerURL(dimdimService.getServerUrl().getValue());
 
-	adminForm.setServerURL(dimdimService.getConfigValue(Constants.CFG_SERVER_URL));
-	adminForm.setVersion(dimdimService.getConfigValue(Constants.CFG_VERSION));
-
-	String version = adminForm.getVersion();
-	boolean allowVersionChange = true;
-	if (isVersionSet(version)) {
-	    allowVersionChange = false;
-	}
-	request.setAttribute(Constants.ATTR_ALLOW_VERSION_CHANGE, allowVersionChange);
-
 	return mapping.findForward("edit-success");
     }
 
     public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
 	if (!isCancelled(request)) {
-
 	    AdminForm adminForm = (AdminForm) form;
-
-	    // if version is already set, do not update
-	    String version = dimdimService.getConfigValue(Constants.CFG_VERSION);
-	    if (!isVersionSet(version)) {
-		updateConfig(Constants.CFG_VERSION, adminForm.getVersion());
+	    String serverUrl = adminForm.getServerURL().trim();
+	    
+	    DimdimConfig config = dimdimService.getServerUrl();
+	    if (config == null) {
+		config = new DimdimConfig(Constants.CFG_SERVER_URL, serverUrl);
+	    } else {
+		config.setValue(serverUrl);
 	    }
 
-	    updateConfig(Constants.CFG_SERVER_URL, adminForm.getServerURL().trim());
-
+	    dimdimService.saveOrUpdateConfigEntry(config);
 	}
 
 	return mapping.findForward("save-success");
     }
 
     private void updateConfig(String key, String value) {
 
-	DimdimConfig config = dimdimService.getConfig(key);
 
-	if (config == null) {
-	    config = new DimdimConfig(key, value);
-	} else {
-	    config.setValue(value);
-	}
-
-	dimdimService.saveOrUpdateConfigEntry(config);
     }
-
-    private boolean isVersionSet(String version) {
-	return version != null
-		&& (version.equals(Constants.CFG_VERSION_STANDARD) || version.equals(Constants.CFG_VERSION_ENTERPRISE));
-    }
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
===================================================================
diff -u -r7bb18278d88ece8eb4f86532540d5d366597fe3b -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7bb18278d88ece8eb4f86532540d5d366597fe3b)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -132,7 +132,6 @@
 	org.lamsfoundation.lams.usermanagement.dto.UserDTO lamsUserDTO = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) SessionManager
 		.getSession().getAttribute(AttributeNames.USER);
 
-	// Enterprise Version
 	String meetingStartURL = dimdimService
 		.getDimdimStartConferenceURL(lamsUserDTO, DimdimUtil.getMeetingKey(session.getSessionId()), DimdimUtil
 			.getReturnURL(request), session.getMaxAttendeeMikes());
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java
===================================================================
diff -u -r7bb18278d88ece8eb4f86532540d5d366597fe3b -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java	(.../AdminForm.java)	(revision 7bb18278d88ece8eb4f86532540d5d366597fe3b)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java	(.../AdminForm.java)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -45,39 +45,22 @@
 
     private String serverURL;
 
-    private String version;
-
     // Fields
 
     public String getServerURL() {
 	return serverURL;
     }
 
-    public String getVersion() {
-	return version;
-    }
-
     public void setServerURL(String serverURL) {
 	this.serverURL = serverURL;
     }
 
-    public void setVersion(String version) {
-	this.version = version;
-    }
-
     @Override
     public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) {
 
 	ActionErrors errors = new ActionErrors();
-
 	MessageResources resources = MessageResources.getMessageResources(Constants.APP_RESOURCES);
 
-	if (!this.version.equals(Constants.CFG_VERSION_STANDARD)
-		&& !this.version.equals(Constants.CFG_VERSION_ENTERPRISE)) {
-	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.mandatoryField", resources
-		    .getMessage("config.version")));
-	}
-
 	if (StringUtils.isBlank(this.serverURL)) {
 	    errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.mandatoryField", resources
 		    .getMessage("config.serverURL")));
Index: lams_tool_dimdim/web/pages/admin/edit.jsp
===================================================================
diff -u -r9dddcc62f03a74d317b002f23c59ead28ee24afa -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/web/pages/admin/edit.jsp	(.../edit.jsp)	(revision 9dddcc62f03a74d317b002f23c59ead28ee24afa)
+++ lams_tool_dimdim/web/pages/admin/edit.jsp	(.../edit.jsp)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -16,28 +16,6 @@
 </logic:messagesPresent> <html:form action="/admin/save">
 
 	<table>
-		<c:choose>
-			<c:when test="${allowVersionChange}">
-				<tr>
-					<td><fmt:message key="config.version" /></td>
-					<td><html:select property="version">
-						<html:option value="">
-							<fmt:message key="label.version.pleaseSelect" />
-						</html:option>
-						<html:option value="standard">
-							<fmt:message key="label.version.standard" />
-						</html:option>
-						<html:option value="enterprise">
-							<fmt:message key="label.version.enterprise" />
-						</html:option>
-					</html:select></td>
-				</tr>
-			</c:when>
-			<c:otherwise>
-				<html:hidden property="version" />
-			</c:otherwise>
-		</c:choose>
-
 		<tr>
 			<td><fmt:message key="config.serverURL" /></td>
 			<td><html:text property="serverURL" /></td>
Index: lams_tool_dimdim/web/pages/admin/view.jsp
===================================================================
diff -u -r7bb18278d88ece8eb4f86532540d5d366597fe3b -rec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0
--- lams_tool_dimdim/web/pages/admin/view.jsp	(.../view.jsp)	(revision 7bb18278d88ece8eb4f86532540d5d366597fe3b)
+++ lams_tool_dimdim/web/pages/admin/view.jsp	(.../view.jsp)	(revision ec79327ab1a4c1e87d301fb8f48f6ff38f8e06f0)
@@ -6,10 +6,6 @@
 
 <table>
 	<tr>
-		<td><fmt:message key="config.version" /></td>
-		<td><c:out value="${configDTO.version}" /></td>
-	</tr>
-	<tr>
 		<td><fmt:message key="config.serverURL" /></td>
 		<td><c:out value="${configDTO.serverURL}" /></td>
 	</tr>