Index: lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql
===================================================================
diff -u -rb729587d2ebffa80f02239e91bc80352869d311a -rb9d979e7f1478db56c700664c515c4036557f29f
--- lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql	(.../insert_lams_tool_lamc.sql)	(revision b729587d2ebffa80f02239e91bc80352869d311a)
+++ lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql	(.../insert_lams_tool_lamc.sql)	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -70,37 +70,3 @@
 	
 	
 		
-INSERT INTO tl_lamc11_options_content  (
-	  uid,
-	  correct_option,
-	  mc_que_content_id,
-	  mc_que_option_text
-)
-VALUES (
-	null,
-	0,
-	1,
-	'sample answer 2');
-	
-	
-	
-INSERT INTO tl_lamc11_options_content  (
-	  uid,
-	  correct_option,
-	  mc_que_content_id,
-	  mc_que_option_text
-)
-VALUES (
-	null,
-	1,
-	1,
-	'sample answer 3');
-	
-	
-
-	
-	
-	
-	
-	
-	
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
===================================================================
diff -u -r671255080ca12fba787bcf07b5d0d196fc96c5ea -rb9d979e7f1478db56c700664c515c4036557f29f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision 671255080ca12fba787bcf07b5d0d196fc96c5ea)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -36,7 +36,7 @@
 	
 	public McQueContent getToolDefaultQuestionContent(final long mcContentId);
 	
-	public McQueContent getQuestionContentByQuestionText(final String question);
+	public McQueContent getQuestionContentByQuestionText(final String question, final Long mcContentId);
  	
  	public void saveMcQueContent(McQueContent mcQueContent);
     
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
===================================================================
diff -u -r4336aafba788b801aa78c2dc27f8d07a2f932be7 -rb9d979e7f1478db56c700664c515c4036557f29f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision 4336aafba788b801aa78c2dc27f8d07a2f932be7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -47,7 +47,7 @@
 	 	
 	 	private static final String LOAD_QUESTION_CONTENT_BY_CONTENT_ID = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId";
 	 	
-	 	private static final String LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT = "from mcQueContent in class McQueContent where mcQueContent.question=:question";
+	 	private static final String LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT = "from mcQueContent in class McQueContent where mcQueContent.question=:question and mcQueContent.mcContentId=:mcContentId";
 	 		 	
 	 	
 	 	public McQueContent getMcQueContentByUID(Long uid)
@@ -72,17 +72,19 @@
 	    }
 	 	
 	 	
-	 	public McQueContent getQuestionContentByQuestionText(final String question)
+	 	public McQueContent getQuestionContentByQuestionText(final String question, final Long mcContentId)
 	    {
-	        return (McQueContent) getHibernateTemplate().execute(new HibernateCallback()
-	         {
-	             public Object doInHibernate(Session session) throws HibernateException
-	             {
-	                 return session.createQuery(LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT)
-	                               .setString("question", question)
-	                               .uniqueResult();
-	             }
-	         });
+	        HibernateTemplate templ = this.getHibernateTemplate();
+			List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT)
+				.setString("question", question)
+				.setLong("mcContentId", mcContentId.longValue())				
+				.list();
+			
+			if(list != null && list.size() > 0){
+				McQueContent mcq = (McQueContent) list.get(0);
+				return mcq;
+			}
+			return null;
 	    }
 	 	
 	 	
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -rebdf73e801c6cb84f02b48e4860e1d7885f7ab84 -rb9d979e7f1478db56c700664c515c4036557f29f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision ebdf73e801c6cb84f02b48e4860e1d7885f7ab84)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -73,7 +73,7 @@
 	
     public void removeMcQueContent(McQueContent mcQueContent) throws McApplicationException;
     
-    public McQueContent getQuestionContentByQuestionText(final String question);
+    public McQueContent getQuestionContentByQuestionText(final String question, final Long mcContentId);
     
     public McSession retrieveMcSession(Long mcSessionId) throws McApplicationException;
     
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -rebdf73e801c6cb84f02b48e4860e1d7885f7ab84 -rb9d979e7f1478db56c700664c515c4036557f29f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision ebdf73e801c6cb84f02b48e4860e1d7885f7ab84)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -287,11 +287,11 @@
 	}
 
     
-    public McQueContent getQuestionContentByQuestionText(final String question)
+    public McQueContent getQuestionContentByQuestionText(final String question, final Long mcContentId)
     {
         try
         {
-            return mcQueContentDAO.getQuestionContentByQuestionText(question);
+            return mcQueContentDAO.getQuestionContentByQuestionText(question, mcContentId);
         }
         catch (DataAccessException e)
         {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rebdf73e801c6cb84f02b48e4860e1d7885f7ab84 -rb9d979e7f1478db56c700664c515c4036557f29f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision ebdf73e801c6cb84f02b48e4860e1d7885f7ab84)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -232,16 +232,16 @@
 	 	Map mapQuestionsContent=(Map) request.getSession().getAttribute(MAP_QUESTIONS_CONTENT);
 	 	logger.debug("mapQuestionsContent: " + mapQuestionsContent);
 	 	
-	 	mapQuestionsContent=repopulateMap(mapQuestionsContent, request);
+	 	mapQuestionsContent=repopulateMap(mapQuestionsContent, request, "questionContent");
 	 	logger.debug("mapQuestionsContent after shrinking: " + mapQuestionsContent);
 	 	logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size());
 	 	
