Index: lams_build/conf/unix/lams/lams.dtd
===================================================================
diff -u -r9437b396ea753716b90221a4cef08ff948bfe5c8 -r426b357d062c154d5e33e575d44abab5f12dca62
--- lams_build/conf/unix/lams/lams.dtd (.../lams.dtd) (revision 9437b396ea753716b90221a4cef08ff948bfe5c8)
+++ lams_build/conf/unix/lams/lams.dtd (.../lams.dtd) (revision 426b357d062c154d5e33e575d44abab5f12dca62)
@@ -27,6 +27,10 @@
+
+
+
+
Index: lams_build/conf/unix/lams/lams.xml
===================================================================
diff -u -rc19fa8bd4417eb64df23aae92609dca0a30805f2 -r426b357d062c154d5e33e575d44abab5f12dca62
--- lams_build/conf/unix/lams/lams.xml (.../lams.xml) (revision c19fa8bd4417eb64df23aae92609dca0a30805f2)
+++ lams_build/conf/unix/lams/lams.xml (.../lams.xml) (revision 426b357d062c154d5e33e575d44abab5f12dca62)
@@ -37,4 +37,8 @@
2006-01-02
+ shaun.melcoe.mq.edu.au
+ conference.shaun.melcoe.mq.edu.au
+ admin
+ wildfire
Index: lams_build/conf/windows/lams/lams.dtd
===================================================================
diff -u -r9437b396ea753716b90221a4cef08ff948bfe5c8 -r426b357d062c154d5e33e575d44abab5f12dca62
--- lams_build/conf/windows/lams/lams.dtd (.../lams.dtd) (revision 9437b396ea753716b90221a4cef08ff948bfe5c8)
+++ lams_build/conf/windows/lams/lams.dtd (.../lams.dtd) (revision 426b357d062c154d5e33e575d44abab5f12dca62)
@@ -27,6 +27,10 @@
+
+
+
+
@@ -37,4 +41,3 @@
-
Index: lams_build/conf/windows/lams/lams.xml
===================================================================
diff -u -r8ad50691f2ceb087e15e9822c1db74c94951c5da -r426b357d062c154d5e33e575d44abab5f12dca62
--- lams_build/conf/windows/lams/lams.xml (.../lams.xml) (revision 8ad50691f2ceb087e15e9822c1db74c94951c5da)
+++ lams_build/conf/windows/lams/lams.xml (.../lams.xml) (revision 426b357d062c154d5e33e575d44abab5f12dca62)
@@ -37,4 +37,8 @@
2006-01-02
+ shaun.melcoe.mq.edu.au
+ conference.shaun.melcoe.mq.edu.au
+ admin
+ wildfire
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r2bdb7e4722ed94f5c3a2d875b613aba8227c8383 -r426b357d062c154d5e33e575d44abab5f12dca62
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r426b357d062c154d5e33e575d44abab5f12dca62
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 426b357d062c154d5e33e575d44abab5f12dca62)
@@ -84,6 +84,19 @@
public static String DICTIONARY_CREATE_DATE = "createDate";
- public static String DICTIONARY_LANGUAGE = "language";
+ public static String DICTIONARY_LANGUAGE = "language";
+ public static String XMPP_DOMAIN = "XmppDomain";
+
+ public static String XMPP_CONFERENCE = "XmppConference";
+
+ public static String XMPP_ADMIN = "XmppAdmin";
+
+ public static String XMPP_PASSWORD = "XmppPassword";
+
+
+
+
+
+
}
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -r4869be0e90f646405e741fb6e1a64e9d9f8e7df3 -r426b357d062c154d5e33e575d44abab5f12dca62
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 4869be0e90f646405e741fb6e1a64e9d9f8e7df3)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 426b357d062c154d5e33e575d44abab5f12dca62)
@@ -88,6 +88,8 @@
import org.lamsfoundation.lams.tool.exception.ToolException;
import org.lamsfoundation.lams.tool.service.ILamsToolService;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
import org.lamsfoundation.lams.util.audit.IAuditService;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -518,14 +520,14 @@
public void createJabberRoom(ChatSession chatSession) {
try {
XMPPConnection.DEBUG_ENABLED = false;
- XMPPConnection con = new XMPPConnection(ChatConstants.XMPPDOMAIN);
+ XMPPConnection con = new XMPPConnection(Configuration.get(ConfigurationKeys.XMPP_DOMAIN));
- con.login(ChatConstants.XMPP_ADMIN_USERNAME,
- ChatConstants.XMPP_ADMIN_PASSWORD);
+ con.login(Configuration.get(ConfigurationKeys.XMPP_ADMIN),
+ Configuration.get(ConfigurationKeys.XMPP_PASSWORD));
// Create a MultiUserChat using an XMPPConnection for a room
String jabberRoom = new Long(System.currentTimeMillis()).toString()
- + "@" + ChatConstants.XMPPCONFERENCE;
+ + "@" + Configuration.get(ConfigurationKeys.XMPP_CONFERENCE);
MultiUserChat muc = new MultiUserChat(con, jabberRoom);
@@ -563,6 +565,7 @@
}
public void processIncomingMessages(NodeList messageElems) {
+
for (int i = 0; i < messageElems.getLength(); i++) {
// extract message attributes
Node message = messageElems.item(i);
@@ -892,7 +895,7 @@
*/
private String createJabberId(UserDTO user) {
try {
- XMPPConnection con = new XMPPConnection(ChatConstants.XMPPDOMAIN);
+ XMPPConnection con = new XMPPConnection(Configuration.get(ConfigurationKeys.XMPP_DOMAIN));
AccountManager manager = con.getAccountManager();
if (manager.supportsAccountCreation()) {
@@ -905,7 +908,7 @@
logger.error(e);
// TODO handle exception
}
- return user.getUserID() + "@" + ChatConstants.XMPPDOMAIN;
+ return user.getUserID() + "@" + Configuration.get(ConfigurationKeys.XMPP_DOMAIN);
}
private NodeKey processFile(FormFile file, String type) {
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java
===================================================================
diff -u -ra4c0781b761a40fb513ad939d6d342a086dad701 -r426b357d062c154d5e33e575d44abab5f12dca62
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java (.../ChatConstants.java) (revision a4c0781b761a40fb513ad939d6d342a086dad701)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java (.../ChatConstants.java) (revision 426b357d062c154d5e33e575d44abab5f12dca62)
@@ -51,11 +51,5 @@
// Parameter names
public static final String PARAM_PARENT_PAGE = "parentPage";
- // TODO this is temporary for developement. this should not remain here.
- static final String XMPPDOMAIN = "shaun.melcoe.mq.edu.au";
- static final String XMPPCONFERENCE = "conference.shaun.melcoe.mq.edu.au";
- static final String XMPP_ADMIN_USERNAME = "admin";
- static final String XMPP_ADMIN_PASSWORD = "wildfire";
-
static final String FILTER_REPLACE_TEXT = "***";
}
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
===================================================================
diff -u -r47041304a9d027531f04cc2a0217b7dda2acc913 -r426b357d062c154d5e33e575d44abab5f12dca62
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java (.../LearningAction.java) (revision 47041304a9d027531f04cc2a0217b7dda2acc913)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java (.../LearningAction.java) (revision 426b357d062c154d5e33e575d44abab5f12dca62)
@@ -46,6 +46,8 @@
import org.lamsfoundation.lams.tool.exception.DataMissingException;
import org.lamsfoundation.lams.tool.exception.ToolException;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
import org.lamsfoundation.lams.web.session.SessionManager;
@@ -118,7 +120,7 @@
chatService.saveOrUpdateChatSession(chatSession);
}
- request.setAttribute("XMPPDOMAIN", ChatConstants.XMPPDOMAIN);
+ request.setAttribute("XMPPDOMAIN", Configuration.get(ConfigurationKeys.XMPP_DOMAIN));
request.setAttribute("USERNAME", chatUser.getUserId());
request.setAttribute("PASSWORD", chatUser.getUserId());
request.setAttribute("CONFERENCEROOM", chatSession.getJabberRoom());
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java
===================================================================
diff -u -r47041304a9d027531f04cc2a0217b7dda2acc913 -r426b357d062c154d5e33e575d44abab5f12dca62
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 47041304a9d027531f04cc2a0217b7dda2acc913)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 426b357d062c154d5e33e575d44abab5f12dca62)
@@ -27,8 +27,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -37,9 +35,9 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.tool.chat.dto.ChatDTO;
import org.lamsfoundation.lams.tool.chat.dto.ChatSessionDTO;
import org.lamsfoundation.lams.tool.chat.dto.ChatUserDTO;
-import org.lamsfoundation.lams.tool.chat.dto.ChatDTO;
import org.lamsfoundation.lams.tool.chat.model.Chat;
import org.lamsfoundation.lams.tool.chat.model.ChatMessage;
import org.lamsfoundation.lams.tool.chat.model.ChatSession;
@@ -50,6 +48,8 @@
import org.lamsfoundation.lams.tool.chat.util.ChatException;
import org.lamsfoundation.lams.tool.chat.web.forms.MonitoringForm;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
import org.lamsfoundation.lams.web.session.SessionManager;
@@ -162,7 +162,7 @@
// set the teachers visibility
- request.setAttribute("XMPPDOMAIN", ChatConstants.XMPPDOMAIN);
+ request.setAttribute("XMPPDOMAIN", Configuration.get(ConfigurationKeys.XMPP_DOMAIN));
request.setAttribute("USERNAME", chatUser.getUserId());
request.setAttribute("PASSWORD", chatUser.getUserId());
request.setAttribute("CONFERENCEROOM", chatSession.getJabberRoom());