-	 	
 	 	String userAction=null;
 	 	if (mcAuthoringForm.getAddQuestion() != null)
 	 	{
 	 		userAction="addQuestion";
 	 		request.setAttribute(USER_ACTION, userAction);
+	 		logger.debug("userAction:" + userAction);
 	 		
 	 		int mapSize=mapQuestionsContent.size();
 			mapQuestionsContent.put(new Long(++mapSize).toString(), "");
@@ -278,6 +278,7 @@
 	 	{
 	 		userAction="removeQuestion";
 	 		request.setAttribute(USER_ACTION, userAction);
+	 		logger.debug("userAction:" + userAction);
 	 		
 	 		String questionIndex =mcAuthoringForm.getQuestionIndex();
 			logger.debug("questionIndex:" + questionIndex);
@@ -291,7 +292,10 @@
 				request.getSession().setAttribute(MAP_QUESTIONS_CONTENT, mapQuestionsContent);
 				logger.debug("updated Questions Map: " + request.getSession().getAttribute(MAP_QUESTIONS_CONTENT));
 				
-				McQueContent mcQueContent =mcService.getQuestionContentByQuestionText(deletableQuestionEntry);
+				Long toolContentId=(Long)request.getSession().getAttribute(TOOL_CONTENT_ID);
+				logger.debug("toolContentId:" + toolContentId);
+				
+				McQueContent mcQueContent =mcService.getQuestionContentByQuestionText(deletableQuestionEntry, toolContentId);
 				logger.debug("mcQueContent:" + mcQueContent);
 				
 				if (mcQueContent != null)
@@ -309,12 +313,17 @@
 	 	{
 	 		userAction="editOption";
 	 		request.setAttribute(USER_ACTION, userAction);
+	 		logger.debug("userAction:" + userAction);
 	 		
 	 		String questionIndex =mcAuthoringForm.getQuestionIndex();
 			logger.debug("questionIndex:" + questionIndex);
 			String editableQuestionEntry=(String)mapQuestionsContent.get(questionIndex);
 			logger.debug("editableQuestionEntry:" + editableQuestionEntry);
-			McQueContent mcQueContent =mcService.getQuestionContentByQuestionText(editableQuestionEntry);
+			
+			Long toolContentId=(Long)request.getSession().getAttribute(TOOL_CONTENT_ID);
+			logger.debug("toolContentId:" + toolContentId);
+	    	
+			McQueContent mcQueContent =mcService.getQuestionContentByQuestionText(editableQuestionEntry, toolContentId);
 			logger.debug("mcQueContent:" + mcQueContent);
 			
 			Map mapOptionsContent= new TreeMap(new McComparator());
@@ -351,8 +360,65 @@
 			return (mapping.findForward(EDIT_OPTS_CONTENT));
 	 		
 	 	}
-	 	logger.debug("userAction:" + userAction);
+	 	else if (mcAuthoringForm.getAddOption() != null)
+	 	{
+	 		userAction="addOption";
+	 		request.setAttribute(USER_ACTION, userAction);
+	 		logger.debug("userAction:" + userAction);
+	 		
+	 		Map mapOptionsContent=(Map) request.getSession().getAttribute(MAP_OPTIONS_CONTENT);
+		 	logger.debug("mapOptionsContent: " + mapOptionsContent);
+		 	
+		 	mapOptionsContent=repopulateMap(mapQuestionsContent, request,"optionContent");
+		 	logger.debug("mapOptionsContent after shrinking: " + mapOptionsContent);
+		 	logger.debug("mapOptionsContent size after shrinking: " + mapOptionsContent.size());
+	 		
+	 		int mapSize=mapOptionsContent.size();
+	 		mapOptionsContent.put(new Long(++mapSize).toString(), "");
+			logger.debug("updated mapOptionsContent Map size: " + mapOptionsContent.size());
+			request.getSession().setAttribute(MAP_OPTIONS_CONTENT, mapQuestionsContent);
+    		logger.debug("updated Options Map: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT));
+    		
+    		McContent mcContent=createContent(request, mcAuthoringForm);
+    		logger.debug("mcContent: " + mcContent);
+    		
+    		/** iterate the questions Map and persist the questions into the DB*/
+    		Iterator itQuestionsMap = mapQuestionsContent.entrySet().iterator();
+    	    while (itQuestionsMap.hasNext()) {
+    	        Map.Entry pairs = (Map.Entry)itQuestionsMap.next();
+    	        logger.debug("adding the  pair: " +  pairs.getKey() + " = " + pairs.getValue());
+    	        if ((pairs.getValue() != null) && (!pairs.getValue().equals("")))
+    	        {
+        	        McQueContent mcQueContent=  new McQueContent(pairs.getValue().toString(),
+           	        	 new Integer(pairs.getKey().toString()),
+          					 mcContent,
+          					 new HashSet(),
+          					 new HashSet()
+          					);
+        	        logger.debug("created mcQueContent: " + mcQueContent);
+           	        mcService.createMcQue(mcQueContent);    	        	
+    	        }
+    	    }
+       		
+    	    
+    		mcAuthoringForm.resetUserAction();
+						
+			return (mapping.findForward(EDIT_OPTS_CONTENT));
+	 	}
+	 	else if (mcAuthoringForm.getRemoveOption() != null)
+	 	{
+	 		userAction="removeOption";
+	 		request.setAttribute(USER_ACTION, userAction);
+	 		logger.debug("userAction:" + userAction);
+	 		
+	 		String optionIndex =mcAuthoringForm.getOptionIndex();
+			logger.debug("optionIndex:" + optionIndex);
+						
+			return (mapping.findForward(EDIT_OPTS_CONTENT));
+	 	}
 	 	
+	 	
+	 	
 	 	mcAuthoringForm.resetUserAction();
    	    return (mapping.findForward(LOAD_QUESTIONS));
     }
@@ -396,14 +462,15 @@
      * @param request
      * @return
      */
-    protected Map repopulateMap(Map mapQuestionContent, HttpServletRequest request)
+    protected Map repopulateMap(Map mapQuestionContent, HttpServletRequest request, String parameterType)
     {
     	Map mapTempQuestionsContent= new TreeMap(new McComparator());
+    	logger.debug("parameterType: " + parameterType);
     	
     	long mapCounter=0;
     	for (long i=1; i <= MAX_QUESTION_COUNT ; i++)
 		{
-			String candidateQuestionEntry =request.getParameter("questionContent" + i);
+			String candidateQuestionEntry =request.getParameter(parameterType + i);
 			if (
 				(candidateQuestionEntry != null) && 
 				(candidateQuestionEntry.length() > 0) &&  
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
diff -u -r4336aafba788b801aa78c2dc27f8d07a2f932be7 -rb9d979e7f1478db56c700664c515c4036557f29f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 4336aafba788b801aa78c2dc27f8d07a2f932be7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -28,6 +28,7 @@
 	protected String removeQuestion;
 	protected String editOptions;
 	protected String addOption;
+	protected String removeOption;
 	
 	protected String questionIndex;
 	protected String optionIndex;
@@ -96,6 +97,7 @@
 		this.removeQuestion=null;
 		this.editOptions=null;
 		this.addOption=null;
+		this.removeOption=null;
 		
     	this.addContent=null;	
     	this.removeContent=null;
@@ -120,7 +122,8 @@
 		this.addQuestion=null;
 		this.removeQuestion=null;
 		this.editOptions=null;
-		this.addOption=null;		
+		this.addOption=null;	
+		this.removeOption=null;
 		
 		this.addContent=null;
 		this.removeContent=null;
@@ -706,4 +709,16 @@
 	public void setPassmark(String passmark) {
 		this.passmark = passmark;
 	}
+	/**
+	 * @return Returns the removeOption.
+	 */
+	public String getRemoveOption() {
+		return removeOption;
+	}
+	/**
+	 * @param removeOption The removeOption to set.
+	 */
+	public void setRemoveOption(String removeOption) {
+		this.removeOption = removeOption;
+	}
 }
Index: lams_tool_lamc/web/WEB-INF/FCKeditor.tld
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/FCKeditor.tld	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/FCKeditor.tld	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+
+<taglib>
+	<tlibversion>2.3</tlibversion>
+	<jspversion>1.1</jspversion>
+	<shortname>FCKeditor</shortname>
+	<uri>http://fckeditor.net/tags-fckeditor</uri>
+	<info>FCKeditor taglib</info>
+	<tag>
+		<name>editor</name>
+		<tagclass>com.fredck.FCKeditor.tags.FCKeditorTag</tagclass>
+		<bodycontent>JSP</bodycontent>
+		<attribute>
+			<name>id</name>
+			<required>true</required>
+  		</attribute>
+		<attribute>
+			<name>basePath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>toolbarSet</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>width</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>height</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>customConfigurationsPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>editorAreaCSS</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>baseHref</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>skinPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>pluginsPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fullPage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>debug</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>autoDetectLanguage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>defaultLanguage</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>contentLangDirection</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>enableXHTML</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>enableSourceXHTML</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fillEmptyBlocks</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>formatSource</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>formatOutput</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>formatIndentator</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>geckoUseSPAN</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>startupFocus</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>forcePasteAsPlainText</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>forceSimpleAmpersand</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>tabSpaces</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>useBROnCarriageReturn</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>toolbarStartExpanded</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>toolbarCanCollapse</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fontColors</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fontNames</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fontSizes</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>fontFormats</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>stylesXmlPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>linkBrowserURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>imageBrowserURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute>
+		<attribute>
+			<name>flashBrowserURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute> 	
+		<attribute>
+			<name>linkUploadURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute> 	
+		<attribute>
+			<name>imageUploadURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute> 	
+		<attribute>
+			<name>flashUploadURL</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+  		</attribute> 	
+	</tag>
+</taglib>
\ No newline at end of file
Fisheye: Tag b9d979e7f1478db56c700664c515c4036557f29f refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/McContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9d979e7f1478db56c700664c515c4036557f29f refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/McOptionsContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9d979e7f1478db56c700664c515c4036557f29f refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/McQueContent.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9d979e7f1478db56c700664c515c4036557f29f refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/McQueUsr.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9d979e7f1478db56c700664c515c4036557f29f refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/McSession.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9d979e7f1478db56c700664c515c4036557f29f refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/McUsrAttempt.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/WEB-INF/images/icon_noticeboard.swf
===================================================================
diff -u
Binary files differ
Index: lams_tool_lamc/web/WEB-INF/struts-config_1_2.dtd
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/struts-config_1_2.dtd	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/struts-config_1_2.dtd	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -0,0 +1,686 @@
+<!--
+     DTD for the Struts Application Configuration File
+
+     To support validation of your configuration file, include the following
+     DOCTYPE element at the beginning (after the "xml" declaration):
+
+     <!DOCTYPE struts-config PUBLIC
+       "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+       "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+     $Id$
+-->
+
+
+<!-- ========== Defined Types ============================================= -->
+
+
+<!-- An "AttributeName" is the identifier of a page, request, session, or
+     application scope attribute.
+-->
+<!ENTITY % AttributeName "CDATA">
+
+
+<!-- A "BeanName" is the identifier of a JavaBean, such as a form bean,
+     and also serves as the name of the corresponding scripting variable
+     and the name of the JSP attribute under which the bean is accessed.
+     Therefore, it must conform to the rules for a Java identifier.
+-->
+<!ENTITY % BeanName "CDATA">
+
+
+<!-- A "Boolean" is the string representation of a boolean (true or false)
+     variable.
+-->
+<!ENTITY % Boolean "(true|false|yes|no)">
+
+
+<!-- A "ClassName" is the fully qualified name of a Java class that is
+     instantiated to provide the functionality of the enclosing element.
+-->
+<!ENTITY % ClassName "CDATA">
+
+
+<!-- An "Integer" is a character string consisting solely of numeric digits,
+     optionally preceeded by a minus sign, that can be converted to a
+     32-bit integer.
+-->
+<!ENTITY % Integer "CDATA">
+
+
+<!-- A "Location" is a relative path, delimited by "/" characters, that
+     defines the location of a resource relative to the location of the
+     Struts configuration file itself.
+-->
+<!ENTITY % Location "#PCDATA">
+
+
+<!-- A "PropName" is the name of a JavaBeans property, and must begin with
+     a lower case letter and contain only characters that are legal in a
+     Java identifier.
+-->
+<!ENTITY % PropName "CDATA">
+
+
+<!-- A "RequestPath" is an module-relative URI path, beginning with a
+     slash, that identifies a mapped resource (such as a JSP page or a servlet)
+     within this web application.
+-->
+<!ENTITY % RequestPath "CDATA">
+
+
+<!-- The name of a JSP bean scope within which such a form bean may be
+     accessed.
+-->
+<!ENTITY % RequestScope "(request|session)">
+
+
+<!-- ========== Top Level Elements ======================================== -->
+
+
+<!-- The "struts-config" element is the root of the configuration file
+     hierarchy, and contains nested elements for all of the other
+     configuration settings.
+-->
+<!ELEMENT struts-config (display-name?, description?, data-sources?, form-beans?, global-exceptions?, global-forwards?, action-mappings?, controller?, message-resources*, plug-in*)>
+<!ATTLIST struts-config  id             ID              #IMPLIED>
+
+
+<!-- The "data-sources" element describes a set of DataSource objects [JDBC 2.0
+     Standard Extension]. The individual DataSource objects are configured through
+     nested <data-source> elements.
+-->
+<!ELEMENT data-sources (data-source*)>
+<!ATTLIST data-sources   id             ID              #IMPLIED>
+
+
+<!-- The "data-source" element describes a DataSource object [JDBC 2.0 Standard
+     Extension] that will be instantiated, configured, and made available as a
+     servlet context attribute (or "application-scope bean"). Any object can be
+     specified so long as it implements [javax.sql.DataSource] and can be
+     configured entirely from JavaBean properties. The following attributes
+     are required:
+
+     className       The configuration bean for this DataSource object. If
+                     specified, the object must be a subclass of the default
+                     configuration bean.
+                     ["org.apache.struts.config.DataSourceConfig"]
+
+     key             Servlet context attribute key under which this data source
+                     will be stored.  Default is the value specified by string
+                     constant defined by Globals.DATA_SOURCE_KEY. The application
+                     module prefix (if any) is appended to the key
+                     (${key}$prefix}).
+                     [org.apache.struts.Globals.DATA_SOURCE_KEY]
+
+                     NOTE: The application module prefix includes the leading
+                     slash, so the default datasource for a module named "foo" is
+                     stored under "org.apache.struts.action.DATA_SOURCE/foo".
+
+     type          Fully qualified Java class name for this data source object.
+                     The class must implement DataSource [javax.sql.DataSource],
+                     and the object must be configurable entirely from JavaBean
+                     properties.
+-->
+<!ELEMENT data-source (set-property*)>
+<!ATTLIST data-source    id             ID              #IMPLIED>
+<!ATTLIST data-source    className      %ClassName;     #IMPLIED>
+<!ATTLIST data-source    key            %AttributeName; #IMPLIED>
+<!ATTLIST data-source    type           %ClassName;     #REQUIRED>
+
+
+<!-- The "form-beans" element describes the set of form bean descriptors for this
+     module. The following attributes are defined:
+
+     type            Fully qualified Java class to use when instantiating
+                     ActionFormBean objects. If specified, the object must be a
+                     subclass of the default class type.
+
+                     WARNING:  For Struts 1.0, this value is ignored.  You
+                     can set the default implementation class name with the
+                     "formBean" initialization parameter to the Struts
+                     controller servlet.
+-->
+<!ELEMENT form-beans (form-bean*)>
+<!ATTLIST form-beans     id             ID              #IMPLIED>
+<!ATTLIST form-beans     type           %ClassName;     #IMPLIED>
+
+
+<!-- The "form-bean" element describes an ActionForm subclass
+     [org.apache.struts.action.ActionForm] that can be referenced by an "action"
+     element.
+
+
+The "form-bean" element describes a particular form bean, which is a
+     JavaBean that implements the org.apache.struts.action.ActionForm
+     class.  The following attributes are defined:
+
+     className       The configuration bean for this form bean object. If
+                     specified, the object must be a subclass of the default
+                     configuration bean.
+                     ["org.apache.struts.config.FormBeanConfig"]
+
+     name            The unique identifier for this form bean. Referenced by the
+                     <action> element to specify which form bean to use with its
+                     request.
+
+     type            Fully qualified Java class name of the ActionForm subclass
+                     to use with this form bean.
+-->
+<!ELEMENT form-bean (icon?, display-name?, description?, set-property*, form-property*)>
+<!ATTLIST form-bean      id             ID              #IMPLIED>
+<!ATTLIST form-bean      className      %ClassName;     #IMPLIED>
+<!ATTLIST form-bean      dynamic        %Boolean;       #IMPLIED>
+<!ATTLIST form-bean      name           %BeanName;      #REQUIRED>
+<!ATTLIST form-bean      type           %ClassName;     #REQUIRED>
+
+
+<!-- The "form-property" element describes a JavaBean property that can be used to
+     configure an instance of a DynaActionForm or a subclass thereof. This element
+     is only utilized when the "type" attribute of the enclosing "form-bean" element
+     is [org.apache.struts.action.DynaActionForm] or a subclass of DynaActionForm. If
+     a custom DynaActionForm subclass is used, then the "dynamic" attribute of the
+     enclosing <form-bean> element must be set to "true". Since Struts 1.1.
+
+     className       The configuration bean for this form property object. If
+                     specified, the object must be a subclass of the default
+                     configuration bean.
+                     ["org.apache.struts.config.FormPropertyConfig"]
+
+     initial         String representation of the initial value for this property.
+                     If not specified, primitives will be initialized to zero and
+                     objects initialized to the zero-argument instantiation of that
+                     object class.  For example, Strings will be initialized to ""
+
+
+     name            The name of the JavaBean property described by this element.
+
+     size            The number of array elements to create if the value of the
+                     "type" attribute specifies an array, but there is no value
+                     specified for the "initial" attribute.
+
+     type            Fully qualified Java class name of the field underlying this
+                     property, optionally followed by "[]" to indicate that the
+                     field is indexed.
+-->
+<!ELEMENT form-property  (set-property*)>
+<!ATTLIST form-property  className      %ClassName;     #IMPLIED>
+<!ATTLIST form-property  initial        CDATA           #IMPLIED>
+<!ATTLIST form-property  name           %PropName;      #REQUIRED>
+<!ATTLIST form-property  size           %Integer;       #IMPLIED>
+<!ATTLIST form-property  type           %ClassName;     #REQUIRED>
+
+
+<!-- The "global-exceptions" element describes a set of exceptions that might be
+     thrown by an Action object. The handling of individual exception types is
+     configured through nested exception elements. An <action> element may
+     override a global exception handler by registering a local exception handler
+     for the same exception type. Since Struts 1.1.
+-->
+<!ELEMENT global-exceptions (exception*)>
+<!ATTLIST global-exceptions id          ID              #IMPLIED>
+
+
+<!-- The "exception" element registers an ExceptionHandler for an exception type.
+     The following attributes are defined:
+
+    bundle           Servlet context attribute for the message resources bundle
+                     associated with this handler. The default attribute is the
+                     value specified by the string constant declared at
+                     Globals.MESSAGES_KEY.
+                     [org.apache.struts.Globals.MESSAGES_KEY]
+
+    className        The configuration bean for this ExceptionHandler object.
+                     If specified, className must be a subclass of the default
+                     configuration bean
+                     ["org.apache.struts.config.ExceptionConfig"]
+
+    handler          Fully qualified Java class name for this exception handler.
+                     ["org.apache.struts.action.ExceptionHandler"]
+
+    key              The key to use with this handler's message resource bundle
+                     that will retrieve the error message template for this
+                     exception.
+
+    path             The module-relative URI to the resource that will complete
+                     the request/response if this exception occurs.
+
+    scope            The context ("request" or "session") that is used to access
+                     the ActionError object [org.apache.struts.action.ActionError]
+                     for this exception.
+
+    type             Fully qualified Java class name of the exception type to
+                     register with this handler.
+-->
+<!ELEMENT exception (icon?, display-name?, description?, set-property*)>
+<!ATTLIST exception      id             ID              #IMPLIED>
+<!ATTLIST exception      bundle         %AttributeName; #IMPLIED>
+<!ATTLIST exception      className      %ClassName;     #IMPLIED>
+<!ATTLIST exception      handler        %ClassName;     #IMPLIED>
+<!ATTLIST exception      key            CDATA           #REQUIRED>
+<!ATTLIST exception      path           %RequestPath;   #IMPLIED>
+<!ATTLIST exception      scope          CDATA           #IMPLIED>
+<!ATTLIST exception      type           %ClassName;     #REQUIRED>
+
+
+<!-- The "global-forwards" element describes a set of ActionForward objects
+     [org.apache.struts.action.ActionForward] that are available to all Action
+     objects as a return value. The individual ActionForwards are configured
+     through nested <forward> elements. An <action> element may override a global
+     forward by defining a local <forward> of the same name.
+
+     type            Fully qualified Java class to use when instantiating
+                     ActionForward objects.  If specified, the object must be a
+                     subclass of the default class type.
+
+                     WARNING:  For Struts 1.0, this value is ignored.  You
+                     can set the default implementation class name with the
+                     "forward" initialization parameter to the Struts
+                     controller servlet.
+-->
+<!ELEMENT global-forwards (forward*)>
+<!ATTLIST global-forwards id            ID              #IMPLIED>
+<!ATTLIST global-forwards type          %ClassName;     #IMPLIED>
+
+
+<!-- The "forward" element describes an ActionForward that is to be made
+     available to an Action as a return value. An ActionForward is referenced by
+     a logical name and encapsulates a URI. A "forward" element may be used to
+     describe both global and local ActionForwards. Global forwards are available
+     to all the Action objects in the module. Local forwards can be
+     nested within an <action> element and only available to an Action object
+     when it is invoked through that ActionMapping.
+
+     className       Fully qualified Java class name of ActionForward
+                     subclass to use for this object.
+                     ["org.apache.struts.action.ActionForward"]
+
+    contextRelative  Set this to "true" if, in a modular application, the path
+                     attribute starts with a slash "/" and should be considered
+                     relative to the entire web application rather than the module.
+                     Since Struts 1.1.
+                     DEPRECATED.
+                     [false]
+
+     module          The module prefix to use with this path. This value should
+                     begin with a slash ("/").
+
+     name            The unique identifier for this forward. Referenced by the
+                     Action object at runtime to select - by its logical name -
+                     the resource that should complete the request/response.
+
+     path            The module-relative or context-relative path to the resources
+                     that is encapsulated by the logical name of this ActionForward.
+                     If the path is to be considered context-relative when used in
+                     a modular application, then the contextRelative attribute
+                     should be set to "true". This value should begin with a slash
+                     ("/") character.
+
+     redirect        Set to "true" if a redirect instruction should be issued to
+                     the user-agent so that a new request is issued for this
+                     forward's resource. If true,  RequestDispatcher.Redirect is
+                     called. If "false", RequestDispatcher.forward is called instead.
+                     [false]
+-->
+<!ELEMENT forward (icon?, display-name?, description?, set-property*)>
+<!ATTLIST forward        id             ID              #IMPLIED>
+<!ATTLIST forward        className      %ClassName;     #IMPLIED>
+<!ATTLIST forward        contextRelative %Boolean;      #IMPLIED>
+<!ATTLIST forward        module         %RequestPath;   #IMPLIED>
+<!ATTLIST forward        name           CDATA           #REQUIRED>
+<!ATTLIST forward        path           %RequestPath;   #REQUIRED>
+<!ATTLIST forward        redirect       %Boolean;       #IMPLIED>
+
+
+<!-- The "action-mappings" element describes a set of ActionMapping objects
+     [org.apache.struts.action.ActionMapping] that are available to process
+     requests matching the url-pattern our ActionServlet registered with the
+     container. The individual ActionMappings are configured through nested
+     <action> elements. The following attributes are defined:
+
+     type           Fully qualified Java class to use when instantiating
+                    ActionMapping objects. If specified, the object must be a
+                    subclass of the default class type.
+
+                    WARNING:  For Struts 1.0, this value is ignored.  You
+                    can set the default implementation class name with the
+                    "mapping" initialization parameter to the Struts
+                    controller servlet.
+-->
+<!ELEMENT action-mappings (action*)>
+<!ATTLIST action-mappings id             ID              #IMPLIED>
+<!ATTLIST action-mappings type           %ClassName;     #IMPLIED>
+
+
+<!-- The "action" element describes an ActionMapping object that is to be used
+     to process a request for a specific module-relative URI. The following
+     attributes are defined:
+
+     attribute       Name of the request-scope or session-scope attribute that
+                     is used to access our ActionForm bean, if it is other than
+                     the bean's specified "name". Optional if "name" is specified,
+                     else not valid.
+
+     className       The fully qualified Java class name of the ActionMapping
+                     subclass to use for this action mapping object. Defaults to
+                     the type specified by the enclosing <action-mappings>
+                     element or to "org.apache.struts.action.ActionMapping" if
+                     not specified.
+                     ["org.apache.struts.action.ActionMapping"]
+
+     forward         Module-relative path of the servlet or other resource that
+                     will process this request, instead of the Action class
+                     specified by "type".  The path WILL NOT be processed
+                     through the "forwardPattern" attribute that is configured
+                     on the "controller" element for this module.
+                     Exactly one of "forward", "include", or "type" must be
+                     specified.
+
+     include         Module-relative path of the servlet or other resource that
+                     will process this request, instead of the Action class
+                     specified by "type".  The path WILL NOT be processed
+                     through the "forwardPattern" attribute that is configured
+                     on the "controller" element for this module.
+                     Exactly one of "forward", "include", or "type" must be
+                     specified.
+
+     input           Module-relative path of the action or other resource to
+                     which control should be returned if a validation error is
+                     encountered. Valid only when "name" is specified. Required
+                     if "name" is specified and the input bean returns
+                     validation errors. Optional if "name" is specified and the
+                     input bean does not return validation errors.
+
+     name            Name of the form bean, if any, that is associated with this
+                     action mapping.
+
+     path            The module-relative path of the submitted request, starting
+                     with a "/" character, and without the filename extension if
+                     extension mapping is used.
+
+                     NOTE:  Do *not* include a period in your path name,
+                     because it will look like a filename extension and
+                     cause your Action to not be located.
+
+     parameter       General-purpose configuration parameter that can be used to
+                     pass extra information to the Action object selected by
+                     this action mapping.
+
+     prefix          Prefix used to match request parameter names to ActionForm
+                     property names, if any. Optional if "name" is specified,
+                     else not allowed.
+
+     roles           Comma-delimited list of security role names that are allowed
+                     access to this ActionMapping object. Since Struts 1.1.
+
+     scope           The context ("request" or "session") that is used to
+                     access our ActionForm bean, if any.  Optional if "name" is
+                     specified, else not valid.
+
+     suffix          Suffix used to match request parameter names to ActionForm
+                     bean property names, if any. Optional if "name" is
+                     specified, else not valid.
+
+     type            Fully qualified Java class name of the Action subclass
+                     [org.apache.struts.action.Action] that will process requests
+                     for this action mapping. Not valid if either the "forward"
+                     or "include" attribute is specified.  Exactly one of
+                     "forward", "include", or "type" must be specified.
+
+     unknown         Set to "true" if this object should be configured as the
+                     default action mapping for this module. If a request does not
+                     match another object, it will be passed to the ActionMapping
+                     object with unknown set to "true". Only one ActionMapping
+                     can be marked as "unknown" within a module.
+                     [false]
+
+     validate        Set to "true" if the validate method of the ActionForm bean
+                     should be called prior to calling the Action object for this
+                     action mapping, or set to "false" if you do not want the
+                     validate method called.
+                     [true]
+-->
+<!ELEMENT action (icon?, display-name?, description?, set-property*, exception*, forward*)>
+<!ATTLIST action         id             ID              #IMPLIED>
+<!ATTLIST action         attribute      %BeanName;      #IMPLIED>
+<!ATTLIST action         className      %ClassName;     #IMPLIED>
+<!ATTLIST action         forward        %RequestPath;   #IMPLIED>
+<!ATTLIST action         include        %RequestPath;   #IMPLIED>
+<!ATTLIST action         input          %RequestPath;   #IMPLIED>
+<!ATTLIST action         name           %BeanName;      #IMPLIED>
+<!ATTLIST action         parameter      CDATA           #IMPLIED>
+<!ATTLIST action         path           %RequestPath;   #REQUIRED>
+<!ATTLIST action         prefix         CDATA           #IMPLIED>
+<!ATTLIST action         roles          CDATA           #IMPLIED>
+<!ATTLIST action         scope          %RequestScope;  #IMPLIED>
+<!ATTLIST action         suffix         CDATA           #IMPLIED>
+<!ATTLIST action         type           %ClassName;     #IMPLIED>
+<!ATTLIST action         unknown        %Boolean;       #IMPLIED>
+<!ATTLIST action         validate       %Boolean;       #IMPLIED>
+
+
+<!-- The "controller" element describes the ControllerConfig bean
+     [org.apache.struts.config.ControllerConfig] that encapsulates
+     a module's runtime configuration. The following
+     attributes are defined:
+
+     bufferSize      The size of the input buffer used when processing
+                     file uploads.
+                     [4096]
+
+     className       Fully qualified Java class name of the
+                     ControllerConfig subclass for this controller object.
+                     If specified, the object must be a subclass of the
+                     default class.
+                     ["org.apache.struts.config.ControllerConfig"]
+
+     contentType     Default content type (and optional character encoding) to
+                     be set on each response. May be overridden by the Action,
+                     JSP, or other resource to which the request is forwarded.
+                     ["text/html"]
+
+     forwardPattern  Replacement pattern defining how the "path" attribute of a
+                     <forward> element is mapped to a context-relative URL when
+                     it starts with a slash (and when the contextRelative
+                     property is false). This value may consist of any
+                     combination of the following:
+                     - "$M" - Replaced by the module prefix of this module
+                     - "$P" - Replaced by the "path" attribute of the  selected
+                     "forward" element
+                     - "$$" - Causes a literal dollar sign to be rendered
+                     - "$x" - (Where "x" is any character not defined above)
+                     Silently swallowed, reserved for future use
+                     If not specified, the default forwardPattern is "$M$P",
+                     which is consistent with the previous behavior of
+                     forwards.  Since Struts 1.1.  ["$M$P"]
+
+     inputForward    Set to "true" if you want the "input" attribute of
+                     <action> elements to be the name of a local or global
+                     ActionForward, which will then be used to calculate the
+                     ultimate URL. Set to "false" (the default) to treat the
+                     "input" parameter of <action> elements as a
+                     module-relative path to the resource
+                     to be used as the input form. Since Struts 1.1.
+                     [false]
+
+     locale          Set to "true" if you want a Locale object stored in the
+                     user's session if not already present.
+                     [true]
+
+     maxFileSize     The maximum size (in bytes) of a file to be accepted as a
+                     file upload.  Can be expressed as a number followed by a
+                     "K", "M", or "G", which are interpreted to mean kilobytes,
+                     megabytes, or gigabytes, respectively.
+                     ["250M"]
+
+     memFileSize     The maximum size (in bytes) of a file whose contents will
+                     be retained in memory after uploading. Files larger than
+                     this threshold will be written to some alternative storage
+                     medium, typically a hard disk. Can be expressed as a number
+                     followed by a "K", "M", or "G", which are interpreted to
+                     mean kilobytes, megabytes, or gigabytes, respectively.
+                     ["256K"]
+
+     multipartClass  The fully qualified Java class name of the multipart
+                     request handler class to be used with this module.
+                     ["org.apache.struts.upload.CommonsMultipartRequestHandler"]
+
+     nocache         Set to "true" if you want the controller to add HTTP
+                     headers for defeating caching to every response from
+                     this module.  [false]
+
+     pagePattern     Replacement pattern defining how the "page" attribute of
+                     custom tags using it is mapped to a context-relative URL
+                     of the corresponding resource.  This value may consist of
+                     any combination of the following:
+                     - "$M" - Replaced by the module prefix of this module
+                     - "$P" - Replaced by the value of the "page" attribute
+                     - "$$" - Causes a literal dollar sign to be rendered
+                     - "$x" - (Where "x" is any character not defined above)
+                              Silently swallowed, reserved for future use
+                     If not specified, the default forwardPattern is
+                     "$M$P", which is consistent with previous hard coded
+                     behavior of URL evaluation for "page" attributes.
+                     ["$M$P"]
+
+     processorClass  The fully qualified Java class name of the
+                     RequestProcessor subclass to be used with this module.
+                     ["org.apache.struts.action.RequestProcessor"]
+
+     tempDir         Temporary working directory to use when processing
+                     file uploads.
+                     [{Directory provided by servlet container}]
+-->
+<!ELEMENT controller     (set-property*)>
+<!ATTLIST controller     id             ID              #IMPLIED>
+<!ATTLIST controller     bufferSize     %Integer;       #IMPLIED>
+<!ATTLIST controller     className      %ClassName;     #IMPLIED>
+<!ATTLIST controller     contentType    CDATA           #IMPLIED>
+<!ATTLIST controller     forwardPattern CDATA           #IMPLIED>
+<!ATTLIST controller     inputForward   %Boolean;       #IMPLIED>
+<!ATTLIST controller     locale         %Boolean;       #IMPLIED>
+<!ATTLIST controller     maxFileSize    CDATA           #IMPLIED>
+<!ATTLIST controller     memFileSize    CDATA           #IMPLIED>
+<!ATTLIST controller     multipartClass %ClassName;     #IMPLIED>
+<!ATTLIST controller     nocache        %Boolean;       #IMPLIED>
+<!ATTLIST controller     pagePattern    CDATA           #IMPLIED>
+<!ATTLIST controller     processorClass %ClassName;     #IMPLIED>
+<!ATTLIST controller     tempDir        CDATA           #IMPLIED>
+
+
+<!-- The "message-resources" element describes a MessageResources object with
+     message templates for this module. The following attributes are defined:
+
+     className       The configuration bean for this message resources object.
+                     If specified, the object must be a subclass of the default
+                     configuration bean.
+                     ["org.apache.struts.config.MessageResourcesConfig"]
+
+     factory         Fully qualified Java class name of the
+                     MessageResourcesFactory subclass to use for this message
+                     resources object.
+                     ["org.apache.struts.util.PropertyMessageResourcesFactory"]
+
+     key             Servlet context attribute under which this message
+                     resources bundle will be stored. The default attribute is
+                     the value specified by the string constant at
+                     [Globals.MESSAGES_KEY]. The module prefix (if
+                     any) is appended to the key (${key}${prefix}).
+                     [org.apache.struts.Globals.MESSAGES_KEY]
+
+                     NOTE: The module  prefix includes the leading
+                     slash, so the default message resource bundle for a module
+                     named "foo" is stored under
+                     "org.apache.struts.action.MESSAGE/foo".
+
+     null            Set to "true" if you want our message resources to return a
+                     null string for unknown message keys, or "false" to return a
+                     message with the bad key value.
+
+     parameter       Configuration parameter to be passed to the createResources
+                     method of our factory object.
+-->
+<!ELEMENT message-resources (set-property*)>
+<!ATTLIST message-resources id          ID              #IMPLIED>
+<!ATTLIST message-resources className   %ClassName;     #IMPLIED>
+<!ATTLIST message-resources factory     %ClassName;     #IMPLIED>
+<!ATTLIST message-resources key         %AttributeName; #IMPLIED>
+<!ATTLIST message-resources null        %Boolean;       #IMPLIED>
+<!ATTLIST message-resources parameter   CDATA           #REQUIRED>
+
+
+<!-- The "plug-in" element specifies the fully qualified class name of a
+     general-purpose application plug-in module that receives notification of
+     application startup and shutdown events. An instance of the specified class
+     is created for each element, and can be configured with nested <set-property>
+     elements. The following attributes are supported:
+
+     className       Fully qualified Java class name of the plug-in class; must
+                     implement [org.apache.struts.action.PlugIn].
+-->
+<!ELEMENT plug-in           (set-property*)>
+<!ATTLIST plug-in           id          ID              #IMPLIED>
+<!ATTLIST plug-in           className   %ClassName;     #REQUIRED>
+
+
+<!-- ========== Subordinate Elements ====================================== -->
+
+
+<!-- The "description" element contains descriptive (paragraph length) text
+     about the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT description    (#PCDATA)>
+<!ATTLIST description    id             ID              #IMPLIED>
+
+
+<!-- The "display-name" element contains a short (one line) description of
+     the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name   id             ID              #IMPLIED>
+
+
+<!-- The "icon" element contains a small-icon and large-icon element which
+     specify the location, relative to the Struts configuration file, for small
+     and large images used to represent the surrounding element in GUI tools.
+-->
+<!ELEMENT icon           (small-icon?, large-icon?)>
+<!ATTLIST icon           id             ID              #IMPLIED>
+
+
+<!-- The "large-icon" element specifies the location, relative to the Struts
+     configuration file, of a resource containing a large (32x32 pixel)
+     icon image.
+-->
+<!ELEMENT large-icon     (%Location;)>
+<!ATTLIST large-icon     id             ID              #IMPLIED>
+
+
+<!-- The "set-property" element specifies the method name and initial value of
+     an additional JavaBean configuration property. When the object representing
+     the surrounding element is instantiated, the accessor for the indicated
+     property is called and passed the indicated value. The "set-property"
+     element is especially useful when a custom subclass is used with
+     <data-source>, <forward>, <action>, or <plug-in> elements. The subclass
+     can be passed whatever other properties may be required to configure the
+     object without changing how the struts-config is parsed.
+
+     property        Name of the JavaBeans property whose setter method
+                     will be called.
+
+     value           String representation of the value to which this
+                     property will be set, after suitable type conversion
+-->
+<!ELEMENT set-property   EMPTY>
+<!ATTLIST set-property   id             ID              #IMPLIED>
+<!ATTLIST set-property   property       %PropName;      #REQUIRED>
+<!ATTLIST set-property   value          CDATA           #REQUIRED>
+
+
+<!-- The "small-icon" element specifies the location, relative to the Struts
+     configuration file, of a resource containing a small (16x16 pixel)
+     icon image.
+-->
+<!ELEMENT small-icon     (%Location;)>
+<!ATTLIST small-icon     id             ID              #IMPLIED>
+
Fisheye: Tag b9d979e7f1478db56c700664c515c4036557f29f refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/struts-template.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag b9d979e7f1478db56c700664c515c4036557f29f refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/struts/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -r671255080ca12fba787bcf07b5d0d196fc96c5ea -rb9d979e7f1478db56c700664c515c4036557f29f
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 671255080ca12fba787bcf07b5d0d196fc96c5ea)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -1,3 +1,4 @@
+
 <%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
 <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
 <%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
@@ -6,6 +7,7 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 
 
+
 <%
 String protocol = request.getProtocol();
 if(protocol.startsWith("HTTPS")){
Fisheye: Tag b9d979e7f1478db56c700664c515c4036557f29f refers to a dead (removed) revision in file `lams_tool_lamc/web/editDefaultContent.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/index.jsp
===================================================================
diff -u -re641617111e90d02c659127046f06b0f5c8e2845 -rb9d979e7f1478db56c700664c515c4036557f29f
--- lams_tool_lamc/web/index.jsp	(.../index.jsp)	(revision e641617111e90d02c659127046f06b0f5c8e2845)
+++ lams_tool_lamc/web/index.jsp	(.../index.jsp)	(revision b9d979e7f1478db56c700664c515c4036557f29f)
@@ -3,7 +3,10 @@
 <%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
 <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
 <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
 
+
+
 	<!-- this form  exists temporarily to represent tool icon, remove this form once the tool is deployed into authoring environment -->
 <%
 	String userContentId="1234";